This commit is contained in:
rolux 2012-05-25 09:46:34 +02:00
parent c30fe02850
commit 147d637b7b
32 changed files with 83 additions and 83 deletions

View file

@ -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;

View file

@ -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 {

View file

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

View file

@ -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) {

View file

@ -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();

View file

@ -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;

View file

@ -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) {

View file

@ -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;

View file

@ -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();
}
});
});

View file

@ -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();
}
}
);

View file

@ -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();
@ -426,7 +426,7 @@ Ox.Filter = function(options, self) {
&& 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()();
!isUseless && Ox.Break();
});
Ox.Log('Form', 'isUseless', isUseless);
return isUseless;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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);
});

View file

@ -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();
}
});
}

View file

@ -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();
}
}
});

View file

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

View file

@ -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();
}
});
}

View file

@ -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)) {

View file

@ -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 {

View file

@ -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);

View file

@ -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;

View file

@ -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);

View file

@ -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;

View file

@ -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;

View file

@ -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 = '';

View file

@ -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;

View file

@ -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);

View file

@ -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();

View file

@ -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;

View file

@ -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;