diff --git a/examples/cities/js/example.js b/examples/cities/js/example.js index f5d83e88..3c045b04 100644 --- a/examples/cities/js/example.js +++ b/examples/cities/js/example.js @@ -87,6 +87,18 @@ Ox.load({UI: {showScreen: true}, Geo: {}}, function() { }; /**/ }); + /* + Ox.print( + JSON.stringify( + cities.sort(function(a, b) { + return a.country + ', ' + a.name < b.country + ', ' + b.name ? -1 + : a.country + ', ' + a.name > b.country + ', ' + b.name ? 1 : 0 + }).map(function(city) { + return city.name + ', ' + city.country + }) + ) + ); + */ var listAPI = Ox.api(cities, { cache: true, diff --git a/source/Ox.UI/png/icon128.png b/source/Ox.UI/png/icon128.png deleted file mode 100644 index e4f8c307..00000000 Binary files a/source/Ox.UI/png/icon128.png and /dev/null differ diff --git a/source/Ox/js/Array.js b/source/Ox/js/Array.js index 3f9b93d7..28c161ad 100644 --- a/source/Ox/js/Array.js +++ b/source/Ox/js/Array.js @@ -356,6 +356,10 @@ Ox.flatten = function(arr) { return ret; }; +Ox.indexOf = function(arr) { + // indexOf for primitives, test for function, deep equal for others +}; + /*@ Ox.merge Merges an array with one or more other arrays For convenience, literals are treated as arrays with one element @@ -364,6 +368,7 @@ Ox.merge Merges an array with one or more other arrays > Ox.merge(1, [2, 3, 2], 1) [1, 2, 3, 2, 1] @*/ +// FIXME: a1.push.apply(a1, a2) should be much faster Ox.merge = function(arr) { arr = Ox.toArray(arr); Ox.forEach(Array.prototype.slice.call(arguments, 1), function(arg) {