forked from 0x2620/oxjs
merge changes
This commit is contained in:
commit
946d36b43d
7 changed files with 16 additions and 16 deletions
|
|
@ -8,7 +8,7 @@ $(function() {
|
|||
{
|
||||
value: "Change Title",
|
||||
click: function() {
|
||||
console.log("click to change title")
|
||||
Ox.print("click to change title")
|
||||
$dialog.options({
|
||||
title: "New Title"
|
||||
});
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@
|
|||
.bindEvent("change." + range.id, update)
|
||||
.appendTo($toolbars[4]);
|
||||
function update() {
|
||||
//console.log("update", range.options("value"))
|
||||
//Ox.print("update", range.options("value"))
|
||||
/*
|
||||
// fixme: make this work
|
||||
input.options({
|
||||
|
|
@ -259,7 +259,7 @@
|
|||
*/
|
||||
input.val(range.options("value").toFixed(1))
|
||||
}
|
||||
//console.log("binding to OxRange" + range.id + "Change")
|
||||
//Ox.print("binding to OxRange" + range.id + "Change")
|
||||
Ox.Range({
|
||||
animate: true,
|
||||
arrows: true,
|
||||
|
|
@ -322,7 +322,7 @@
|
|||
}
|
||||
}
|
||||
function clickButton(val) {
|
||||
// console.log(val);
|
||||
// Ox.print(val);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ Ox = {
|
|||
})();
|
||||
self.onChange = function(option, value) {
|
||||
if (option == "foo") {
|
||||
console.log("foo set to", value);
|
||||
Ox.print("foo set to", value);
|
||||
}
|
||||
}
|
||||
that.getTime = function() {
|
||||
|
|
@ -225,8 +225,8 @@ Ox = {
|
|||
self.time = 0;
|
||||
})();
|
||||
that.bar = function() {
|
||||
console.log("Bar.bar()");
|
||||
Ox.print("Bar.bar()");
|
||||
}
|
||||
return that;
|
||||
}
|
||||
})();
|
||||
})();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue