diff --git a/source/Ox/js/Collection.js b/source/Ox/js/Collection.js index 4ae72d89..ba92735e 100644 --- a/source/Ox/js/Collection.js +++ b/source/Ox/js/Collection.js @@ -15,15 +15,6 @@ Ox.avg = function(obj) { return Ox.sum(obj) / Ox.len(obj); }; -/*@ -Ox.break end loops by calling Ox.break() -@*/ -Ox.break = function() { - throw Ox.BreakError; -}; - -Ox.BreakError = new SyntaxError('Illegal Ox.break() statement'); - /*@ Ox.clone Returns a (shallow or deep) copy of an object or array > (function() { var a = ['v'], b = Ox.clone(a); a[0] = null; return b[0]; }()) @@ -60,7 +51,8 @@ Ox.contains Tests if a collection contains a value > Ox.contains("foobar", "bar") true @*/ -Ox.contains = Ox.in = function(col, val) { +// FIXME: a shorter name would be nice (but IE8 doesn't like 'in') +Ox.contains = function(col, val) { return (Ox.isObject(col) ? Ox.values(col) : col).indexOf(val) > -1; }; @@ -298,7 +290,7 @@ Ox.indexOf indexOf with a test function @*/ Ox.indexOf = function(col, fn) { var index = Ox.forEach(col, function(val) { - fn(val) && Ox.break(); + fn(val) && Ox.Break(); }); return index == col.length ? -1 : index; };