diff --git a/source/Ox.Geo/Ox.Geo.js b/source/Ox.Geo/Ox.Geo.js index 38625a82..71e8d127 100644 --- a/source/Ox.Geo/Ox.Geo.js +++ b/source/Ox.Geo/Ox.Geo.js @@ -154,7 +154,7 @@ Ox.load.Geo = function(options, callback) { Ox.forEach(Ox.COUNTRIES, function(c) { if (c.code == code) { country = c; - return false; + Ox.break(); } }); return country; @@ -193,7 +193,7 @@ Ox.load.Geo = function(options, callback) { Ox.forEach(Ox.COUNTRIES, function(c) { if (name == c.name || name == c.googleName || name == c.imdbName) { country = c; - return false; + Ox.break(); } }); return country; diff --git a/source/Ox.Image/Ox.Image.js b/source/Ox.Image/Ox.Image.js index 2ac445f1..b8b391bd 100644 --- a/source/Ox.Image/Ox.Image.js +++ b/source/Ox.Image/Ox.Image.js @@ -447,14 +447,14 @@ Ox.load.Image = function(options, callback) { str = ''; } else { // After length more bytes, break - return false; + Ox.break(); } } } }); - return done != 2; + done == 2 && Ox.break(); }); - return done != 2; + done == 2 && Ox.break(); } }, function() { try { diff --git a/source/Ox.UI/Ox.UI.js b/source/Ox.UI/Ox.UI.js index 34eed388..20ee3809 100644 --- a/source/Ox.UI/Ox.UI.js +++ b/source/Ox.UI/Ox.UI.js @@ -329,7 +329,7 @@ Ox.load.UI = function(options, callback) { && !/chrome/.test(userAgent) && !/linux/.test(userAgent) )) { format = f; - return false; + Ox.break(); } } }); diff --git a/source/Ox.UI/js/Bar/Ox.Resizebar.js b/source/Ox.UI/js/Bar/Ox.Resizebar.js index 5058f9ff..267f80bb 100644 --- a/source/Ox.UI/js/Bar/Ox.Resizebar.js +++ b/source/Ox.UI/js/Bar/Ox.Resizebar.js @@ -84,7 +84,7 @@ Ox.Resizebar = function(options, self) { Ox.forEach(self.options.resize, function(v) { if (self.options.size >= v - 8 && self.options.size <= v + 8) { self.options.size = v; - return false; + Ox.break(); } }); if (self.options.size != size) { diff --git a/source/Ox.UI/js/Calendar/Ox.Calendar.js b/source/Ox.UI/js/Calendar/Ox.Calendar.js index 7a3e7c4e..4a0149bd 100644 --- a/source/Ox.UI/js/Calendar/Ox.Calendar.js +++ b/source/Ox.UI/js/Calendar/Ox.Calendar.js @@ -702,7 +702,7 @@ Ox.Calendar = function(options, self) { Ox.forEach(self.options.events, function(v) { if (v.id == id) { event = v; - return false; + Ox.break(); } }); return event; @@ -777,7 +777,7 @@ Ox.Calendar = function(options, self) { Ox.forEach(self.lineEvents, function(events, line_) { if (Ox.getIndexById(events, id) > -1) { line = line_; - return false; + Ox.break(); } }); return line; @@ -817,12 +817,12 @@ Ox.Calendar = function(options, self) { // if overlaps, check next line if (overlaps(event, event_)) { fits = false; - return false; + Ox.break(); } }); if (fits) { line = line_; - return false; + Ox.break(); } }); if (line == self.lineEvents.length) { @@ -920,7 +920,7 @@ Ox.Calendar = function(options, self) { var width = Math.round(v.seconds * pixelsPerSecond); if (width >= self.minLabelWidth) { units = [self.units[i], self.units[i - 1]]; - return false; + Ox.break(); } }); self.units.reverse(); @@ -1296,7 +1296,6 @@ Ox.Calendar = function(options, self) { } event[key] = value; event = getEventData(event); - Ox.Log('Calendar', key, value, 'EVENT:', event) if ($element) { getLines(); renderCalendar(); diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js index a3ec362d..0383fca0 100644 --- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js +++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js @@ -48,7 +48,7 @@ Ox.ListCalendar = function(options, self) { if (eventDuration > duration) { iconSize = size; } else { - return false; + Ox.break(); } }); return data.type @@ -377,7 +377,6 @@ Ox.ListCalendar = function(options, self) { .hide() .bindEvent({ change: function(data) { - Ox.Log('Calendar', 'CHANGE', data); var exists = false, values; if (['name', 'alternativeNames'].indexOf(data.id) > -1) { exists = ''; @@ -392,10 +391,10 @@ Ox.ListCalendar = function(options, self) { ) ) { exists = value; - return false; + Ox.break(); } }); - return !exists; + exists && Ox.break(); }); } if (data.id == 'name') { @@ -690,7 +689,7 @@ Ox.ListCalendar = function(options, self) { || event.alternativeNames.indexOf(name) > -1 ) { exists = true; - return false; + Ox.break(); } }); return exists; diff --git a/source/Ox.UI/js/Code/Ox.DocPage.js b/source/Ox.UI/js/Code/Ox.DocPage.js index 67b71141..d3f13582 100644 --- a/source/Ox.UI/js/Code/Ox.DocPage.js +++ b/source/Ox.UI/js/Code/Ox.DocPage.js @@ -141,7 +141,7 @@ Ox.DocPage = function(options, self) { Ox.forEach(this.className.split(' '), function(v) { if (/Hidden$/.test(v)) { hidden = true; - return false; + Ox.break(); } }); if (!hidden) { diff --git a/source/Ox.UI/js/Code/Ox.DocPanel.js b/source/Ox.UI/js/Code/Ox.DocPanel.js index 3585d29f..4ddb7029 100644 --- a/source/Ox.UI/js/Code/Ox.DocPanel.js +++ b/source/Ox.UI/js/Code/Ox.DocPanel.js @@ -156,7 +156,7 @@ Ox.DocPanel = function(options, self) { Ox.forEach(self.options.items, function(v) { if (v.name == name) { item = v; - return false; + Ox.break(); } }); return item; diff --git a/source/Ox.UI/js/Core/Ox.Theme.js b/source/Ox.UI/js/Core/Ox.Theme.js index f3855c27..ea95da06 100644 --- a/source/Ox.UI/js/Core/Ox.Theme.js +++ b/source/Ox.UI/js/Core/Ox.Theme.js @@ -18,7 +18,7 @@ Ox.Theme = (function() { Ox.forEach(Ox.UI.$body.attr('class').split(' '), function(className) { if (Ox.startsWith(className, 'OxTheme')) { theme = className.replace('OxTheme', '').toLowerCase(); - return false; + Ox.break(); } }); return theme; @@ -105,7 +105,7 @@ Ox.Theme = (function() { background: $element_.css('background'), color: $element_.css('color') }); - return false; + Ox.break(); } }); }); diff --git a/source/Ox.UI/js/Core/Ox.URL.js b/source/Ox.UI/js/Core/Ox.URL.js index 0397d05f..a62e9a94 100644 --- a/source/Ox.UI/js/Core/Ox.URL.js +++ b/source/Ox.UI/js/Core/Ox.URL.js @@ -326,7 +326,7 @@ Ox.URL = function(options) { value: split.join(operator), operator: operator }; - return false; + Ox.break(); } }); if ( @@ -523,7 +523,7 @@ Ox.URL = function(options) { state.view = view; state.span = span; parts.shift(); - return false; + Ox.break(); } }); } @@ -583,7 +583,7 @@ Ox.URL = function(options) { // sort state.sort = parseSort(parts[0], state); parts.shift(); - return false; + Ox.break(); } } ); diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js index dd8e3dad..82881f8b 100644 --- a/source/Ox.UI/js/Form/Ox.Filter.js +++ b/source/Ox.UI/js/Form/Ox.Filter.js @@ -396,7 +396,7 @@ Ox.Filter = function(options, self) { Ox.forEach(self.options.query.conditions, function(condition) { if (condition.conditions) { hasGroups = true; - return false; + Ox.break(); } }); hasGroups && renderConditions(); @@ -426,7 +426,9 @@ Ox.Filter = function(options, self) { self.options.query.operator == '&' ? ['', '^', '$'] : ['!', '!^', '!$'] ).indexOf(condition.operator) > -1 && condition.value === '' - return isUseless; + // FIXME: this used to be `return isUseless` - but was it intended + // to be the other way around, i.e. `isUseless && Ox.break`? + !isUseless && Ox.break(); }); Ox.Log('Form', 'isUseless', isUseless); return isUseless; diff --git a/source/Ox.UI/js/Form/Ox.Form.js b/source/Ox.UI/js/Form/Ox.Form.js index ae4c4f45..67d469ce 100644 --- a/source/Ox.UI/js/Form/Ox.Form.js +++ b/source/Ox.UI/js/Form/Ox.Form.js @@ -100,7 +100,7 @@ Ox.Form = function(options, self) { } function submitCallback(data) { - Ox.forEach(data, function(v, i) { + Ox.forEach(data, function(v) { self.$items[getItemIndexById(v.id)].setMessage(v.message); }); } @@ -188,7 +188,6 @@ Ox.Form = function(options, self) { Ox.Log('Form', 'SET FORM VALUES', arguments[0]) Ox.forEach(arguments[0], function(value, key) { var index = getItemIndexById(key); - index > -1 && Ox.Log('Form', ':::::::', key, value) index > -1 && self.options.items[index].value(value); }); return that; diff --git a/source/Ox.UI/js/Form/Ox.FormPanel.js b/source/Ox.UI/js/Form/Ox.FormPanel.js index 464f4567..d55d4970 100644 --- a/source/Ox.UI/js/Form/Ox.FormPanel.js +++ b/source/Ox.UI/js/Form/Ox.FormPanel.js @@ -65,7 +65,7 @@ Ox.FormPanel = function(options, self) { Ox.forEach(self.options.form, function(section, i) { if (section.title == data.ids[0]) { self.section = i; - return false; + Ox.break(); } }); self.$sections[self.section].show(); @@ -147,7 +147,7 @@ Ox.FormPanel = function(options, self) { Ox.forEach(self.options.form, function(section, i) { if (section.title == title) { index = i; - return false; + Ox.break(); } }); return index; diff --git a/source/Ox.UI/js/Form/Ox.InputGroup.js b/source/Ox.UI/js/Form/Ox.InputGroup.js index 59df8c79..22f55e8c 100644 --- a/source/Ox.UI/js/Form/Ox.InputGroup.js +++ b/source/Ox.UI/js/Form/Ox.InputGroup.js @@ -90,7 +90,7 @@ Ox.InputGroup = function(options, self) { Ox.forEach(self.options.inputs, function($input) { if ($input.focusInput) { $input.focusInput(true); - return false; + Ox.break(); } }); } @@ -135,7 +135,6 @@ Ox.InputGroup = function(options, self) { } function validate(data) { - //Ox.Log('Form', 'INPUTGROUP TRIGGER VALIDATE') that.triggerEvent('validate', data); } @@ -152,7 +151,7 @@ Ox.InputGroup = function(options, self) { //Ox.Log('Form', v, v.options('id'), id) if (v.options('id') == self.options.id + Ox.toTitleCase(id)) { input = v; - return false; + Ox.break(); } }); return input; diff --git a/source/Ox.UI/js/Form/Ox.OptionGroup.js b/source/Ox.UI/js/Form/Ox.OptionGroup.js index f26e4bae..aadc9fe4 100644 --- a/source/Ox.UI/js/Form/Ox.OptionGroup.js +++ b/source/Ox.UI/js/Form/Ox.OptionGroup.js @@ -26,7 +26,7 @@ Ox.OptionGroup = function(items, min, max, property) { ), function(v) { if (items[v][property]) { last = v; - return false; + Ox.break(); } }); return last; diff --git a/source/Ox.UI/js/List/Ox.List.js b/source/Ox.UI/js/List/Ox.List.js index 0b182c40..b4314de8 100644 --- a/source/Ox.UI/js/List/Ox.List.js +++ b/source/Ox.UI/js/List/Ox.List.js @@ -607,10 +607,9 @@ Ox.List = function(options, self) { // fixme: is this really needed? var pos = -1; Ox.forEach(self.$items, function($item, i) { - //Ox.Log('List', '$item', i, self.options.unique, $item.options('data')[self.options.unique]) if ($item.options('data')[self.options.unique] == id) { pos = i; - return false; + Ox.break(); } }); return pos; @@ -698,7 +697,7 @@ Ox.List = function(options, self) { ids.push(self.$items[pos].options('data')[self.options.unique]); } else { notFound = true; - return false; + Ox.break(); } }); if (notFound) { @@ -1156,7 +1155,7 @@ Ox.List = function(options, self) { if (Ox.toLatin(v.title).toUpperCase().indexOf(str) == 0) { select(i); scrollToPosition(i); - return false; + Ox.break(); } }); } @@ -1343,7 +1342,7 @@ Ox.List = function(options, self) { if (oldIds.indexOf(item.id) > -1) { newIds.push(item.id); } - return newIds.length < oldIds.length; + newIds.length == oldIds.length && Ox.break(); }); setSelected(newIds); }); diff --git a/source/Ox.UI/js/List/Ox.TextList.js b/source/Ox.UI/js/List/Ox.TextList.js index 087ba742..fe258bc2 100644 --- a/source/Ox.UI/js/List/Ox.TextList.js +++ b/source/Ox.UI/js/List/Ox.TextList.js @@ -259,7 +259,7 @@ Ox.TextList = function(options, self) { index++; } else if (v.id == id) { column = v; - return false; + Ox.break(); } }); column.visible = true; @@ -283,7 +283,7 @@ Ox.TextList = function(options, self) { if (!self.options.columns[index].visible) { addColumn(id); add = true; - return false; + Ox.break(); } ids.push(id); }); @@ -291,7 +291,7 @@ Ox.TextList = function(options, self) { Ox.forEach(self.visibleColumns, function(column) { if (ids.indexOf(column.id) == -1) { removeColumn(column.id); - return false; + Ox.break(); } }); } @@ -484,7 +484,7 @@ Ox.TextList = function(options, self) { var x = self.drag.listOffset + offset + self.columnWidths[i] / 2; if (i < self.drag.startPos && e.clientX < x) { self.drag.stopPos = i; - return false; + Ox.break(); } else if (i > self.drag.startPos && e.clientX > x) { self.drag.stopPos = i; } @@ -574,7 +574,7 @@ Ox.TextList = function(options, self) { if (Ox.startsWith(value, query)) { that.$body.options({selected: [item[self.unique]]}); Ox.Log('List', 'QUERY', query, 'VALUE', value) - return false; + Ox.break(); } }); } diff --git a/source/Ox.UI/js/List/Ox.TreeList.js b/source/Ox.UI/js/List/Ox.TreeList.js index e21eeff3..a7e05776 100644 --- a/source/Ox.UI/js/List/Ox.TreeList.js +++ b/source/Ox.UI/js/List/Ox.TreeList.js @@ -33,7 +33,7 @@ Ox.TreeList = function(options, self) { if (self.options.data) { self.options.items = []; - Ox.forEach(Ox.sort(Ox.keys(self.options.data)), function(key) { + Ox.sort(Object.keys(self.options.data)).forEach(function(key) { self.options.items.push(parseData(key, self.options.data[key])); }); } @@ -123,12 +123,12 @@ Ox.TreeList = function(options, self) { ret = Ox.extend(item, { level: level }); - return false; + Ox.break(); } if (item.items) { ret = getItemById(id, item.items, level + 1); if (ret) { - return false; + Ox.break(); } } }); @@ -145,7 +145,7 @@ Ox.TreeList = function(options, self) { ret = getParent(id, item.items); } if (ret) { - return false; + Ox.break(); } } }); diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js index 0626fcc4..a0ba2f08 100644 --- a/source/Ox.UI/js/Map/Ox.ListMap.js +++ b/source/Ox.UI/js/Map/Ox.ListMap.js @@ -113,7 +113,7 @@ Ox.ListMap = function(options, self) { if (data.area >= area) { iconSize = size; } else { - return false; + Ox.break(); } }); return data.type diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js index 4ffe3033..24c6dda2 100644 --- a/source/Ox.UI/js/Map/Ox.Map.js +++ b/source/Ox.UI/js/Map/Ox.Map.js @@ -543,7 +543,7 @@ Ox.Map = function(options, self) { if (place.bounds.equals(p.bounds)) { place = p; exists = true; - return false; + Ox.break(); } }); if (!exists) { @@ -737,7 +737,7 @@ Ox.Map = function(options, self) { canContain(bounds, result.geometry.bounds || result.geometry.viewport) ) { callback(new Ox.MapPlace(parseGeodata(results[i]))); - return false; + Ox.break(); } }); } else { @@ -786,7 +786,7 @@ Ox.Map = function(options, self) { Ox.forEach(self.options.places, function(place, i) { if (place.name == name) { position = i; - return false; + Ox.break(); } }); return position; @@ -802,7 +802,7 @@ Ox.Map = function(options, self) { Ox.forEach(self.places, function(place) { if (place.selected) { id = place.id; - return false; + Ox.break(); } }); } @@ -1037,7 +1037,7 @@ Ox.Map = function(options, self) { Ox.forEach(components, function(component) { if (component.types.indexOf('country') > -1) { countryCode = component.short_name; - return false; + Ox.break(); } }); return countryCode; @@ -1076,7 +1076,7 @@ Ox.Map = function(options, self) { var ret; Ox.forEach(types, function(v) { ret = Ox.startsWith(v, type); - return !ret; + ret && Ox.break(); }); return ret; } @@ -1084,10 +1084,10 @@ Ox.Map = function(options, self) { Ox.forEach(values, function(value) { if (find(value)) { type = key; - return false; + Ox.break(); } }); - return type == 'feature'; + type != 'feature' && Ox.break(); }); return type; } @@ -1243,7 +1243,7 @@ Ox.Map = function(options, self) { .css({ width: (scaleWidth - 16) + 'px' }) - return false; + Ox.break(); } }); } diff --git a/source/Ox.UI/js/Map/Ox.MapMarker.js b/source/Ox.UI/js/Map/Ox.MapMarker.js index fdb709ae..935e0858 100644 --- a/source/Ox.UI/js/Map/Ox.MapMarker.js +++ b/source/Ox.UI/js/Map/Ox.MapMarker.js @@ -218,7 +218,7 @@ Ox.MapMarker = function(options) { if (that.place.area >= area) { that.size = size; } else { - return false; + Ox.break(); } }); } else if (Ox.isNumber(size)) { diff --git a/source/Ox.UI/js/Map/Ox.MapPlace.js b/source/Ox.UI/js/Map/Ox.MapPlace.js index 65d75ccb..021fbeb6 100644 --- a/source/Ox.UI/js/Map/Ox.MapPlace.js +++ b/source/Ox.UI/js/Map/Ox.MapPlace.js @@ -151,7 +151,6 @@ Ox.MapPlace = function(options) { options = Ox.makeObject(arguments); Ox.forEach(options, function(value, key) { that[key] = value; - Ox.Log('Map', 'that.' + key, '=', value, '......') }); update(true); }; diff --git a/source/Ox.UI/js/Menu/Ox.MainMenu.js b/source/Ox.UI/js/Menu/Ox.MainMenu.js index 35ce8464..d71bc440 100644 --- a/source/Ox.UI/js/Menu/Ox.MainMenu.js +++ b/source/Ox.UI/js/Menu/Ox.MainMenu.js @@ -177,7 +177,7 @@ Ox.MainMenu = function(options, self) { if (ids.length == 1) { Ox.forEach(that.menus, function(menu) { item = menu.getItem(id); - return !item; + item && Ox.break(); }); } else { item = that.getMenu(ids.shift()).getItem(ids.join('_')); @@ -196,7 +196,7 @@ Ox.MainMenu = function(options, self) { Ox.forEach(that.menus, function(v) { if (v.options('id') == id) { menu = v; - return false; + Ox.break(); } }); } else { diff --git a/source/Ox.UI/js/Menu/Ox.Menu.js b/source/Ox.UI/js/Menu/Ox.Menu.js index b2fad415..c6e4efd1 100644 --- a/source/Ox.UI/js/Menu/Ox.Menu.js +++ b/source/Ox.UI/js/Menu/Ox.Menu.js @@ -191,7 +191,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.items, function(item, i) { if (item.options('id') == id) { position = i; - return false; + Ox.break(); } }); return position; @@ -206,7 +206,8 @@ Ox.Menu = function(options, self) { var ret = true; Ox.forEach(that.items, function(item, i) { if (i < self.options.selected && !item.options('disabled')) { - return ret = false; + ret = false; + Ox.break(); } }); return ret; @@ -216,7 +217,8 @@ Ox.Menu = function(options, self) { var ret = true; Ox.forEach(that.items, function(item, i) { if (i > self.options.selected && !item.options('disabled')) { - return ret = false; + ret = false; + Ox.break(); } }); return ret; @@ -459,7 +461,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.submenus, function(submenu, id) { if (!submenu.is(':hidden')) { submenu.hideMenu(); - return false; + Ox.break(); } }); item.options('items').length && that.submenus[item.options('id')].showMenu(); @@ -650,13 +652,13 @@ Ox.Menu = function(options, self) { Ox.forEach(that.items, function(v) { if (v.options('id') == id) { item = v; - return false; + Ox.break(); } }); if (!item) { Ox.forEach(that.submenus, function(submenu) { item = submenu.getItem(id); - return !item; + item && Ox.break(); }); } } else { @@ -689,7 +691,8 @@ Ox.Menu = function(options, self) { var ret = false; Ox.forEach(that.items, function(item) { if (!item.options('disabled')) { - return ret = true; + ret = true; + Ox.break(); } }); return ret; @@ -706,7 +709,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.submenus, function(submenu) { if (submenu.is(':visible')) { submenu.hideMenu(); - return false; + Ox.break(); } }); selectItem(-1); diff --git a/source/Ox.UI/js/Panel/Ox.SplitPanel.js b/source/Ox.UI/js/Panel/Ox.SplitPanel.js index 42201491..6aee19af 100644 --- a/source/Ox.UI/js/Panel/Ox.SplitPanel.js +++ b/source/Ox.UI/js/Panel/Ox.SplitPanel.js @@ -103,7 +103,7 @@ Ox.SplitPanel = function(options, self) { Ox.forEach(self.options.elements, function(element, i) { if (element.element.options('id') == id) { position = i; - return false; + Ox.break(); } }); return position; diff --git a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js index e4a5561a..81dbc759 100644 --- a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js +++ b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js @@ -188,10 +188,10 @@ Ox.AnnotationPanel = function(options, self) { if (item.id == annotationId) { annotation = item; found = true; - return false; + Ox.break(); } }); - return !found; + found && Ox.break(); }); return annotation; } @@ -203,10 +203,10 @@ Ox.AnnotationPanel = function(options, self) { if (item.id == annotationId) { folder = self.$folder[i]; found = true; - return false; + Ox.break(); } }); - return !found; + found && Ox.break(); }); return folder; } @@ -427,7 +427,7 @@ Ox.AnnotationPanel = function(options, self) { self.deselecting = true; $folder.options({selected: ''}); self.deselecting = false; - return false; + Ox.break(); } }); scrollToSelected(self.options.layers[index].type); diff --git a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js index b7bd7d1b..19780334 100644 --- a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js @@ -157,7 +157,7 @@ Ox.BlockVideoTimeline = function(options, self) { Ox.forEach(self.options.subtitles, function(v) { if (v['in'] <= position && v.out > position) { subtitle = v; - return false; + Ox.break(); } }); return subtitle; diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index f6e1a196..fad59f87 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -118,7 +118,7 @@ Ox.SmallVideoTimeline = function(options, self) { Ox.forEach(self.options.subtitles, function(v) { if (v['in'] <= position && v.out > position) { subtitle = v; - return false; + Ox.break(); } }); return subtitle; diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 36b82e1e..1525c641 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -863,10 +863,10 @@ Ox.VideoEditor = function(options, self) { if (item.id == annotationId) { value = item.value; found = true; - return false; + Ox.break(); } }); - return !found; + found && Ox.break(); }); return value; } @@ -917,7 +917,7 @@ Ox.VideoEditor = function(options, self) { ) { position = v; found = true; - return false; + Ox.break(); } }); direction == -1 && positions.reverse(); @@ -1104,7 +1104,7 @@ Ox.VideoEditor = function(options, self) { 'in': i ? self.options.cuts[i - 1] : 0, out: cut - 1 / self.options.fps }; - return false; + Ox.break(); } }); self.options.selected = ''; diff --git a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js index 7d77782d..b7194b0f 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js @@ -231,7 +231,7 @@ Ox.VideoEditorPlayer = function(options, self) { Ox.forEach(self.options.subtitles, function(v) { if (v['in'] <= self.options.position && v['out'] > self.options.position) { subtitle = v.value; - return false; + Ox.break(); } }); return subtitle; @@ -273,8 +273,8 @@ Ox.VideoEditorPlayer = function(options, self) { self.$markerFrame.show() : self.$markerFrame.hide(); Ox.forEach(self.$markerPoint, function(markers, point) { Ox.forEach(markers, function(marker) { - self.options.position == self.options.points[point == 'in' ? 0 : 1] ? - marker.show() : marker.hide(); + self.options.position == self.options.points[point == 'in' ? 0 : 1] + ? marker.show() : marker.hide(); }); }) } diff --git a/source/Ox.UI/js/Video/Ox.VideoElement.js b/source/Ox.UI/js/Video/Ox.VideoElement.js index 20735a0f..68634ed3 100644 --- a/source/Ox.UI/js/Video/Ox.VideoElement.js +++ b/source/Ox.UI/js/Video/Ox.VideoElement.js @@ -441,9 +441,9 @@ Ox.VideoElement = function(options, self) { } }); } else { - Ox.forEach(self.items[0].$videos, function($video, i) { + self.items[0].$videos.forEach(function($video, i) { var src = self.options.src[i]; - if(Ox.parseURL(src).protocol.substr(0, 4) == 'http') { + if (Ox.parseURL(src).protocol.substr(0, 4) == 'http') { src += '?' + Ox.uid(); } $video[0].src = src; diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index 7f5bb4b5..19202392 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -1214,7 +1214,7 @@ Ox.VideoPlayer = function(options, self) { && v.out > self.options.position ) { censored = true; - return false; + Ox.break(); } }); return censored; @@ -1392,7 +1392,7 @@ Ox.VideoPlayer = function(options, self) { && v.out >= self.options.position ) { subtitle = v.text; - return false; + Ox.break(); } }); return subtitle; @@ -1441,7 +1441,7 @@ Ox.VideoPlayer = function(options, self) { var left = 0; Ox.forEach(self.options.controlsBottom, function(control) { if (control == 'timeline') { - return false; + Ox.break(); } left += control == 'position' ? self.positionWidth : 16 }); @@ -1525,7 +1525,7 @@ Ox.VideoPlayer = function(options, self) { ) { result = v found = true; - return false; + Ox.break(); } }); direction == -1 && self.results.reverse(); @@ -1882,16 +1882,16 @@ Ox.VideoPlayer = function(options, self) { function setMarkers() { //Ox.Log('Video', 'SET MARKERS', self.options.position, self.options['in'], self.options.out, self.$pointMarker); Ox.forEach(self.$posterMarker, function(marker) { - isEqual(self.options.position, self.options.posterFrame) ? - marker.show() : marker.hide(); + isEqual(self.options.position, self.options.posterFrame) + ? marker.show() : marker.hide(); }); Ox.forEach(self.$pointMarker, function(markers, point) { Ox.forEach(markers, function(marker) { //Ox.Log('Video', self.options.position, self.options[point], isEqual(self.options.position, self.options[point])) // fixme: there's a bug in jquery and/or webkit // on load, show() doesn't work - isEqual(self.options.position, self.options[point]) ? - marker.css({display: 'block'}) : marker.hide(); + isEqual(self.options.position, self.options[point]) + ? marker.css({display: 'block'}) : marker.hide(); }); }); } diff --git a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js index fb80e877..516f10e1 100644 --- a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js @@ -485,7 +485,7 @@ Ox.VideoTimelinePlayer = function(options, self) { Ox.forEach(self.options.subtitles, function(v) { if (v['in'] <= position && v.out > position) { subtitle = v; - return false; + Ox.break(); } }); return subtitle; diff --git a/source/Ox.UI/js/Window/Ox.Dialog.js b/source/Ox.UI/js/Window/Ox.Dialog.js index e8c5fdea..53cef29a 100644 --- a/source/Ox.UI/js/Window/Ox.Dialog.js +++ b/source/Ox.UI/js/Window/Ox.Dialog.js @@ -255,10 +255,9 @@ Ox.Dialog = function(options, self) { function getButtonById(id) { var ret = null; Ox.forEach(self.options.buttons, function(button) { - //Ox.Log('Window', button.options(), button.options('id')) if (button.options && button.options('id') == id) { ret = button; - return false; + Ox.break(); } }); return ret; diff --git a/source/Ox/js/Array.js b/source/Ox/js/Array.js index 7df97272..3288efe3 100644 --- a/source/Ox/js/Array.js +++ b/source/Ox/js/Array.js @@ -317,7 +317,7 @@ Ox.api = function(items, options) { (query.operator == '&' && !match) || (query.operator == '|' && match) ) { - return false; + Ox.break(); } }); return match; @@ -459,7 +459,7 @@ Ox.range = function() { len = article.length; sort[val] = sort[val].substr(len + 1) + ', ' + sort[val].substr(0, len); - return false; + Ox.break(); } }); } else { diff --git a/source/Ox/js/Encoding.js b/source/Ox/js/Encoding.js index fc6e64b2..859e3216 100644 --- a/source/Ox/js/Encoding.js +++ b/source/Ox/js/Encoding.js @@ -332,7 +332,7 @@ img Any JavaScript PNG image object str The string to be encoded @*/ - + // fixme: remove, exists in image module Ox.encodePNG = function(img, str) { var c = Ox.canvas(img), i = 0; // Compress the string diff --git a/source/Ox/js/Format.js b/source/Ox/js/Format.js index a01fae18..e5a20dc7 100644 --- a/source/Ox/js/Format.js +++ b/source/Ox/js/Format.js @@ -337,7 +337,7 @@ Ox.formatDateRangeDuration = function(start, end, utc) { keys = ['year', 'month', 'day', 'hour', 'minute', 'second'], parts = ['FullYear', 'Month', 'Date', 'Hours', 'Minutes', 'Seconds'], values = []; - Ox.forEach(keys, function(key, i) { + keys.forEach(function(key, i) { while (true) { if (key == 'month') { // set the day to the same day in the next month, @@ -574,7 +574,7 @@ Ox.formatValue = function(num, str, bin) { if (num < Math.pow(base, i + 1) || i == len - 1) { val = Ox.formatNumber(num / Math.pow(base, i), i ? i - 1 : 0) + ' ' + chr + (chr && bin ? 'i' : '') + str; - return false; + Ox.break(); } }); return val; diff --git a/source/Ox/js/Geo.js b/source/Ox/js/Geo.js index 4b812352..ed95ed40 100644 --- a/source/Ox/js/Geo.js +++ b/source/Ox/js/Geo.js @@ -266,10 +266,10 @@ Ox.forEach(areas[0], function(area0) { ret = contains(area0, area1); // Break if the outer part contains the inner part - return !ret; + ret && Ox.break(); }); // Break if no outer part contains the inner part - return ret; + !ret && Ox.break(); }); return ret; }; @@ -327,7 +327,7 @@ : Ox.joinAreas(intersections); } if (ret === null) { - return false; + Ox.break(); } else { ret = splitArea(ret); } @@ -378,7 +378,7 @@ Ox.forEach(gaps, function(gap, i) { if (Ox.containsArea(gap, area)) { ret = i; - return false; + Ox.break(); } }); return ret; diff --git a/source/Ox/js/JavaScript.js b/source/Ox/js/JavaScript.js index 44ef989c..2b4f1999 100644 --- a/source/Ox/js/JavaScript.js +++ b/source/Ox/js/JavaScript.js @@ -643,7 +643,7 @@ Ox.tokenize = (function() { Ox.forEach(word, function(value, key) { if (value.indexOf(str) > -1) { type = key; - return false; + Ox.break(); } }); }, diff --git a/source/Ox/js/Object.js b/source/Ox/js/Object.js index 439b94b7..2c8087d3 100644 --- a/source/Ox/js/Object.js +++ b/source/Ox/js/Object.js @@ -28,7 +28,7 @@ Ox.keyOf = function(obj, val) { Ox.forEach(obj, function(v, k) { if (v === val) { key = k; - return false; + Ox.break(); } }); return key; @@ -84,7 +84,7 @@ Ox.unserialize Parses query parameters into an object @*/ Ox.unserialize = function(str, toNumber) { var obj = {}; - Ox.forEach(str.split('&'), function(val) { + str.split('&').forEach(function(val) { if (val) { var arr = val.split('='); if (arr[1]) { diff --git a/source/Ox/js/String.js b/source/Ox/js/String.js index c53cdc5c..cd278612 100644 --- a/source/Ox/js/String.js +++ b/source/Ox/js/String.js @@ -109,7 +109,7 @@ Ox.highlightHTML = function(html, str, classname, tags) { Ox.forEach(tags, function(tag) { if (html.substr(i + 1).match(new RegExp('^/?' + tag + '\\W'))) { isTag = true; - return false; + Ox.break(); } }); } @@ -378,7 +378,7 @@ Ox.parseUserAgent = function(userAgent) { string: string, version: versions[version] || version }; - return false; + Ox.break(); } }); }); @@ -616,7 +616,8 @@ Ox.wordwrap = function(str, len, sep, bal, spa) { } } lines = ['']; - Ox.forEach(words, function(word) { + words.forEach(function(word) { + var chr; if ((lines[lines.length - 1] + word + ' ').length <= len + 1) { // word fits in current line lines[lines.length - 1] += word + ' '; @@ -626,11 +627,11 @@ Ox.wordwrap = function(str, len, sep, bal, spa) { lines.push(word + ' '); } else { // word is longer than line - var chr = len - lines[lines.length - 1].length; + chr = len - lines[lines.length - 1].length; lines[lines.length - 1] += word.substr(0, chr); - for (var pos = chr; pos < word.length; pos += len) { + Ox.loop(chr, word.length, len, function(pos) { lines.push(word.substr(pos, len)); - } + }); lines[lines.length - 1] += ' '; } } diff --git a/source/Ox/js/Type.js b/source/Ox/js/Type.js index 18706af6..40938f77 100644 --- a/source/Ox/js/Type.js +++ b/source/Ox/js/Type.js @@ -140,7 +140,7 @@ Ox.isEqual = function(a, b) { isEqual = true; Ox.forEach(a, function(v, k) { isEqual = Ox.isEqual(v, b[k]); - return isEqual; + !isEqual && Ox.break(); }); } }