From 094b1a59ec361b9961870ee8a0c4bcf45287c684 Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 3 Nov 2011 16:42:41 +0100 Subject: [PATCH] cleanup, again --- source/Ox.UI/js/Bar/Ox.Progressbar.js | 2 +- source/Ox.UI/js/Bar/Ox.Resizebar.js | 3 +-- source/Ox.UI/js/Calendar/Ox.Calendar.js | 20 ++++++++-------- source/Ox.UI/js/Calendar/Ox.ListCalendar.js | 2 +- source/Ox.UI/js/Core/Ox.DocPage.js | 24 +++++++++---------- source/Ox.UI/js/Core/Ox.Element.js | 2 +- source/Ox.UI/js/Core/Ox.SyntaxHighlighter.js | 6 ++--- source/Ox.UI/js/Core/Ox.URL.js | 6 ++--- source/Ox.UI/js/Form/Ox.Checkbox.js | 8 +++---- source/Ox.UI/js/Form/Ox.CheckboxGroup.js | 1 - source/Ox.UI/js/Form/Ox.ColorPicker.js | 2 +- source/Ox.UI/js/Form/Ox.DateInput.js | 2 +- source/Ox.UI/js/Form/Ox.DateTimeInput.js | 2 +- source/Ox.UI/js/Form/Ox.Editable.js | 3 +-- source/Ox.UI/js/Form/Ox.Filter.js | 2 +- source/Ox.UI/js/Form/Ox.Input.js | 6 ++--- source/Ox.UI/js/Form/Ox.Label.js | 1 - source/Ox.UI/js/Form/Ox.Range.js | 24 +++++++++---------- source/Ox.UI/js/List/Ox.InfoList.js | 4 ++-- source/Ox.UI/js/List/Ox.List.js | 10 ++++---- source/Ox.UI/js/List/Ox.TextList.js | 6 ++--- source/Ox.UI/js/List/Ox.TreeList.js | 2 +- source/Ox.UI/js/Map/Ox.ListMap.js | 2 +- source/Ox.UI/js/Map/Ox.Map.js | 12 +++++----- source/Ox.UI/js/Map/Ox.MapMarker.js | 2 +- source/Ox.UI/js/Map/Ox.MapPlace.js | 6 ++--- source/Ox.UI/js/Map/Ox.MapRectangle.js | 2 +- source/Ox.UI/js/Map/Ox.MapRectangleMarker.js | 4 ++-- source/Ox.UI/js/Menu/Ox.Menu.js | 2 +- source/Ox.UI/js/Panel/Ox.SplitPanel.js | 5 ++-- .../Ox.UI/js/Video/Ox.BlockVideoTimeline.js | 1 - .../Ox.UI/js/Video/Ox.SmallVideoTimeline.js | 3 +-- source/Ox.UI/js/Video/Ox.VideoEditor.js | 13 +++++----- source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js | 4 ++-- 34 files changed, 93 insertions(+), 101 deletions(-) diff --git a/source/Ox.UI/js/Bar/Ox.Progressbar.js b/source/Ox.UI/js/Bar/Ox.Progressbar.js index e669e2ad..8732492e 100644 --- a/source/Ox.UI/js/Bar/Ox.Progressbar.js +++ b/source/Ox.UI/js/Bar/Ox.Progressbar.js @@ -162,5 +162,5 @@ Ox.Progressbar = function(options, self) { }; return that; - + }; \ No newline at end of file diff --git a/source/Ox.UI/js/Bar/Ox.Resizebar.js b/source/Ox.UI/js/Bar/Ox.Resizebar.js index f877c59d..cbb8a2e0 100644 --- a/source/Ox.UI/js/Bar/Ox.Resizebar.js +++ b/source/Ox.UI/js/Bar/Ox.Resizebar.js @@ -126,7 +126,6 @@ Ox.Resizebar = function(options, self) { ? (self.isLeftOrTop ? 'n' : 's') : (self.isLeftOrTop ? 'w' : 'e'); } - } return cursor + '-resize'; } @@ -172,7 +171,7 @@ Ox.Resizebar = function(options, self) { size: self.isLeftOrTop ? self.options.elements[1][self.dimensions[1]]() : self.options.size - }); + }); } self.setOption = function(key, value) { diff --git a/source/Ox.UI/js/Calendar/Ox.Calendar.js b/source/Ox.UI/js/Calendar/Ox.Calendar.js index 5ae13227..c6acdfb0 100644 --- a/source/Ox.UI/js/Calendar/Ox.Calendar.js +++ b/source/Ox.UI/js/Calendar/Ox.Calendar.js @@ -507,7 +507,7 @@ Ox.Calendar = function(options, self) { .css({ textAlign: 'center' }); - + self.$lines = []; getLines(); renderCalendar(); @@ -713,10 +713,11 @@ Ox.Calendar = function(options, self) { width = getPosition(event.endTime, zoom) - left; } return Ox.Element() - .addClass('OxEvent' + - (event.type ? ' Ox' + Ox.toTitleCase(event.type) : '' ) + - (event.current ? ' OxCurrent' : '') + - (event.id == self.options.selected ? ' OxSelected' : '') + .addClass( + 'OxEvent' + + (event.type ? ' Ox' + Ox.toTitleCase(event.type) : '' ) + + (event.current ? ' OxCurrent' : '') + + (event.id == self.options.selected ? ' OxSelected' : '') ) .css({ left: left + 'px', @@ -803,14 +804,14 @@ Ox.Calendar = function(options, self) { }) .appendTo(self.$content); } - self.lineEvents[line].push(event); + self.lineEvents[line].push(event); }); } function getMouseDate(e) { return new Date(+self.options.date + ( e.clientX - that.offset().left - self.options.width / 2 - 1 - ) * getSecondsPerPixel() * 1000); + ) * getSecondsPerPixel() * 1000); } function getOverlayWidths() { @@ -830,9 +831,8 @@ Ox.Calendar = function(options, self) { function getPosition(date, zoom) { return Math.round( - self.options.width / 2 + - (date - self.options.date) / 1000 * - getPixelsPerSecond(zoom) + self.options.width / 2 + + (date - self.options.date) / 1000 * getPixelsPerSecond(zoom) ); } diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js index 2b8b365d..7e87779e 100644 --- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js +++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js @@ -88,7 +88,7 @@ Ox.ListCalendar = function(options, self) { if (!self.durationCache[key]) { self.durationCache[key] = Ox.formatDateRangeDuration(data.start, data.end, true); } - return self.durationCache[key]; + return self.durationCache[key]; }, id: 'id', map: function(value, data) { diff --git a/source/Ox.UI/js/Core/Ox.DocPage.js b/source/Ox.UI/js/Core/Ox.DocPage.js index 7b06557d..87084780 100644 --- a/source/Ox.UI/js/Core/Ox.DocPage.js +++ b/source/Ox.UI/js/Core/Ox.DocPage.js @@ -38,10 +38,10 @@ Ox.DocPage = function(options, self) { var $elements = [$('
') .css({paddingLeft: (level ? level * 32 - 16 : 0) + 'px'}) .html( - '' + (name || item.name) + ' ' + - '<' + item.types.join('> or <') + '> ' + - (item['default'] ? '(default: ' + item['default'] + ') ' : '') + - Ox.parseHTML(item.summary) + '' + (name || item.name) + ' ' + + '<' + item.types.join('> or <') + '> ' + + (item['default'] ? '(default: ' + item['default'] + ') ' : '') + + Ox.parseHTML(item.summary) ) ]; [ @@ -112,11 +112,11 @@ Ox.DocPage = function(options, self) { .addClass(className) .css({marginLeft: (level * 32 + 16) + 'px'}) .html( - '> ' + - Ox.encodeHTML(example.statement) - .replace(/ /g, ' ') - .replace(/\n/g, '
\n  ') + - '' + '> ' + + Ox.encodeHTML(example.statement) + .replace(/ /g, ' ') + .replace(/\n/g, '
\n  ') + + '' ) ); example.result && $elements.push($('
') @@ -124,7 +124,7 @@ Ox.DocPage = function(options, self) { .css({marginLeft: (level * 32 + 16) + 'px'}) .html( '' + Ox.encodeHTML(example.result) + '' - ) + ) ) }); } else if (section == 'source') { @@ -133,8 +133,8 @@ Ox.DocPage = function(options, self) { .addClass(className) .css({marginLeft: 16 + 'px'}) .html( - '' + self.options.item.file.replace(Ox.PATH, '') + - ' line ' + self.options.item.line + '' + '' + self.options.item.file.replace(Ox.PATH, '') + + ' line ' + self.options.item.line + '' ) ); $elements.push( diff --git a/source/Ox.UI/js/Core/Ox.Element.js b/source/Ox.UI/js/Core/Ox.Element.js index 889b1dad..7a5eb5d9 100644 --- a/source/Ox.UI/js/Core/Ox.Element.js +++ b/source/Ox.UI/js/Core/Ox.Element.js @@ -225,7 +225,7 @@ Ox.Element = function(options, self) { } function mousemove(e) { e = extend(e); - clearTimeout(dragTimeout); + clearTimeout(dragTimeout); dragTimeout = setTimeout(function() { // mouse did not move for 250 ms, trigger dragpause that.triggerEvent('dragpause', e); diff --git a/source/Ox.UI/js/Core/Ox.SyntaxHighlighter.js b/source/Ox.UI/js/Core/Ox.SyntaxHighlighter.js index aa3cf767..4a5a5306 100644 --- a/source/Ox.UI/js/Core/Ox.SyntaxHighlighter.js +++ b/source/Ox.UI/js/Core/Ox.SyntaxHighlighter.js @@ -18,7 +18,7 @@ Ox.SyntaxHighlighter Syntax Highlighter Ox.SyntaxHighlighter = function(options, self) { - self = self || {}; + self = self || {}; var that = Ox.Element({}, self) .defaults({ lineLength: 0, @@ -40,8 +40,8 @@ Ox.SyntaxHighlighter = function(options, self) { var $lineNumbers, $line, $source, width, lines, source = '', tokens, linebreak = ( - self.options.showLinebreaks ? - '\u21A9' : '' + self.options.showLinebreaks + ? '\u21A9' : '' ) + '
', tab = ( self.options.showTabs ? diff --git a/source/Ox.UI/js/Core/Ox.URL.js b/source/Ox.UI/js/Core/Ox.URL.js index d7754a33..dffa61fb 100644 --- a/source/Ox.UI/js/Core/Ox.URL.js +++ b/source/Ox.UI/js/Core/Ox.URL.js @@ -247,7 +247,7 @@ Ox.URL = function(options) { } if (state.sort && state.sort.length) { parts.push(constructSort(state.sort, state)); - } + } if (state.find) { parts.push(constructFind(state.find)); } @@ -498,7 +498,7 @@ Ox.URL = function(options) { !state.item ? 'list' : 'item' ], function(view) { if (spanTypes[view] == spanType) { - state.view = view; + state.view = view; state.span = span; parts.shift(); return false; @@ -675,5 +675,5 @@ Ox.URL = function(options) { } return that; - + }; \ No newline at end of file diff --git a/source/Ox.UI/js/Form/Ox.Checkbox.js b/source/Ox.UI/js/Form/Ox.Checkbox.js index e5cdd9f1..d723222a 100644 --- a/source/Ox.UI/js/Form/Ox.Checkbox.js +++ b/source/Ox.UI/js/Form/Ox.Checkbox.js @@ -33,10 +33,10 @@ Ox.Checkbox = function(options, self) { width: 'auto' }) .options(options || {}) - .addClass('OxCheckbox' - + (self.options.overlap == 'none' ? '' : ' OxOverlap' - + Ox.toTitleCase(self.options.overlap)) - ) + .addClass('OxCheckbox' + ( + self.options.overlap == 'none' + ? '' : ' OxOverlap' + Ox.toTitleCase(self.options.overlap) + )) .attr({ disabled: self.options.disabled }); diff --git a/source/Ox.UI/js/Form/Ox.CheckboxGroup.js b/source/Ox.UI/js/Form/Ox.CheckboxGroup.js index e494e7c8..6d649358 100644 --- a/source/Ox.UI/js/Form/Ox.CheckboxGroup.js +++ b/source/Ox.UI/js/Form/Ox.CheckboxGroup.js @@ -10,7 +10,6 @@ Ox.CheckboxGroup CheckboxGroup Object min integer width integer, width in px self shared private variable - change triggered when checked property changes passes {checked, id, title} @*/ diff --git a/source/Ox.UI/js/Form/Ox.ColorPicker.js b/source/Ox.UI/js/Form/Ox.ColorPicker.js index 0380a51a..244778d9 100644 --- a/source/Ox.UI/js/Form/Ox.ColorPicker.js +++ b/source/Ox.UI/js/Form/Ox.ColorPicker.js @@ -9,7 +9,7 @@ Ox.ColorPicker ColorPicker Element id element id value rgb value self Shared private variable - change triggered on change of value + change triggered on change of value @*/ Ox.ColorPicker = function(options, self) { diff --git a/source/Ox.UI/js/Form/Ox.DateInput.js b/source/Ox.UI/js/Form/Ox.DateInput.js index 4efb093c..8798fd48 100644 --- a/source/Ox.UI/js/Form/Ox.DateInput.js +++ b/source/Ox.UI/js/Form/Ox.DateInput.js @@ -15,7 +15,7 @@ Ox.DateInput DateInput Element weekday width of weekday input element year width of year input element self Shared private variable - change triggered on change of value + change triggered on change of value @*/ Ox.DateInput = function(options, self) { diff --git a/source/Ox.UI/js/Form/Ox.DateTimeInput.js b/source/Ox.UI/js/Form/Ox.DateTimeInput.js index 058e7435..3e1f28b9 100644 --- a/source/Ox.UI/js/Form/Ox.DateTimeInput.js +++ b/source/Ox.UI/js/Form/Ox.DateTimeInput.js @@ -12,7 +12,7 @@ Ox.DateTimeInput DateTimeInput Element value defautls to now weekday weekday self Shared private variable - change triggered on change of value + change triggered on change of value @*/ Ox.DateTimeInput = function(options, self) { diff --git a/source/Ox.UI/js/Form/Ox.Editable.js b/source/Ox.UI/js/Form/Ox.Editable.js index 68c67a56..5259be67 100644 --- a/source/Ox.UI/js/Form/Ox.Editable.js +++ b/source/Ox.UI/js/Form/Ox.Editable.js @@ -98,7 +98,6 @@ Ox.Editable = function(options, self) { width: width /*+ Ox.UI.SCROLLBAR_SIZE*/ + 'px' }); } - //self.$input.find('input').css({width: width + 2}) /* that.triggerEvent('change', { value: event.value @@ -177,7 +176,7 @@ Ox.Editable = function(options, self) { return self.options.type == 'input' ? self.options.value.replace(/ /g, ' ') : Ox.parseHTML(self.options.value || ' ') - .replace(/$/, '
 '); + .replace(/$/, '
 '); } function formatValue() { diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js index 22a50614..67312301 100644 --- a/source/Ox.UI/js/Form/Ox.Filter.js +++ b/source/Ox.UI/js/Form/Ox.Filter.js @@ -677,7 +677,7 @@ Ox.Filter = function(options, self) { items: ['K', 'M', 'G', 'T'].map(function(prefix) { return {id: prefix + title, title: prefix + title}; }), - width: 48 + width: 48 }) : Ox.Label({ overlap: 'left', textAlign: 'center', diff --git a/source/Ox.UI/js/Form/Ox.Input.js b/source/Ox.UI/js/Form/Ox.Input.js index 83fda05a..19b49f19 100644 --- a/source/Ox.UI/js/Form/Ox.Input.js +++ b/source/Ox.UI/js/Form/Ox.Input.js @@ -356,7 +356,7 @@ Ox.Input = function(options, self) { } } newLength = newValue.length; - + //Ox.print('selectEnd', selectEnd) if (self.options.autocompleteReplace) { @@ -484,8 +484,8 @@ Ox.Input = function(options, self) { var cursor, length, regexp = type == 'float' ? new RegExp( - '(^' + (self.options.min < 0 ? '\\-?' : '') + '\\d+\\.?\\d' + - (self.options.decimals ? '{0,' + self.options.decimals + '}' : '*') + '(^' + (self.options.min < 0 ? '\\-?' : '') + '\\d+\\.?\\d' + + (self.options.decimals ? '{0,' + self.options.decimals + '}' : '*') + '$)' ) : new RegExp('(^' + (self.options.min < 0 ? '\\-?' : '') + '\\d+)'); if (type == 'float') { diff --git a/source/Ox.UI/js/Form/Ox.Label.js b/source/Ox.UI/js/Form/Ox.Label.js index ee8de858..57705e77 100644 --- a/source/Ox.UI/js/Form/Ox.Label.js +++ b/source/Ox.UI/js/Form/Ox.Label.js @@ -5,7 +5,6 @@ Ox.Label Label Object (options) -> Label Object (options, self) -> Label Object options Options object - @*/ Ox.Label = function(options, self) { diff --git a/source/Ox.UI/js/Form/Ox.Range.js b/source/Ox.UI/js/Form/Ox.Range.js index 5b701fff..184a6fa4 100644 --- a/source/Ox.UI/js/Form/Ox.Range.js +++ b/source/Ox.UI/js/Form/Ox.Range.js @@ -6,20 +6,20 @@ Ox.Range Range Object (options, self) -> Range Object options Options object arrows if true, show arrows - arrowStep step when clicking arrows - arrowSymbols arrow symbols, like ['minus', 'plus'] - max maximum value - min minimum value - orientation 'horizontal' or 'vertical' - step step between values - size width or height, in px - thumbSize minimum width or height of thumb, in px + arrowStep step when clicking arrows + arrowSymbols arrow symbols, like ['minus', 'plus'] + max maximum value + min minimum value + orientation 'horizontal' or 'vertical' + step step between values + size width or height, in px + thumbSize minimum width or height of thumb, in px thumbValue if true, display value on thumb - trackGradient colors + trackGradient colors trackImages one or multiple track background image URLs - trackStep 0 (scroll here) or step when clicking track - value initial value - valueNames value names to display on thumb + trackStep 0 (scroll here) or step when clicking track + value initial value + valueNames value names to display on thumb self shared private variable change triggered on change of the range @*/ diff --git a/source/Ox.UI/js/List/Ox.InfoList.js b/source/Ox.UI/js/List/Ox.InfoList.js index 0890e7cb..a74fd07b 100644 --- a/source/Ox.UI/js/List/Ox.InfoList.js +++ b/source/Ox.UI/js/List/Ox.InfoList.js @@ -1,5 +1,5 @@ Ox.InfoList = function(options, self) { - + self = self || {}; var that = Ox.Element({}, self) .defaults({ @@ -64,7 +64,7 @@ Ox.InfoList = function(options, self) { info: {} }; Ox.print('DATA -=-------', data) - + var $icon = Ox.Element() .css({ float: 'left', diff --git a/source/Ox.UI/js/List/Ox.List.js b/source/Ox.UI/js/List/Ox.List.js index aba94fc1..2335f1ab 100644 --- a/source/Ox.UI/js/List/Ox.List.js +++ b/source/Ox.UI/js/List/Ox.List.js @@ -72,13 +72,13 @@ Ox.List = function(options, self) { .options(options || {}) .scroll(scroll); - that.$content.bindEvent({ + that.$content.bindEvent({ mousedown: mousedown, singleclick: singleclick, doubleclick: doubleclick }); if (self.options.draggable) { - that.$content.bindEvent({ + that.$content.bindEvent({ dragstart: dragstart, drag: drag, dragpause: dragpause, @@ -87,7 +87,7 @@ Ox.List = function(options, self) { dragend: dragend }); } else if (self.options.sortable) { - that.$content.bindEvent({ + that.$content.bindEvent({ dragstart: movestart, drag: move, dragend: moveend @@ -372,7 +372,7 @@ Ox.List = function(options, self) { }); } } - + function drag(data) { self.drag && that.triggerEvent('draganddrop', { ids: self.drag.ids, @@ -887,7 +887,7 @@ Ox.List = function(options, self) { clickable, editable; if (pos > -1) { if ( - !data.metaKey && !data.shiftKey + !data.metaKey && !data.shiftKey && isSelected(pos) && self.selected.length > 1 ) { // click on one of multiple selected items diff --git a/source/Ox.UI/js/List/Ox.TextList.js b/source/Ox.UI/js/List/Ox.TextList.js index f291fa02..ba88d6ff 100644 --- a/source/Ox.UI/js/List/Ox.TextList.js +++ b/source/Ox.UI/js/List/Ox.TextList.js @@ -723,7 +723,7 @@ Ox.TextList = function(options, self) { pos = getColumnPositionById(id); self.options.columns[i].width = width; self.columnWidths[pos] = width; - if (self.options.columnsVisible) { + if (self.options.columnsVisible) { that.$head.$content.css({ width: (Ox.sum(self.columnWidths) + 2) + 'px' }); @@ -784,7 +784,7 @@ Ox.TextList = function(options, self) { self.selectedColumn = getColumnIndexById(self.options.sort[0].key); toggleSelected(self.options.columns[self.selectedColumn].id); } - } + } } function updateOrder(id) { @@ -959,7 +959,7 @@ Ox.TextList = function(options, self) { id = value; } $cell = getCell(id, key); - $cell && $cell.html(formatValue(key, value, that.$body.value(id))); + $cell && $cell.html(formatValue(key, value, that.$body.value(id))); if (key == self.options.sort[0].key) { // sort key has changed that.$body.sort(); diff --git a/source/Ox.UI/js/List/Ox.TreeList.js b/source/Ox.UI/js/List/Ox.TreeList.js index 59e5e3aa..a9c89081 100644 --- a/source/Ox.UI/js/List/Ox.TreeList.js +++ b/source/Ox.UI/js/List/Ox.TreeList.js @@ -220,5 +220,5 @@ Ox.TreeList = function(options, self) { }; return that; - + }; diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js index b57af967..5fa45e27 100644 --- a/source/Ox.UI/js/Map/Ox.ListMap.js +++ b/source/Ox.UI/js/Map/Ox.ListMap.js @@ -521,7 +521,7 @@ Ox.ListMap = function(options, self) { type: 'float' }).hide() ]); - + self.$placeForm = Ox.Form({ items: self.$placeFormItems, width: 240 diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js index 78ed3530..51079d75 100644 --- a/source/Ox.UI/js/Map/Ox.Map.js +++ b/source/Ox.UI/js/Map/Ox.Map.js @@ -654,7 +654,7 @@ Ox.Map = function(options, self) { } function getMetersPerPixel() { - // m/px = m/deg * deg/px + // m/px = m/deg * deg/px var degreesPerPixel = 360 / (Ox.MAP_TILE_SIZE * Math.pow(2, self.map.getZoom())); return Ox.getMetersPerDegree(self.map.getCenter().lat()) * degreesPerPixel; } @@ -883,10 +883,10 @@ Ox.Map = function(options, self) { if (!self.isAsync) { self.places.sort(function(a, b) { var sort = { - a: a.selected ? Infinity : - bounds.contains(a.center) ? a.area : -Infinity, - b: b.selected ? Infinity : - bounds.contains(b.center) ? b.area : -Infinity, + a: a.selected ? Infinity + : bounds.contains(a.center) ? a.area : -Infinity, + b: b.selected ? Infinity + : bounds.contains(b.center) ? b.area : -Infinity, }; return sort.b - sort.a; }).forEach(function(place, i) { @@ -1434,7 +1434,7 @@ Ox.Map = function(options, self) { that.removePlace = function() { // fixme: removePlaceFromPlaces() ? removePlace(); - return that; + return that; }; that.resizeMap = function() { diff --git a/source/Ox.UI/js/Map/Ox.MapMarker.js b/source/Ox.UI/js/Map/Ox.MapMarker.js index 1e4ebfae..25a7633d 100644 --- a/source/Ox.UI/js/Map/Ox.MapMarker.js +++ b/source/Ox.UI/js/Map/Ox.MapMarker.js @@ -274,7 +274,7 @@ Ox.MapMarker = function(options) { google.maps.event.addListener(that.marker, 'dragend', dragend); return that; }; - + /*@ remove remove marker () -> remove marker from map, returns MapMarker diff --git a/source/Ox.UI/js/Map/Ox.MapPlace.js b/source/Ox.UI/js/Map/Ox.MapPlace.js index 591968b2..ee8cb11d 100644 --- a/source/Ox.UI/js/Map/Ox.MapPlace.js +++ b/source/Ox.UI/js/Map/Ox.MapPlace.js @@ -16,7 +16,7 @@ Ox.MapPlace MapPlace Object south type visible - west + west @*/ Ox.MapPlace = function(options) { @@ -34,7 +34,7 @@ Ox.MapPlace = function(options) { south: 0, type: '', visible: false, - west: 0 + west: 0 }, options); var that = this; @@ -202,7 +202,7 @@ Ox.MapPlace = function(options) { that.map.triggerEvent('changeplace', that); return that; }; - + /*@ undo undo @*/ diff --git a/source/Ox.UI/js/Map/Ox.MapRectangle.js b/source/Ox.UI/js/Map/Ox.MapRectangle.js index d0f01897..9a681e24 100644 --- a/source/Ox.UI/js/Map/Ox.MapRectangle.js +++ b/source/Ox.UI/js/Map/Ox.MapRectangle.js @@ -119,5 +119,5 @@ Ox.MapRectangle = function(options, self) { } return that; - + }; diff --git a/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js b/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js index f64e8104..a16e8118 100644 --- a/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js +++ b/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js @@ -66,8 +66,8 @@ Ox.MapRectangleMarker = function(options, self) { if (that.position.indexOf('e') > -1) { that.place.east = lng; } - Ox.print('west', that.place.west, 'east', that.place.east); - Ox.print('south', that.place.south, 'north', that.place.north); + //Ox.print('west', that.place.west, 'east', that.place.east); + //Ox.print('south', that.place.south, 'north', that.place.north); that.place.update(); that.place.marker.update(); that.place.rectangle.update(); diff --git a/source/Ox.UI/js/Menu/Ox.Menu.js b/source/Ox.UI/js/Menu/Ox.Menu.js index 0a6d91e2..66387cfc 100644 --- a/source/Ox.UI/js/Menu/Ox.Menu.js +++ b/source/Ox.UI/js/Menu/Ox.Menu.js @@ -536,7 +536,7 @@ Ox.Menu = function(options, self) { addItem @*/ that.addItem = function(item, position) { - + }; /*@ diff --git a/source/Ox.UI/js/Panel/Ox.SplitPanel.js b/source/Ox.UI/js/Panel/Ox.SplitPanel.js index a564c57b..1376912c 100644 --- a/source/Ox.UI/js/Panel/Ox.SplitPanel.js +++ b/source/Ox.UI/js/Panel/Ox.SplitPanel.js @@ -170,12 +170,11 @@ Ox.SplitPanel = function(options, self) { } self.$resizebars[i == 0 ? 0 : 1].options({size: element.size}); } - }); } /*@ - isCollapsed panel collapsed state + isCollapsed panel collapsed state (id) -> id or position of panel, returns collapsed state id The element's id or position @*/ @@ -185,7 +184,7 @@ Ox.SplitPanel = function(options, self) { }; /*@ - repleaseElement replace panel element + repleaseElement replace panel element (id, element) -> replace element id The element's id or position element new element diff --git a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js index 9d447c29..fae78489 100644 --- a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js @@ -172,7 +172,6 @@ Ox.BlockVideoTimeline = function(options, self) { Ox.formatDuration(position) }) .show(e.clientX, e.clientY); - } else { self.$tooltip.hide(); } diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index b4acbc87..cc46b665 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -97,8 +97,7 @@ Ox.SmallVideoTimeline = function(options, self) { } function getPosition(e) { - var position = - ( + var position = ( (e.offsetX ? e.offsetX : e.clientX - $(e.target).offset().left) - (self.options.type == 'player' ? 8 : 0) ) * self.options.duration / self.imageWidth; diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 3314c9cb..eab85103 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -275,7 +275,7 @@ Ox.VideoEditor = function(options, self) { ) .bindEvent({ add: function(data) { - data.layer = layer.id; + data.layer = layer.id; data['in'] = self.options['in']; data.out = self.options.out; that.triggerEvent('addannotation', data); @@ -440,7 +440,7 @@ Ox.VideoEditor = function(options, self) { } }); //.appendTo(self.$videobar); - + if (self.options.posterFrameControls) { self.$goToPosterButton = Ox.Button({ @@ -598,7 +598,6 @@ Ox.VideoEditor = function(options, self) { {id: 'smallText', title: 'Small', checked: true}, {id: 'mediumText', title: 'Medium'}, {id: 'largeText', title: 'Large'} - ], max: 2, title: 'set', @@ -772,9 +771,9 @@ Ox.VideoEditor = function(options, self) { function getSizes(scrollbarIsVisible) { //Ox.print('getSizes', scrollbarIsVisible) var scrollbarWidth = Ox.UI.SCROLLBAR_SIZE, - contentWidth = self.options.width - - (self.options.showAnnotations * self.options.annotationsSize) - 1 - - (scrollbarIsVisible ? scrollbarWidth : 0), + contentWidth = self.options.width + - (self.options.showAnnotations * self.options.annotationsSize) - 1 + - (scrollbarIsVisible ? scrollbarWidth : 0), height, lines, size = { @@ -1008,7 +1007,7 @@ Ox.VideoEditor = function(options, self) { self.$player[0].togglePaused(); /* fixme self.$player[0].options('paused') && that.triggerEvent('position', { - + }); */ } diff --git a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js index 8348784d..0cb61c9a 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js @@ -238,7 +238,7 @@ Ox.VideoPanelPlayer = function(options, self) { //self.$video.position(self.options.position); self.$timeline.options({ position: self.options.position - }); + }); } function toggleAnnotations(data) { @@ -291,7 +291,7 @@ Ox.VideoPanelPlayer = function(options, self) { /*@ toggleAnnotations toggle annotations - () -> toggle visibility of annotations + () -> toggle visibility of annotations @*/ that.toggleAnnotations = function() { that.$element.toggle(1);