CAMP/oxjstmp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge changes

Browse Source
This commit is contained in:
Rolux 2010-02-08 15:58:12 +05:30
commit 70c6999c4b
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/js/ox.js
View File

@ -1526,4 +1526,4 @@ Ox.isUndefined = function(val) {
true
*/
return typeof val == "undefined";
};
};

10
demos/geo/geo.html
View File

@ -65,7 +65,7 @@
latLng = Ox.getLatLng((e.clientX - left) / width, (e.clientY - top) / height);
Ox.getPlacemarks(latLng.lat, latLng.lng, function(data) {
var length = data.results.length;
console.log(data)
Ox.print(data)
if (length && data.results[length - 1].types[0] == "country") {
var $img = $("#" + data.results[length - 1].address_components[0].short_name);
if (!$img.length) {
@ -73,7 +73,7 @@
if (data.results.length) {
var location = data.results[0].geometry.location,
xy = Ox.getXY(location.lat(), location.lng());
//console.log(+new Date, place.name, location, xy);
//Ox.print(+new Date, place.name, location, xy);
var $img = $("<img/>")
.attr({
id: data.results[0].address_components[0].short_name,
@ -98,7 +98,7 @@
$img.removeClass("hover");
}, 1000);
} else {
//console.log("no results", place, data)
//Ox.print("no results", place, data)
}
});
} else {
@ -169,10 +169,10 @@
lng: data.results[0].geometry.viewport.getNorthEast().lng().toFixed(10)
}
};
console.log(JSON.stringify(d))
Ox.print(JSON.stringify(d))
json.push(d);
} else {
console.log("no results", place, data)
Ox.print("no results", place, data)
}
});
if (places.length) {

4
demos/png/index.html
View File

@ -11,8 +11,8 @@
$(function() {
var png = new Ox.PNG("http://khm0.google.com/kh/v=46&x=0&y=0&z=0");
png.load(function() {
console.log(png.getChunks());
console.log(png.getSize());
Ox.print(png.getChunks());
Ox.print(png.getSize());
png.appendTo("body")
})
});

2
demos/png/ox.png.js
View File

@ -64,7 +64,7 @@ Ox = Ox || {};
var canvas = self.getCanvas();
that.context = canvas.context;
that.canvas = canvas.canvas;
console.log(self.getChunks())
Ox.print(self.getChunks())
callback();
};
that.addChunk = function(options) {

2
demos/test/app.js
View File

@ -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"
});

6
demos/test/index.html
View File

@ -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>

6
demos/test/test.js
View File

@ -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;
}
})();
})();