diff --git a/source/Ox/js/Constants.js b/source/Ox/js/Constants.js index 1f0df000..8e8ac77f 100644 --- a/source/Ox/js/Constants.js +++ b/source/Ox/js/Constants.js @@ -77,7 +77,7 @@ Ox.SHORT_MONTHS = Ox.MONTHS.map(function(val) { return val.slice(0, 3); }); //@ Ox.PATH Path of Ox.js -Ox.PATH = Array.prototype.slice.call( +Ox.PATH = Ox.toArray( document.getElementsByTagName('script') ).reverse().filter(function(element) { return /Ox\.js$/.test(element.src); diff --git a/source/Ox/js/HTML.js b/source/Ox/js/HTML.js index 7da15250..81eeefb9 100644 --- a/source/Ox/js/HTML.js +++ b/source/Ox/js/HTML.js @@ -64,7 +64,7 @@ }, salt = Ox.range(2).map(function(){ return Ox.range(16).map(function() { - return String.fromCharCode(65 + Ox.random(26)); + return Ox.char(65 + Ox.random(26)); }).join(''); }); diff --git a/tools/build/build.py b/tools/build/build.py index 2ae502e0..9c1e3592 100755 --- a/tools/build/build.py +++ b/tools/build/build.py @@ -99,8 +99,15 @@ def build_oxjs(downloads=False, geo=False): ], [ 'Function.js', # getSortValue (Array.js) depends on Ox.cache - 'Math.js', # Ox.MAX_LATITUDE (Constants.js) depends on Ox.sinh - 'Polyfill.js', # FIXME: not clear if needed here + 'Polyfill.js' # FIXME: not clear if needed here + ], + [ + 'Array.js', # Ox.slice (Collection.js) depends on Ox.toArray, salt (HTML.js) depends on Ox.range + 'String.js' # salt (HTML.js) depends on Ox.char + ], + [ + 'Collection.js', # Ox.PATH (Constants.js) depends on Ox.slice + 'Math.js' # Ox.MAX_LATITUDE (Constants.js) depends on Ox.sinh ] ] js = ''