0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

Ox.break -> Ox.Break

Browse source
This commit is contained in:
rolux 2012-05-24 19:20:29 +02:00
parent b7d9d9ba54
commit 544e117cb3
41 changed files with 100 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.Geo/Ox.Geo.js
View file

@ -154,7 +154,7 @@ Ox.load.Geo = function(options, callback) {
Ox.forEach(Ox.COUNTRIES, function(c) { Ox.forEach(Ox.COUNTRIES, function(c) {
if (c.code == code) { if (c.code == code) {
country = c; country = c;
Ox.break(); Ox.Break()();
} }
}); });
return country; return country;
@ -193,7 +193,7 @@ Ox.load.Geo = function(options, callback) {
Ox.forEach(Ox.COUNTRIES, function(c) { Ox.forEach(Ox.COUNTRIES, function(c) {
if (name == c.name || name == c.googleName || name == c.imdbName) { if (name == c.name || name == c.googleName || name == c.imdbName) {
country = c; country = c;
Ox.break(); Ox.Break()();
} }
}); });
return country; return country;

6
source/Ox.Image/Ox.Image.js
View file

@ -446,14 +446,14 @@ Ox.load.Image = function(options, callback) {
str = ''; str = '';
} else { } else {
// After length more bytes, break // 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() { }, function() {
try { try {

2
source/Ox.UI/Ox.UI.js
View file

@ -330,7 +330,7 @@ Ox.load.UI = function(options, callback) {
&& !/chrome/.test(userAgent) && !/linux/.test(userAgent) && !/chrome/.test(userAgent) && !/linux/.test(userAgent)
)) { )) {
format = f; format = f;
Ox.break(); Ox.Break()();
} }
} }
}); });

2
source/Ox.UI/js/Bar/Ox.Resizebar.js
View file

@ -84,7 +84,7 @@ Ox.Resizebar = function(options, self) {
Ox.forEach(self.options.resize, function(v) { Ox.forEach(self.options.resize, function(v) {
if (self.options.size >= v - 8 && self.options.size <= v + 8) { if (self.options.size >= v - 8 && self.options.size <= v + 8) {
self.options.size = v; self.options.size = v;
Ox.break(); Ox.Break()();
} }
}); });
if (self.options.size != size) { if (self.options.size != size) {

10
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -702,7 +702,7 @@ Ox.Calendar = function(options, self) {
Ox.forEach(self.options.events, function(v) { Ox.forEach(self.options.events, function(v) {
if (v.id == id) { if (v.id == id) {
event = v; event = v;
Ox.break(); Ox.Break()();
} }
}); });
return event; return event;
@ -777,7 +777,7 @@ Ox.Calendar = function(options, self) {
Ox.forEach(self.lineEvents, function(events, line_) { Ox.forEach(self.lineEvents, function(events, line_) {
if (Ox.getIndexById(events, id) > -1) { if (Ox.getIndexById(events, id) > -1) {
line = line_; line = line_;
Ox.break(); Ox.Break()();
} }
}); });
return line; return line;
@ -817,12 +817,12 @@ Ox.Calendar = function(options, self) {
// if overlaps, check next line // if overlaps, check next line
if (overlaps(event, event_)) { if (overlaps(event, event_)) {
fits = false; fits = false;
Ox.break(); Ox.Break()();
} }
}); });
if (fits) { if (fits) {
line = line_; line = line_;
Ox.break(); Ox.Break()();
} }
}); });
if (line == self.lineEvents.length) { if (line == self.lineEvents.length) {
@ -920,7 +920,7 @@ Ox.Calendar = function(options, self) {
var width = Math.round(v.seconds * pixelsPerSecond); var width = Math.round(v.seconds * pixelsPerSecond);
if (width >= self.minLabelWidth) { if (width >= self.minLabelWidth) {
units = [self.units[i], self.units[i - 1]]; units = [self.units[i], self.units[i - 1]];
Ox.break(); Ox.Break()();
} }
}); });
self.units.reverse(); self.units.reverse();

8
source/Ox.UI/js/Calendar/Ox.ListCalendar.js
View file

@ -48,7 +48,7 @@ Ox.ListCalendar = function(options, self) {
if (eventDuration > duration) { if (eventDuration > duration) {
iconSize = size; iconSize = size;
} else { } else {
Ox.break(); Ox.Break()();
} }
}); });
return data.type return data.type
@ -391,10 +391,10 @@ Ox.ListCalendar = function(options, self) {
) )
) { ) {
exists = value; exists = value;
Ox.break(); Ox.Break()();
} }
}); });
exists && Ox.break(); exists && Ox.Break()();
}); });
} }
if (data.id == 'name') { if (data.id == 'name') {
@ -689,7 +689,7 @@ Ox.ListCalendar = function(options, self) {
|| event.alternativeNames.indexOf(name) > -1 || event.alternativeNames.indexOf(name) > -1
) { ) {
exists = true; exists = true;
Ox.break(); Ox.Break()();
} }
}); });
return exists; return exists;

2
source/Ox.UI/js/Code/Ox.DocPage.js
View file

@ -141,7 +141,7 @@ Ox.DocPage = function(options, self) {
Ox.forEach(this.className.split(' '), function(v) { Ox.forEach(this.className.split(' '), function(v) {
if (/Hidden$/.test(v)) { if (/Hidden$/.test(v)) {
hidden = true; hidden = true;
Ox.break(); Ox.Break()();
} }
}); });
if (!hidden) { if (!hidden) {

2
source/Ox.UI/js/Code/Ox.DocPanel.js
View file

@ -156,7 +156,7 @@ Ox.DocPanel = function(options, self) {
Ox.forEach(self.options.items, function(v) { Ox.forEach(self.options.items, function(v) {
if (v.name == name) { if (v.name == name) {
item = v; item = v;
Ox.break(); Ox.Break()();
} }
}); });
return item; return item;

4
source/Ox.UI/js/Core/Ox.Theme.js
View file

@ -18,7 +18,7 @@ Ox.Theme = (function() {
Ox.forEach(Ox.UI.$body.attr('class').split(' '), function(className) { Ox.forEach(Ox.UI.$body.attr('class').split(' '), function(className) {
if (Ox.startsWith(className, 'OxTheme')) { if (Ox.startsWith(className, 'OxTheme')) {
theme = className.replace('OxTheme', '').toLowerCase(); theme = className.replace('OxTheme', '').toLowerCase();
Ox.break(); Ox.Break()();
} }
}); });
return theme; return theme;
@ -105,7 +105,7 @@ Ox.Theme = (function() {
background: $element_.css('background'), background: $element_.css('background'),
color: $element_.css('color') color: $element_.css('color')
}); });
Ox.break(); Ox.Break()();
} }
}); });
}); });

6
source/Ox.UI/js/Core/Ox.URL.js
View file

@ -324,7 +324,7 @@ Ox.URL = function(options) {
value: split.join(operator), value: split.join(operator),
operator: operator operator: operator
}; };
Ox.break(); Ox.Break()();
} }
}); });
if ( if (
@ -521,7 +521,7 @@ Ox.URL = function(options) {
state.view = view; state.view = view;
state.span = span; state.span = span;
parts.shift(); parts.shift();
Ox.break(); Ox.Break()();
} }
}); });
} }
@ -581,7 +581,7 @@ Ox.URL = function(options) {
// sort // sort
state.sort = parseSort(parts[0], state); state.sort = parseSort(parts[0], state);
parts.shift(); parts.shift();
Ox.break(); Ox.Break()();
} }
} }
); );

6
source/Ox.UI/js/Form/Ox.Filter.js
View file

@ -394,7 +394,7 @@ Ox.Filter = function(options, self) {
Ox.forEach(self.options.query.conditions, function(condition) { Ox.forEach(self.options.query.conditions, function(condition) {
if (condition.conditions) { if (condition.conditions) {
hasGroups = true; hasGroups = true;
Ox.break(); Ox.Break()();
} }
}); });
hasGroups && renderConditions(); hasGroups && renderConditions();
@ -425,8 +425,8 @@ Ox.Filter = function(options, self) {
).indexOf(condition.operator) > -1 ).indexOf(condition.operator) > -1
&& condition.value === '' && condition.value === ''
// FIXME: this used to be `return isUseless` - but was it intended // FIXME: this used to be `return isUseless` - but was it intended
// to be the other way around, i.e. `isUseless && Ox.break`? // to be the other way around, i.e. `isUseless && Ox.Break()`?
!isUseless && Ox.break(); !isUseless && Ox.Break()();
}); });
Ox.Log('Form', 'isUseless', isUseless); Ox.Log('Form', 'isUseless', isUseless);
return isUseless; return isUseless;

4
source/Ox.UI/js/Form/Ox.FormPanel.js
View file

@ -65,7 +65,7 @@ Ox.FormPanel = function(options, self) {
Ox.forEach(self.options.form, function(section, i) { Ox.forEach(self.options.form, function(section, i) {
if (section.title == data.ids[0]) { if (section.title == data.ids[0]) {
self.section = i; self.section = i;
Ox.break(); Ox.Break()();
} }
}); });
self.$sections[self.section].show(); self.$sections[self.section].show();
@ -147,7 +147,7 @@ Ox.FormPanel = function(options, self) {
Ox.forEach(self.options.form, function(section, i) { Ox.forEach(self.options.form, function(section, i) {
if (section.title == title) { if (section.title == title) {
index = i; index = i;
Ox.break(); Ox.Break()();
} }
}); });
return index; return index;

4
source/Ox.UI/js/Form/Ox.InputGroup.js
View file

@ -88,7 +88,7 @@ Ox.InputGroup = function(options, self) {
Ox.forEach(self.options.inputs, function($input) { Ox.forEach(self.options.inputs, function($input) {
if ($input.focusInput) { if ($input.focusInput) {
$input.focusInput(true); $input.focusInput(true);
Ox.break(); Ox.Break()();
} }
}); });
} }
@ -149,7 +149,7 @@ Ox.InputGroup = function(options, self) {
//Ox.Log('Form', v, v.options('id'), id) //Ox.Log('Form', v, v.options('id'), id)
if (v.options('id') == self.options.id + Ox.toTitleCase(id)) { if (v.options('id') == self.options.id + Ox.toTitleCase(id)) {
input = v; input = v;
Ox.break(); Ox.Break()();
} }
}); });
return input; return input;

2
source/Ox.UI/js/Form/Ox.OptionGroup.js
View file

@ -26,7 +26,7 @@ Ox.OptionGroup = function(items, min, max, property) {
), function(v) { ), function(v) {
if (items[v][property]) { if (items[v][property]) {
last = v; last = v;
Ox.break(); Ox.Break()();
} }
}); });
return last; return last;

8
source/Ox.UI/js/List/Ox.List.js
View file

@ -607,7 +607,7 @@ Ox.List = function(options, self) {
Ox.forEach(self.$items, function($item, i) { Ox.forEach(self.$items, function($item, i) {
if ($item.options('data')[self.options.unique] == id) { if ($item.options('data')[self.options.unique] == id) {
pos = i; pos = i;
Ox.break(); Ox.Break()();
} }
}); });
return pos; return pos;
@ -695,7 +695,7 @@ Ox.List = function(options, self) {
ids.push(self.$items[pos].options('data')[self.options.unique]); ids.push(self.$items[pos].options('data')[self.options.unique]);
} else { } else {
notFound = true; notFound = true;
Ox.break(); Ox.Break()();
} }
}); });
if (notFound) { if (notFound) {
@ -1153,7 +1153,7 @@ Ox.List = function(options, self) {
if (Ox.toLatin(v.title).toUpperCase().indexOf(str) == 0) { if (Ox.toLatin(v.title).toUpperCase().indexOf(str) == 0) {
select(i); select(i);
scrollToPosition(i); scrollToPosition(i);
Ox.break(); Ox.Break()();
} }
}); });
} }
@ -1340,7 +1340,7 @@ Ox.List = function(options, self) {
if (oldIds.indexOf(item.id) > -1) { if (oldIds.indexOf(item.id) > -1) {
newIds.push(item.id); newIds.push(item.id);
} }
newIds.length == oldIds.length && Ox.break(); newIds.length == oldIds.length && Ox.Break()();
}); });
setSelected(newIds); setSelected(newIds);
}); });

10
source/Ox.UI/js/List/Ox.TextList.js
View file

@ -259,7 +259,7 @@ Ox.TextList = function(options, self) {
index++; index++;
} else if (v.id == id) { } else if (v.id == id) {
column = v; column = v;
Ox.break(); Ox.Break()();
} }
}); });
column.visible = true; column.visible = true;
@ -283,7 +283,7 @@ Ox.TextList = function(options, self) {
if (!self.options.columns[index].visible) { if (!self.options.columns[index].visible) {
addColumn(id); addColumn(id);
add = true; add = true;
Ox.break(); Ox.Break()();
} }
ids.push(id); ids.push(id);
}); });
@ -291,7 +291,7 @@ Ox.TextList = function(options, self) {
Ox.forEach(self.visibleColumns, function(column) { Ox.forEach(self.visibleColumns, function(column) {
if (ids.indexOf(column.id) == -1) { if (ids.indexOf(column.id) == -1) {
removeColumn(column.id); 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; var x = self.drag.listOffset + offset + self.columnWidths[i] / 2;
if (i < self.drag.startPos && e.clientX < x) { if (i < self.drag.startPos && e.clientX < x) {
self.drag.stopPos = i; self.drag.stopPos = i;
Ox.break(); Ox.Break()();
} else if (i > self.drag.startPos && e.clientX > x) { } else if (i > self.drag.startPos && e.clientX > x) {
self.drag.stopPos = i; self.drag.stopPos = i;
} }
@ -574,7 +574,7 @@ Ox.TextList = function(options, self) {
if (Ox.startsWith(value, query)) { if (Ox.startsWith(value, query)) {
that.$body.options({selected: [item[self.unique]]}); that.$body.options({selected: [item[self.unique]]});
Ox.Log('List', 'QUERY', query, 'VALUE', value) Ox.Log('List', 'QUERY', query, 'VALUE', value)
Ox.break(); Ox.Break()();
} }
}); });
} }

6
source/Ox.UI/js/List/Ox.TreeList.js
View file

@ -121,12 +121,12 @@ Ox.TreeList = function(options, self) {
ret = Ox.extend(item, { ret = Ox.extend(item, {
level: level level: level
}); });
Ox.break(); Ox.Break()();
} }
if (item.items) { if (item.items) {
ret = getItemById(id, item.items, level + 1); ret = getItemById(id, item.items, level + 1);
if (ret) { if (ret) {
Ox.break(); Ox.Break()();
} }
} }
}); });
@ -143,7 +143,7 @@ Ox.TreeList = function(options, self) {
ret = getParent(id, item.items); ret = getParent(id, item.items);
} }
if (ret) { if (ret) {
Ox.break(); Ox.Break()();
} }
} }
}); });

2
source/Ox.UI/js/Map/Ox.ListMap.js
View file

@ -111,7 +111,7 @@ Ox.ListMap = function(options, self) {
if (data.area >= area) { if (data.area >= area) {
iconSize = size; iconSize = size;
} else { } else {
Ox.break(); Ox.Break()();
} }
}); });
return data.type return data.type

18
source/Ox.UI/js/Map/Ox.Map.js
View file

@ -541,7 +541,7 @@ Ox.Map = function(options, self) {
if (place.bounds.equals(p.bounds)) { if (place.bounds.equals(p.bounds)) {
place = p; place = p;
exists = true; exists = true;
Ox.break(); Ox.Break()();
} }
}); });
if (!exists) { if (!exists) {
@ -735,7 +735,7 @@ Ox.Map = function(options, self) {
canContain(bounds, result.geometry.bounds || result.geometry.viewport) canContain(bounds, result.geometry.bounds || result.geometry.viewport)
) { ) {
callback(new Ox.MapPlace(parseGeodata(results[i]))); callback(new Ox.MapPlace(parseGeodata(results[i])));
Ox.break(); Ox.Break()();
} }
}); });
} else { } else {
@ -784,7 +784,7 @@ Ox.Map = function(options, self) {
Ox.forEach(self.options.places, function(place, i) { Ox.forEach(self.options.places, function(place, i) {
if (place.name == name) { if (place.name == name) {
position = i; position = i;
Ox.break(); Ox.Break()();
} }
}); });
return position; return position;
@ -800,7 +800,7 @@ Ox.Map = function(options, self) {
Ox.forEach(self.places, function(place) { Ox.forEach(self.places, function(place) {
if (place.selected) { if (place.selected) {
id = place.id; id = place.id;
Ox.break(); Ox.Break()();
} }
}); });
} }
@ -1035,7 +1035,7 @@ Ox.Map = function(options, self) {
Ox.forEach(components, function(component) { Ox.forEach(components, function(component) {
if (component.types.indexOf('country') > -1) { if (component.types.indexOf('country') > -1) {
countryCode = component.short_name; countryCode = component.short_name;
Ox.break(); Ox.Break()();
} }
}); });
return countryCode; return countryCode;
@ -1074,7 +1074,7 @@ Ox.Map = function(options, self) {
var ret; var ret;
Ox.forEach(types, function(v) { Ox.forEach(types, function(v) {
ret = Ox.startsWith(v, type); ret = Ox.startsWith(v, type);
ret && Ox.break(); ret && Ox.Break()();
}); });
return ret; return ret;
} }
@ -1082,10 +1082,10 @@ Ox.Map = function(options, self) {
Ox.forEach(values, function(value) { Ox.forEach(values, function(value) {
if (find(value)) { if (find(value)) {
type = key; type = key;
Ox.break(); Ox.Break()();
} }
}); });
type != 'feature' && Ox.break(); type != 'feature' && Ox.Break()();
}); });
return type; return type;
} }
@ -1241,7 +1241,7 @@ Ox.Map = function(options, self) {
.css({ .css({
width: (scaleWidth - 16) + 'px' width: (scaleWidth - 16) + 'px'
}) })
Ox.break(); Ox.Break()();
} }
}); });
} }

2
source/Ox.UI/js/Map/Ox.MapMarker.js
View file

@ -218,7 +218,7 @@ Ox.MapMarker = function(options) {
if (that.place.area >= area) { if (that.place.area >= area) {
that.size = size; that.size = size;
} else { } else {
Ox.break(); Ox.Break()();
} }
}); });
} else if (Ox.isNumber(size)) { } else if (Ox.isNumber(size)) {

4
source/Ox.UI/js/Menu/Ox.MainMenu.js
View file

@ -175,7 +175,7 @@ Ox.MainMenu = function(options, self) {
if (ids.length == 1) { if (ids.length == 1) {
Ox.forEach(that.menus, function(menu) { Ox.forEach(that.menus, function(menu) {
item = menu.getItem(id); item = menu.getItem(id);
item && Ox.break(); item && Ox.Break()();
}); });
} else { } else {
item = that.getMenu(ids.shift()).getItem(ids.join('_')); item = that.getMenu(ids.shift()).getItem(ids.join('_'));
@ -194,7 +194,7 @@ Ox.MainMenu = function(options, self) {
Ox.forEach(that.menus, function(v) { Ox.forEach(that.menus, function(v) {
if (v.options('id') == id) { if (v.options('id') == id) {
menu = v; menu = v;
Ox.break(); Ox.Break()();
} }
}); });
} else { } else {

16
source/Ox.UI/js/Menu/Ox.Menu.js
View file

@ -189,7 +189,7 @@ Ox.Menu = function(options, self) {
Ox.forEach(that.items, function(item, i) { Ox.forEach(that.items, function(item, i) {
if (item.options('id') == id) { if (item.options('id') == id) {
position = i; position = i;
Ox.break(); Ox.Break()();
} }
}); });
return position; return position;
@ -205,7 +205,7 @@ Ox.Menu = function(options, self) {
Ox.forEach(that.items, function(item, i) { Ox.forEach(that.items, function(item, i) {
if (i < self.options.selected && !item.options('disabled')) { if (i < self.options.selected && !item.options('disabled')) {
ret = false; ret = false;
Ox.break(); Ox.Break()();
} }
}); });
return ret; return ret;
@ -216,7 +216,7 @@ Ox.Menu = function(options, self) {
Ox.forEach(that.items, function(item, i) { Ox.forEach(that.items, function(item, i) {
if (i > self.options.selected && !item.options('disabled')) { if (i > self.options.selected && !item.options('disabled')) {
ret = false; ret = false;
Ox.break(); Ox.Break()();
} }
}); });
return ret; return ret;
@ -459,7 +459,7 @@ Ox.Menu = function(options, self) {
Ox.forEach(that.submenus, function(submenu, id) { Ox.forEach(that.submenus, function(submenu, id) {
if (!submenu.is(':hidden')) { if (!submenu.is(':hidden')) {
submenu.hideMenu(); submenu.hideMenu();
Ox.break(); Ox.Break()();
} }
}); });
item.options('items').length && that.submenus[item.options('id')].showMenu(); 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) { Ox.forEach(that.items, function(v) {
if (v.options('id') == id) { if (v.options('id') == id) {
item = v; item = v;
Ox.break(); Ox.Break()();
} }
}); });
if (!item) { if (!item) {
Ox.forEach(that.submenus, function(submenu) { Ox.forEach(that.submenus, function(submenu) {
item = submenu.getItem(id); item = submenu.getItem(id);
item && Ox.break(); item && Ox.Break()();
}); });
} }
} else { } else {
@ -690,7 +690,7 @@ Ox.Menu = function(options, self) {
Ox.forEach(that.items, function(item) { Ox.forEach(that.items, function(item) {
if (!item.options('disabled')) { if (!item.options('disabled')) {
ret = true; ret = true;
Ox.break(); Ox.Break()();
} }
}); });
return ret; return ret;
@ -707,7 +707,7 @@ Ox.Menu = function(options, self) {
Ox.forEach(that.submenus, function(submenu) { Ox.forEach(that.submenus, function(submenu) {
if (submenu.is(':visible')) { if (submenu.is(':visible')) {
submenu.hideMenu(); submenu.hideMenu();
Ox.break(); Ox.Break()();
} }
}); });
selectItem(-1); selectItem(-1);

2
source/Ox.UI/js/Panel/Ox.SplitPanel.js
View file

@ -103,7 +103,7 @@ Ox.SplitPanel = function(options, self) {
Ox.forEach(self.options.elements, function(element, i) { Ox.forEach(self.options.elements, function(element, i) {
if (element.element.options('id') == id) { if (element.element.options('id') == id) {
position = i; position = i;
Ox.break(); Ox.Break()();
} }
}); });
return position; return position;

10
source/Ox.UI/js/Video/Ox.AnnotationPanel.js
View file

@ -186,10 +186,10 @@ Ox.AnnotationPanel = function(options, self) {
if (item.id == annotationId) { if (item.id == annotationId) {
annotation = item; annotation = item;
found = true; found = true;
Ox.break(); Ox.Break()();
} }
}); });
found && Ox.break(); found && Ox.Break()();
}); });
return annotation; return annotation;
} }
@ -201,10 +201,10 @@ Ox.AnnotationPanel = function(options, self) {
if (item.id == annotationId) { if (item.id == annotationId) {
folder = self.$folder[i]; folder = self.$folder[i];
found = true; found = true;
Ox.break(); Ox.Break()();
} }
}); });
found && Ox.break(); found && Ox.Break()();
}); });
return folder; return folder;
} }
@ -426,7 +426,7 @@ Ox.AnnotationPanel = function(options, self) {
self.deselecting = true; self.deselecting = true;
$folder.options({selected: ''}); $folder.options({selected: ''});
self.deselecting = false; self.deselecting = false;
Ox.break(); Ox.Break()();
} }
}); });
scrollToSelected(self.options.layers[index].type); scrollToSelected(self.options.layers[index].type);

2
source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
View file

@ -157,7 +157,7 @@ Ox.BlockVideoTimeline = function(options, self) {
Ox.forEach(self.options.subtitles, function(v) { Ox.forEach(self.options.subtitles, function(v) {
if (v['in'] <= position && v.out > position) { if (v['in'] <= position && v.out > position) {
subtitle = v; subtitle = v;
Ox.break(); Ox.Break()();
} }
}); });
return subtitle; return subtitle;

2
source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
View file

@ -118,7 +118,7 @@ Ox.SmallVideoTimeline = function(options, self) {
Ox.forEach(self.options.subtitles, function(v) { Ox.forEach(self.options.subtitles, function(v) {
if (v['in'] <= position && v.out > position) { if (v['in'] <= position && v.out > position) {
subtitle = v; subtitle = v;
Ox.break(); Ox.Break()();
} }
}); });
return subtitle; return subtitle;

8
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -866,10 +866,10 @@ Ox.VideoEditor = function(options, self) {
if (item.id == annotationId) { if (item.id == annotationId) {
value = item.value; value = item.value;
found = true; found = true;
Ox.break(); Ox.Break()();
} }
}); });
found && Ox.break(); found && Ox.Break()();
}); });
return value; return value;
} }
@ -920,7 +920,7 @@ Ox.VideoEditor = function(options, self) {
) { ) {
position = v; position = v;
found = true; found = true;
Ox.break(); Ox.Break()();
} }
}); });
direction == -1 && positions.reverse(); direction == -1 && positions.reverse();
@ -1107,7 +1107,7 @@ Ox.VideoEditor = function(options, self) {
'in': i ? self.options.cuts[i - 1] : 0, 'in': i ? self.options.cuts[i - 1] : 0,
out: cut - 1 / self.options.fps out: cut - 1 / self.options.fps
}; };
Ox.break(); Ox.Break()();
} }
}); });
self.options.selected = ''; self.options.selected = '';

2
source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js
View file

@ -230,7 +230,7 @@ Ox.VideoEditorPlayer = function(options, self) {
Ox.forEach(self.options.subtitles, function(v) { Ox.forEach(self.options.subtitles, function(v) {
if (v['in'] <= self.options.position && v['out'] > self.options.position) { if (v['in'] <= self.options.position && v['out'] > self.options.position) {
subtitle = v.value; subtitle = v.value;
Ox.break(); Ox.Break()();
} }
}); });
return subtitle; return subtitle;

2
source/Ox.UI/js/Video/Ox.VideoElement.js
View file

@ -271,7 +271,7 @@ Ox.VideoElement = function(options, self) {
if (item.offsets[i] <= time) { if (item.offsets[i] <= time) {
currentPart = i; currentPart = i;
currentTime = time - item.offsets[i]; currentTime = time - item.offsets[i];
Ox.break(); Ox.Break()();
} }
}); });
Ox.Log('Video', 'sCT', time, currentPart, currentTime); Ox.Log('Video', 'sCT', time, currentPart, currentTime);

8
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -1227,7 +1227,7 @@ Ox.VideoPlayer = function(options, self) {
&& v.out > self.options.position && v.out > self.options.position
) { ) {
censored = true; censored = true;
Ox.break(); Ox.Break()();
} }
}); });
return censored; return censored;
@ -1405,7 +1405,7 @@ Ox.VideoPlayer = function(options, self) {
&& v.out >= self.options.position && v.out >= self.options.position
) { ) {
subtitle = v.text; subtitle = v.text;
Ox.break(); Ox.Break()();
} }
}); });
return subtitle; return subtitle;
@ -1454,7 +1454,7 @@ Ox.VideoPlayer = function(options, self) {
var left = 0; var left = 0;
Ox.forEach(self.options.controlsBottom, function(control) { Ox.forEach(self.options.controlsBottom, function(control) {
if (control == 'timeline') { if (control == 'timeline') {
Ox.break(); Ox.Break()();
} }
left += control == 'position' ? self.positionWidth : 16 left += control == 'position' ? self.positionWidth : 16
}); });
@ -1538,7 +1538,7 @@ Ox.VideoPlayer = function(options, self) {
) { ) {
result = v result = v
found = true; found = true;
Ox.break(); Ox.Break()();
} }
}); });
direction == -1 && self.results.reverse(); direction == -1 && self.results.reverse();

2
source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
View file

@ -485,7 +485,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
Ox.forEach(self.options.subtitles, function(v) { Ox.forEach(self.options.subtitles, function(v) {
if (v['in'] <= position && v.out > position) { if (v['in'] <= position && v.out > position) {
subtitle = v; subtitle = v;
Ox.break(); Ox.Break()();
} }
}); });
return subtitle; return subtitle;

2
source/Ox.UI/js/Window/Ox.Dialog.js
View file

@ -251,7 +251,7 @@ Ox.Dialog = function(options, self) {
Ox.forEach(self.options.buttons, function(button) { Ox.forEach(self.options.buttons, function(button) {
if (button.options && button.options('id') == id) { if (button.options && button.options('id') == id) {
ret = button; ret = button;
Ox.break(); Ox.Break()();
} }
}); });
return ret; return ret;

4
source/Ox/js/Array.js
View file

@ -317,7 +317,7 @@ Ox.api = function(items, options) {
(query.operator == '&' && !match) (query.operator == '&' && !match)
|| (query.operator == '|' && match) || (query.operator == '|' && match)
) { ) {
Ox.break(); Ox.Break()();
} }
}); });
return match; return match;
@ -439,7 +439,7 @@ Ox.range = function() {
len = article.length; len = article.length;
sort[val] = sort[val].slice(len + 1) + ', ' sort[val] = sort[val].slice(len + 1) + ', '
+ sort[val].slice(0, len); + sort[val].slice(0, len);
Ox.break(); Ox.Break()();
} }
}); });
} else { } else {

2
source/Ox/js/Async.js
View file

@ -58,7 +58,7 @@
} }
} }
i++; i++;
+new Date() >= time + ms && Ox.break(); +new Date() >= time + ms && Ox.Break()();
}); });
if (i < n) { if (i < n) {
setTimeout(function() { setTimeout(function() {

4
source/Ox/js/Core.js
View file

@ -90,7 +90,7 @@ Ox.Break = function() {
throw Ox.BreakError; throw Ox.BreakError;
}; };
Ox.BreakError = new SyntaxError('Illegal Ox.break() statement'); Ox.BreakError = new SyntaxError('Illegal Ox.Break()() statement');
/*@ /*@
Ox.load <f> Loads a module Ox.load <f> Loads a module
@ -255,7 +255,7 @@ Ox.loop <f> For-loop, functional-style
step <n> Step value step <n> Step value
fn <f> Iterator function fn <f> Iterator function
i <n> Counter value i <n> Counter value
> Ox.loop(10, function(i) { i == 4 && Ox.break() }) > Ox.loop(10, function(i) { i == 4 && Ox.Break()() })
4 4
> Ox.loop(0, 3, 2, function() {}) > Ox.loop(0, 3, 2, function() {})
4 4

4
source/Ox/js/Format.js
View file

@ -279,7 +279,7 @@ Ox.formatDateRange = function(start, end, utc) {
if (i == precision[0] - 1 && parts[0][i] != parts[1][i] - 1) { if (i == precision[0] - 1 && parts[0][i] != parts[1][i] - 1) {
isOneUnit = false; isOneUnit = false;
} }
!isOneUnit && Ox.break(); !isOneUnit && Ox.Break()();
}); });
} }
if (isOneUnit) { if (isOneUnit) {
@ -579,7 +579,7 @@ Ox.formatValue = function(num, str, bin) {
if (num < Math.pow(base, i + 1) || i == len - 1) { if (num < Math.pow(base, i + 1) || i == len - 1) {
val = Ox.formatNumber(num / Math.pow(base, i), i ? i - 1 : 0) + val = Ox.formatNumber(num / Math.pow(base, i), i ? i - 1 : 0) +
' ' + chr + (chr && bin ? 'i' : '') + str; ' ' + chr + (chr && bin ? 'i' : '') + str;
Ox.break(); Ox.Break()();
} }
}); });
return val; return val;

8
source/Ox/js/Geo.js
View file

@ -266,10 +266,10 @@
Ox.forEach(areas[0], function(area0) { Ox.forEach(areas[0], function(area0) {
ret = contains(area0, area1); ret = contains(area0, area1);
// Break if the outer part contains the inner part // Break if the outer part contains the inner part
ret && Ox.break(); ret && Ox.Break()();
}); });
// Break if no outer part contains the inner part // Break if no outer part contains the inner part
!ret && Ox.break(); !ret && Ox.Break()();
}); });
return ret; return ret;
}; };
@ -327,7 +327,7 @@
: Ox.joinAreas(intersections); : Ox.joinAreas(intersections);
} }
if (ret === null) { if (ret === null) {
Ox.break(); Ox.Break()();
} else { } else {
ret = splitArea(ret); ret = splitArea(ret);
} }
@ -378,7 +378,7 @@
Ox.forEach(gaps, function(gap, i) { Ox.forEach(gaps, function(gap, i) {
if (Ox.containsArea(gap, area)) { if (Ox.containsArea(gap, area)) {
ret = i; ret = i;
Ox.break(); Ox.Break()();
} }
}); });
return ret; return ret;

2
source/Ox/js/JavaScript.js
View file

@ -641,7 +641,7 @@ Ox.tokenize = (function() {
Ox.forEach(word, function(value, key) { Ox.forEach(word, function(value, key) {
if (value.indexOf(str) > -1) { if (value.indexOf(str) > -1) {
type = key; type = key;
Ox.break(); Ox.Break()();
} }
}); });
}, },

2
source/Ox/js/Object.js
View file

@ -28,7 +28,7 @@ Ox.keyOf = function(obj, val) {
Ox.forEach(obj, function(v, k) { Ox.forEach(obj, function(v, k) {
if (v === val) { if (v === val) {
key = k; key = k;
Ox.break(); Ox.Break()();
} }
}); });
return key; return key;

4
source/Ox/js/String.js
View file

@ -109,7 +109,7 @@ Ox.highlightHTML = function(html, str, classname, tags) {
Ox.forEach(tags, function(tag) { Ox.forEach(tags, function(tag) {
if (html.slice(i + 1).match(new RegExp('^/?' + tag + '\\W'))) { if (html.slice(i + 1).match(new RegExp('^/?' + tag + '\\W'))) {
isTag = true; isTag = true;
Ox.break(); Ox.Break()();
} }
}); });
} }
@ -376,7 +376,7 @@ Ox.parseUserAgent = function(userAgent) {
string: string, string: string,
version: versions[version] || version version: versions[version] || version
}; };
Ox.break(); Ox.Break()();
} }
}); });
}); });

2
source/Ox/js/Type.js
View file

@ -140,7 +140,7 @@ Ox.isEqual = function(a, b) {
isEqual = true; isEqual = true;
Ox.forEach(a, function(v, k) { Ox.forEach(a, function(v, k) {
isEqual = Ox.isEqual(v, b[k]); isEqual = Ox.isEqual(v, b[k]);
!isEqual && Ox.break(); !isEqual && Ox.Break()();
}); });
} }
} }