From 544e117cb3541ad0af40ce6ab36a7c3b41c6753a Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 24 May 2012 19:20:29 +0200 Subject: [PATCH] Ox.break -> Ox.Break --- source/Ox.Geo/Ox.Geo.js | 4 ++-- source/Ox.Image/Ox.Image.js | 6 +++--- source/Ox.UI/Ox.UI.js | 2 +- source/Ox.UI/js/Bar/Ox.Resizebar.js | 2 +- source/Ox.UI/js/Calendar/Ox.Calendar.js | 10 +++++----- source/Ox.UI/js/Calendar/Ox.ListCalendar.js | 8 ++++---- source/Ox.UI/js/Code/Ox.DocPage.js | 2 +- source/Ox.UI/js/Code/Ox.DocPanel.js | 2 +- source/Ox.UI/js/Core/Ox.Theme.js | 4 ++-- source/Ox.UI/js/Core/Ox.URL.js | 6 +++--- source/Ox.UI/js/Form/Ox.Filter.js | 6 +++--- source/Ox.UI/js/Form/Ox.FormPanel.js | 4 ++-- source/Ox.UI/js/Form/Ox.InputGroup.js | 4 ++-- source/Ox.UI/js/Form/Ox.OptionGroup.js | 2 +- source/Ox.UI/js/List/Ox.List.js | 8 ++++---- source/Ox.UI/js/List/Ox.TextList.js | 10 +++++----- source/Ox.UI/js/List/Ox.TreeList.js | 6 +++--- source/Ox.UI/js/Map/Ox.ListMap.js | 2 +- source/Ox.UI/js/Map/Ox.Map.js | 18 +++++++++--------- source/Ox.UI/js/Map/Ox.MapMarker.js | 2 +- source/Ox.UI/js/Menu/Ox.MainMenu.js | 4 ++-- source/Ox.UI/js/Menu/Ox.Menu.js | 16 ++++++++-------- source/Ox.UI/js/Panel/Ox.SplitPanel.js | 2 +- source/Ox.UI/js/Video/Ox.AnnotationPanel.js | 10 +++++----- source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js | 2 +- source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js | 2 +- source/Ox.UI/js/Video/Ox.VideoEditor.js | 8 ++++---- source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js | 2 +- source/Ox.UI/js/Video/Ox.VideoElement.js | 2 +- source/Ox.UI/js/Video/Ox.VideoPlayer.js | 8 ++++---- .../Ox.UI/js/Video/Ox.VideoTimelinePlayer.js | 2 +- source/Ox.UI/js/Window/Ox.Dialog.js | 2 +- source/Ox/js/Array.js | 4 ++-- source/Ox/js/Async.js | 2 +- source/Ox/js/Core.js | 4 ++-- source/Ox/js/Format.js | 4 ++-- source/Ox/js/Geo.js | 8 ++++---- source/Ox/js/JavaScript.js | 2 +- source/Ox/js/Object.js | 2 +- source/Ox/js/String.js | 4 ++-- source/Ox/js/Type.js | 2 +- 41 files changed, 100 insertions(+), 100 deletions(-) diff --git a/source/Ox.Geo/Ox.Geo.js b/source/Ox.Geo/Ox.Geo.js index 71e8d127..68527a06 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; - Ox.break(); + 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; - Ox.break(); + Ox.Break()(); } }); return country; diff --git a/source/Ox.Image/Ox.Image.js b/source/Ox.Image/Ox.Image.js index c4f6eb64..f1e1219c 100644 --- a/source/Ox.Image/Ox.Image.js +++ b/source/Ox.Image/Ox.Image.js @@ -446,14 +446,14 @@ Ox.load.Image = function(options, callback) { str = ''; } else { // After length more bytes, break - Ox.break(); + Ox.Break()(); } } } }); - done == 2 && Ox.break(); + done == 2 && Ox.Break()(); }); - done == 2 && Ox.break(); + done == 2 && Ox.Break()(); } }, function() { try { diff --git a/source/Ox.UI/Ox.UI.js b/source/Ox.UI/Ox.UI.js index ed08b06f..3677eb05 100644 --- a/source/Ox.UI/Ox.UI.js +++ b/source/Ox.UI/Ox.UI.js @@ -330,7 +330,7 @@ Ox.load.UI = function(options, callback) { && !/chrome/.test(userAgent) && !/linux/.test(userAgent) )) { format = f; - Ox.break(); + Ox.Break()(); } } }); diff --git a/source/Ox.UI/js/Bar/Ox.Resizebar.js b/source/Ox.UI/js/Bar/Ox.Resizebar.js index 267f80bb..ce3f40af 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; - Ox.break(); + 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 7c767343..14cc2c26 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; - Ox.break(); + 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_; - Ox.break(); + Ox.Break()(); } }); return line; @@ -817,12 +817,12 @@ Ox.Calendar = function(options, self) { // if overlaps, check next line if (overlaps(event, event_)) { fits = false; - Ox.break(); + Ox.Break()(); } }); if (fits) { line = line_; - Ox.break(); + 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]]; - Ox.break(); + Ox.Break()(); } }); self.units.reverse(); diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js index 4d1bcd76..01467fa2 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 { - Ox.break(); + Ox.Break()(); } }); return data.type @@ -391,10 +391,10 @@ Ox.ListCalendar = function(options, self) { ) ) { exists = value; - Ox.break(); + Ox.Break()(); } }); - exists && Ox.break(); + exists && Ox.Break()(); }); } if (data.id == 'name') { @@ -689,7 +689,7 @@ Ox.ListCalendar = function(options, self) { || event.alternativeNames.indexOf(name) > -1 ) { exists = true; - Ox.break(); + 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 f1c6239b..635346db 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; - Ox.break(); + 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 118557f9..09c7b298 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; - Ox.break(); + 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 ea95da06..692c9216 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(); - Ox.break(); + Ox.Break()(); } }); return theme; @@ -105,7 +105,7 @@ Ox.Theme = (function() { background: $element_.css('background'), color: $element_.css('color') }); - Ox.break(); + Ox.Break()(); } }); }); diff --git a/source/Ox.UI/js/Core/Ox.URL.js b/source/Ox.UI/js/Core/Ox.URL.js index fadc202d..bbfb02cc 100644 --- a/source/Ox.UI/js/Core/Ox.URL.js +++ b/source/Ox.UI/js/Core/Ox.URL.js @@ -324,7 +324,7 @@ Ox.URL = function(options) { value: split.join(operator), operator: operator }; - Ox.break(); + Ox.Break()(); } }); if ( @@ -521,7 +521,7 @@ Ox.URL = function(options) { state.view = view; state.span = span; parts.shift(); - Ox.break(); + Ox.Break()(); } }); } @@ -581,7 +581,7 @@ Ox.URL = function(options) { // sort state.sort = parseSort(parts[0], state); parts.shift(); - Ox.break(); + Ox.Break()(); } } ); diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js index 4a1770fa..a5ee8637 100644 --- a/source/Ox.UI/js/Form/Ox.Filter.js +++ b/source/Ox.UI/js/Form/Ox.Filter.js @@ -394,7 +394,7 @@ Ox.Filter = function(options, self) { Ox.forEach(self.options.query.conditions, function(condition) { if (condition.conditions) { hasGroups = true; - Ox.break(); + Ox.Break()(); } }); hasGroups && renderConditions(); @@ -425,8 +425,8 @@ Ox.Filter = function(options, self) { ).indexOf(condition.operator) > -1 && condition.value === '' // 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(); + // 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.FormPanel.js b/source/Ox.UI/js/Form/Ox.FormPanel.js index 5cfd4e0f..db86a887 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; - Ox.break(); + 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; - Ox.break(); + 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 10b9fefc..b0bb0963 100644 --- a/source/Ox.UI/js/Form/Ox.InputGroup.js +++ b/source/Ox.UI/js/Form/Ox.InputGroup.js @@ -88,7 +88,7 @@ Ox.InputGroup = function(options, self) { Ox.forEach(self.options.inputs, function($input) { if ($input.focusInput) { $input.focusInput(true); - Ox.break(); + Ox.Break()(); } }); } @@ -149,7 +149,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; - Ox.break(); + 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 b9c47161..fc66a6f5 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; - Ox.break(); + 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 c7959c9f..1392fe22 100644 --- a/source/Ox.UI/js/List/Ox.List.js +++ b/source/Ox.UI/js/List/Ox.List.js @@ -607,7 +607,7 @@ Ox.List = function(options, self) { Ox.forEach(self.$items, function($item, i) { if ($item.options('data')[self.options.unique] == id) { pos = i; - Ox.break(); + Ox.Break()(); } }); return pos; @@ -695,7 +695,7 @@ Ox.List = function(options, self) { ids.push(self.$items[pos].options('data')[self.options.unique]); } else { notFound = true; - Ox.break(); + Ox.Break()(); } }); if (notFound) { @@ -1153,7 +1153,7 @@ Ox.List = function(options, self) { if (Ox.toLatin(v.title).toUpperCase().indexOf(str) == 0) { select(i); scrollToPosition(i); - Ox.break(); + Ox.Break()(); } }); } @@ -1340,7 +1340,7 @@ Ox.List = function(options, self) { if (oldIds.indexOf(item.id) > -1) { newIds.push(item.id); } - newIds.length == oldIds.length && Ox.break(); + 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 28b8663e..b44ee65f 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; - Ox.break(); + Ox.Break()(); } }); column.visible = true; @@ -283,7 +283,7 @@ Ox.TextList = function(options, self) { if (!self.options.columns[index].visible) { addColumn(id); add = true; - Ox.break(); + 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); - Ox.break(); + 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; - Ox.break(); + 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) - Ox.break(); + Ox.Break()(); } }); } diff --git a/source/Ox.UI/js/List/Ox.TreeList.js b/source/Ox.UI/js/List/Ox.TreeList.js index d59cb85b..d97804c6 100644 --- a/source/Ox.UI/js/List/Ox.TreeList.js +++ b/source/Ox.UI/js/List/Ox.TreeList.js @@ -121,12 +121,12 @@ Ox.TreeList = function(options, self) { ret = Ox.extend(item, { level: level }); - Ox.break(); + Ox.Break()(); } if (item.items) { ret = getItemById(id, item.items, level + 1); if (ret) { - Ox.break(); + Ox.Break()(); } } }); @@ -143,7 +143,7 @@ Ox.TreeList = function(options, self) { ret = getParent(id, item.items); } if (ret) { - Ox.break(); + Ox.Break()(); } } }); diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js index 0c775163..e4b3c376 100644 --- a/source/Ox.UI/js/Map/Ox.ListMap.js +++ b/source/Ox.UI/js/Map/Ox.ListMap.js @@ -111,7 +111,7 @@ Ox.ListMap = function(options, self) { if (data.area >= area) { iconSize = size; } else { - Ox.break(); + 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 6a01715a..a88e80f8 100644 --- a/source/Ox.UI/js/Map/Ox.Map.js +++ b/source/Ox.UI/js/Map/Ox.Map.js @@ -541,7 +541,7 @@ Ox.Map = function(options, self) { if (place.bounds.equals(p.bounds)) { place = p; exists = true; - Ox.break(); + Ox.Break()(); } }); if (!exists) { @@ -735,7 +735,7 @@ Ox.Map = function(options, self) { canContain(bounds, result.geometry.bounds || result.geometry.viewport) ) { callback(new Ox.MapPlace(parseGeodata(results[i]))); - Ox.break(); + Ox.Break()(); } }); } else { @@ -784,7 +784,7 @@ Ox.Map = function(options, self) { Ox.forEach(self.options.places, function(place, i) { if (place.name == name) { position = i; - Ox.break(); + Ox.Break()(); } }); return position; @@ -800,7 +800,7 @@ Ox.Map = function(options, self) { Ox.forEach(self.places, function(place) { if (place.selected) { id = place.id; - Ox.break(); + Ox.Break()(); } }); } @@ -1035,7 +1035,7 @@ Ox.Map = function(options, self) { Ox.forEach(components, function(component) { if (component.types.indexOf('country') > -1) { countryCode = component.short_name; - Ox.break(); + Ox.Break()(); } }); return countryCode; @@ -1074,7 +1074,7 @@ Ox.Map = function(options, self) { var ret; Ox.forEach(types, function(v) { ret = Ox.startsWith(v, type); - ret && Ox.break(); + ret && Ox.Break()(); }); return ret; } @@ -1082,10 +1082,10 @@ Ox.Map = function(options, self) { Ox.forEach(values, function(value) { if (find(value)) { type = key; - Ox.break(); + Ox.Break()(); } }); - type != 'feature' && Ox.break(); + type != 'feature' && Ox.Break()(); }); return type; } @@ -1241,7 +1241,7 @@ Ox.Map = function(options, self) { .css({ width: (scaleWidth - 16) + 'px' }) - Ox.break(); + Ox.Break()(); } }); } diff --git a/source/Ox.UI/js/Map/Ox.MapMarker.js b/source/Ox.UI/js/Map/Ox.MapMarker.js index 935e0858..43f82020 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 { - Ox.break(); + Ox.Break()(); } }); } else if (Ox.isNumber(size)) { diff --git a/source/Ox.UI/js/Menu/Ox.MainMenu.js b/source/Ox.UI/js/Menu/Ox.MainMenu.js index db90ff9d..8b5f973e 100644 --- a/source/Ox.UI/js/Menu/Ox.MainMenu.js +++ b/source/Ox.UI/js/Menu/Ox.MainMenu.js @@ -175,7 +175,7 @@ Ox.MainMenu = function(options, self) { if (ids.length == 1) { Ox.forEach(that.menus, function(menu) { item = menu.getItem(id); - item && Ox.break(); + item && Ox.Break()(); }); } else { item = that.getMenu(ids.shift()).getItem(ids.join('_')); @@ -194,7 +194,7 @@ Ox.MainMenu = function(options, self) { Ox.forEach(that.menus, function(v) { if (v.options('id') == id) { menu = v; - Ox.break(); + Ox.Break()(); } }); } else { diff --git a/source/Ox.UI/js/Menu/Ox.Menu.js b/source/Ox.UI/js/Menu/Ox.Menu.js index 7348c162..4ac96aad 100644 --- a/source/Ox.UI/js/Menu/Ox.Menu.js +++ b/source/Ox.UI/js/Menu/Ox.Menu.js @@ -189,7 +189,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.items, function(item, i) { if (item.options('id') == id) { position = i; - Ox.break(); + Ox.Break()(); } }); return position; @@ -205,7 +205,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.items, function(item, i) { if (i < self.options.selected && !item.options('disabled')) { ret = false; - Ox.break(); + Ox.Break()(); } }); return ret; @@ -216,7 +216,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.items, function(item, i) { if (i > self.options.selected && !item.options('disabled')) { ret = false; - Ox.break(); + Ox.Break()(); } }); return ret; @@ -459,7 +459,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.submenus, function(submenu, id) { if (!submenu.is(':hidden')) { submenu.hideMenu(); - Ox.break(); + Ox.Break()(); } }); item.options('items').length && that.submenus[item.options('id')].showMenu(); @@ -650,13 +650,13 @@ Ox.Menu = function(options, self) { Ox.forEach(that.items, function(v) { if (v.options('id') == id) { item = v; - Ox.break(); + Ox.Break()(); } }); if (!item) { Ox.forEach(that.submenus, function(submenu) { item = submenu.getItem(id); - item && Ox.break(); + item && Ox.Break()(); }); } } else { @@ -690,7 +690,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.items, function(item) { if (!item.options('disabled')) { ret = true; - Ox.break(); + Ox.Break()(); } }); return ret; @@ -707,7 +707,7 @@ Ox.Menu = function(options, self) { Ox.forEach(that.submenus, function(submenu) { if (submenu.is(':visible')) { submenu.hideMenu(); - Ox.break(); + 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 6aee19af..d8569b4b 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; - Ox.break(); + 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 1bbf5f42..eb5794a9 100644 --- a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js +++ b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js @@ -186,10 +186,10 @@ Ox.AnnotationPanel = function(options, self) { if (item.id == annotationId) { annotation = item; found = true; - Ox.break(); + Ox.Break()(); } }); - found && Ox.break(); + found && Ox.Break()(); }); return annotation; } @@ -201,10 +201,10 @@ Ox.AnnotationPanel = function(options, self) { if (item.id == annotationId) { folder = self.$folder[i]; found = true; - Ox.break(); + Ox.Break()(); } }); - found && Ox.break(); + found && Ox.Break()(); }); return folder; } @@ -426,7 +426,7 @@ Ox.AnnotationPanel = function(options, self) { self.deselecting = true; $folder.options({selected: ''}); self.deselecting = false; - Ox.break(); + 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 a61bd45b..25861c51 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; - Ox.break(); + 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 0d9af31e..a429f2d2 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; - Ox.break(); + 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 eb81b5f5..d6ba45e5 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -866,10 +866,10 @@ Ox.VideoEditor = function(options, self) { if (item.id == annotationId) { value = item.value; found = true; - Ox.break(); + Ox.Break()(); } }); - found && Ox.break(); + found && Ox.Break()(); }); return value; } @@ -920,7 +920,7 @@ Ox.VideoEditor = function(options, self) { ) { position = v; found = true; - Ox.break(); + Ox.Break()(); } }); direction == -1 && positions.reverse(); @@ -1107,7 +1107,7 @@ Ox.VideoEditor = function(options, self) { 'in': i ? self.options.cuts[i - 1] : 0, out: cut - 1 / self.options.fps }; - Ox.break(); + 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 bb5a201d..c2a160ab 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js @@ -230,7 +230,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; - Ox.break(); + Ox.Break()(); } }); return subtitle; diff --git a/source/Ox.UI/js/Video/Ox.VideoElement.js b/source/Ox.UI/js/Video/Ox.VideoElement.js index 0ec62683..4508a4de 100644 --- a/source/Ox.UI/js/Video/Ox.VideoElement.js +++ b/source/Ox.UI/js/Video/Ox.VideoElement.js @@ -271,7 +271,7 @@ Ox.VideoElement = function(options, self) { if (item.offsets[i] <= time) { currentPart = i; currentTime = time - item.offsets[i]; - Ox.break(); + Ox.Break()(); } }); Ox.Log('Video', 'sCT', time, currentPart, currentTime); diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index 2ea76eba..1bedb7a5 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -1227,7 +1227,7 @@ Ox.VideoPlayer = function(options, self) { && v.out > self.options.position ) { censored = true; - Ox.break(); + Ox.Break()(); } }); return censored; @@ -1405,7 +1405,7 @@ Ox.VideoPlayer = function(options, self) { && v.out >= self.options.position ) { subtitle = v.text; - Ox.break(); + Ox.Break()(); } }); return subtitle; @@ -1454,7 +1454,7 @@ Ox.VideoPlayer = function(options, self) { var left = 0; Ox.forEach(self.options.controlsBottom, function(control) { if (control == 'timeline') { - Ox.break(); + Ox.Break()(); } left += control == 'position' ? self.positionWidth : 16 }); @@ -1538,7 +1538,7 @@ Ox.VideoPlayer = function(options, self) { ) { result = v found = true; - Ox.break(); + Ox.Break()(); } }); direction == -1 && self.results.reverse(); diff --git a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js index 6c68f6dd..dcbc5f7a 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; - Ox.break(); + 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 3b7d63a8..654adffa 100644 --- a/source/Ox.UI/js/Window/Ox.Dialog.js +++ b/source/Ox.UI/js/Window/Ox.Dialog.js @@ -251,7 +251,7 @@ Ox.Dialog = function(options, self) { Ox.forEach(self.options.buttons, function(button) { if (button.options && button.options('id') == id) { ret = button; - Ox.break(); + Ox.Break()(); } }); return ret; diff --git a/source/Ox/js/Array.js b/source/Ox/js/Array.js index 32a36660..47d29768 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) ) { - Ox.break(); + Ox.Break()(); } }); return match; @@ -439,7 +439,7 @@ Ox.range = function() { len = article.length; sort[val] = sort[val].slice(len + 1) + ', ' + sort[val].slice(0, len); - Ox.break(); + Ox.Break()(); } }); } else { diff --git a/source/Ox/js/Async.js b/source/Ox/js/Async.js index 36ee4ec2..151d16c9 100644 --- a/source/Ox/js/Async.js +++ b/source/Ox/js/Async.js @@ -58,7 +58,7 @@ } } i++; - +new Date() >= time + ms && Ox.break(); + +new Date() >= time + ms && Ox.Break()(); }); if (i < n) { setTimeout(function() { diff --git a/source/Ox/js/Core.js b/source/Ox/js/Core.js index 496afc96..1fef2366 100644 --- a/source/Ox/js/Core.js +++ b/source/Ox/js/Core.js @@ -90,7 +90,7 @@ Ox.Break = function() { throw Ox.BreakError; }; -Ox.BreakError = new SyntaxError('Illegal Ox.break() statement'); +Ox.BreakError = new SyntaxError('Illegal Ox.Break()() statement'); /*@ Ox.load Loads a module @@ -255,7 +255,7 @@ Ox.loop For-loop, functional-style step Step value fn Iterator function i Counter value - > Ox.loop(10, function(i) { i == 4 && Ox.break() }) + > Ox.loop(10, function(i) { i == 4 && Ox.Break()() }) 4 > Ox.loop(0, 3, 2, function() {}) 4 diff --git a/source/Ox/js/Format.js b/source/Ox/js/Format.js index 88744b9f..4247a336 100644 --- a/source/Ox/js/Format.js +++ b/source/Ox/js/Format.js @@ -279,7 +279,7 @@ Ox.formatDateRange = function(start, end, utc) { if (i == precision[0] - 1 && parts[0][i] != parts[1][i] - 1) { isOneUnit = false; } - !isOneUnit && Ox.break(); + !isOneUnit && Ox.Break()(); }); } if (isOneUnit) { @@ -579,7 +579,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; - Ox.break(); + Ox.Break()(); } }); return val; diff --git a/source/Ox/js/Geo.js b/source/Ox/js/Geo.js index dc189bf7..fa1a9217 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 - ret && Ox.break(); + ret && Ox.Break()(); }); // Break if no outer part contains the inner part - !ret && Ox.break(); + !ret && Ox.Break()(); }); return ret; }; @@ -327,7 +327,7 @@ : Ox.joinAreas(intersections); } if (ret === null) { - Ox.break(); + Ox.Break()(); } else { ret = splitArea(ret); } @@ -378,7 +378,7 @@ Ox.forEach(gaps, function(gap, i) { if (Ox.containsArea(gap, area)) { ret = i; - Ox.break(); + Ox.Break()(); } }); return ret; diff --git a/source/Ox/js/JavaScript.js b/source/Ox/js/JavaScript.js index ad4e1060..5050dfb3 100644 --- a/source/Ox/js/JavaScript.js +++ b/source/Ox/js/JavaScript.js @@ -641,7 +641,7 @@ Ox.tokenize = (function() { Ox.forEach(word, function(value, key) { if (value.indexOf(str) > -1) { type = key; - Ox.break(); + Ox.Break()(); } }); }, diff --git a/source/Ox/js/Object.js b/source/Ox/js/Object.js index 2c8087d3..3a7a8c8a 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; - Ox.break(); + Ox.Break()(); } }); return key; diff --git a/source/Ox/js/String.js b/source/Ox/js/String.js index 666cdf10..d42780b1 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.slice(i + 1).match(new RegExp('^/?' + tag + '\\W'))) { isTag = true; - Ox.break(); + Ox.Break()(); } }); } @@ -376,7 +376,7 @@ Ox.parseUserAgent = function(userAgent) { string: string, version: versions[version] || version }; - Ox.break(); + Ox.Break()(); } }); }); diff --git a/source/Ox/js/Type.js b/source/Ox/js/Type.js index 846c46cf..e42fae27 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]); - !isEqual && Ox.break(); + !isEqual && Ox.Break()(); }); } }