From 498b17926f3caed38ec64e18c67fd9ed5b85ae23 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 23 Apr 2011 00:46:07 +0200 Subject: [PATCH 1/6] images loaded in Ox.UI now --- source/js/Ox.App.js | 46 +++++++++++---------------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/source/js/Ox.App.js b/source/js/Ox.App.js index ee9bb7e5..43129a3e 100644 --- a/source/js/Ox.App.js +++ b/source/js/Ox.App.js @@ -86,26 +86,6 @@ Ox.App = (function() { }; } - function loadImages(callback) { - window.OxImageCache = []; - $.getJSON(Ox.UI.PATH + 'json/ox.ui.images.json', function(data) { - // fixme: find a better way to not wait for flags - data = data.filter(function(image) { - return !Ox.startsWith(image, 'svg/ox.map/') - }); - var counter = 0, - length = data.length; - data.forEach(function(src, i) { - var image = new Image(); - image.src = Ox.UI.PATH + src; - image.onload = function() { - (++counter == length) && callback(); - } - window.OxImageCache.push(image); // fixme: global var??? - }); - }); - } - self.change = function(key, value) { }; @@ -165,23 +145,19 @@ Ox.App = (function() { user = result.data.user; // fixme: not generic document.title = config.site.name; - launchCallback(); + $(function() { + var $div = Ox.UI.$body.find('div'); + Ox.UI.$body.find('img').remove(); + $div.animate({ + opacity: 0 + }, 1000, function() { + $div.remove(); + }); + // fixme: not generic enough, just pass data + callback({config: config, user: user}); + }); }); }); - loadImages(launchCallback); - function launchCallback() { - ++counter == 2 && $(function() { - var $div = Ox.UI.$body.find('div'); - Ox.UI.$body.find('img').remove(); - $div.animate({ - opacity: 0 - }, 1000, function() { - $div.remove(); - }); - // fixme: not generic enough, just pass data - callback({config: config, user: user}); - }); - } } function stop() { that.request.send(self.options.init, getUserData(), function() {}); From 09e97fa08b42085a80cea8ced750a7edb61a6f6d Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 23 Apr 2011 00:46:37 +0200 Subject: [PATCH 2/6] images is not an array use Ox.forEach --- source/js/Ox.Flipbook.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/source/js/Ox.Flipbook.js b/source/js/Ox.Flipbook.js index dd90d7e2..13e9e452 100644 --- a/source/js/Ox.Flipbook.js +++ b/source/js/Ox.Flipbook.js @@ -18,14 +18,14 @@ Ox.Flipbook = function(options, self) { timestamp = $('
').css({ 'position': 'absolute', 'text-align': 'center', - 'width': '100%', + 'width': '100%' }) .hide(), that = new Ox.Element('div', self) .defaults({ frames: {}, duration: 0, - icon: '', + icon: '' }) .options(options || {}) .append(icon) @@ -66,9 +66,10 @@ Ox.Flipbook = function(options, self) { function getFrame(position) { var frame; - frames.forEach(function(img, i) { - if (!frame || i <= position) + Ox.forEach(frames, function(img, i) { + if (!frame || i <= position) { frame = img; + } }); return frame; } @@ -78,7 +79,7 @@ Ox.Flipbook = function(options, self) { frames[i] = new Image(); frames[i].onload = function() { frameHeight = frames[i].height / frames[i].width * that.width(); - } + }; frames[i].src = src; }); } @@ -89,10 +90,11 @@ Ox.Flipbook = function(options, self) { } else if (key == 'icon') { icon.attr('src', value); } - } + }; - if(options.icon) - icon.attr('src', options.icon); + if(options.icon) { + icon.attr('src', options.icon); + } cacheFrames(); return that; }; From 32f3a200ba101b40d01bbe148d2b8d1fd9cfda8c Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 23 Apr 2011 00:54:53 +0200 Subject: [PATCH 3/6] add modelines --- source/js/Ox.AnnotationPanel.js | 1 + source/js/Ox.App.js | 1 + source/js/Ox.Bar.js | 1 + source/js/Ox.BlockTimeline.js | 1 + source/js/Ox.Button.js | 1 + source/js/Ox.ButtonGroup.js | 1 + source/js/Ox.Calendar.js | 1 + source/js/Ox.CalendarDate.js | 1 + source/js/Ox.Checkbox.js | 1 + source/js/Ox.CheckboxGroup.js | 1 + source/js/Ox.Clipboard.js | 1 + source/js/Ox.CollapsePanel.js | 1 + source/js/Ox.ColorInput.js | 1 + source/js/Ox.ColorPicker.js | 1 + source/js/Ox.Container.js | 1 + source/js/Ox.DateInput.js | 1 + source/js/Ox.DateTimeInput.js | 1 + source/js/Ox.Dialog.js | 1 + source/js/Ox.Element.js | 1 + source/js/Ox.FilesView.js | 1 + source/js/Ox.Filter.js | 1 + source/js/Ox.Flipbook.js | 1 + source/js/Ox.Focus.js | 1 + source/js/Ox.Form.js | 1 + source/js/Ox.FormElementGroup.js | 1 + source/js/Ox.FormItem.js | 1 + source/js/Ox.History.js | 1 + source/js/Ox.IconItem.js | 1 + source/js/Ox.IconList.js | 1 + source/js/Ox.Input.js | 1 + source/js/Ox.InputGroup.js | 3 ++- source/js/Ox.ItemInput.js | 1 + source/js/Ox.JQueryElement.js | 1 + source/js/Ox.Keyboard.js | 1 + source/js/Ox.Label.js | 1 + source/js/Ox.LargeTimeline.js | 1 + source/js/Ox.List.js | 1 + source/js/Ox.ListItem.js | 1 + source/js/Ox.ListMap.js | 1 + source/js/Ox.ListPage.js | 1 + source/js/Ox.LoadingIcon.js | 1 + source/js/Ox.MainMenu.js | 1 + source/js/Ox.Map.js | 1 + source/js/Ox.MapImage.js | 1 + source/js/Ox.MapMarker.js | 1 + source/js/Ox.MapPlace.js | 1 + source/js/Ox.MapRectangle.js | 1 + source/js/Ox.MapRectangleMarker.js | 1 + source/js/Ox.Menu.js | 1 + source/js/Ox.MenuItem.js | 1 + source/js/Ox.OptionGroup.js | 1 + source/js/Ox.Panel.js | 1 + source/js/Ox.Picker.js | 1 + source/js/Ox.PlaceInput.js | 1 + source/js/Ox.PlacePicker.js | 1 + source/js/Ox.Progressbar.js | 1 + source/js/Ox.Range.js | 1 + source/js/Ox.Request.js | 1 + source/js/Ox.Resizebar.js | 1 + source/js/Ox.Select.js | 1 + source/js/Ox.SmallTimeline.js | 1 + source/js/Ox.SplitPanel.js | 2 +- source/js/Ox.TabPanel.js | 1 + source/js/Ox.Tabbar.js | 1 + source/js/Ox.TextList.js | 1 + source/js/Ox.Theme.js | 1 + source/js/Ox.TimeInput.js | 1 + source/js/Ox.Toolbar.js | 1 + source/js/Ox.Tooltip.js | 1 + source/js/Ox.TreeList.js | 1 + source/js/Ox.URL.js | 1 + source/js/Ox.VideoEditorPlayer.js | 1 + source/js/Ox.VideoElement.js | 1 + source/js/Ox.VideoPanelPlayer.js | 1 + source/js/Ox.VideoPlayer.js | 1 + source/js/Ox.Window.js | 1 + source/js/Ox.js | 1 + source/js/OxUI.js | 1 + 78 files changed, 79 insertions(+), 2 deletions(-) diff --git a/source/js/Ox.AnnotationPanel.js b/source/js/Ox.AnnotationPanel.js index 50cec2f0..f6d1c90d 100644 --- a/source/js/Ox.AnnotationPanel.js +++ b/source/js/Ox.AnnotationPanel.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.AnnotationPanel = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.App.js b/source/js/Ox.App.js index 43129a3e..3f947fef 100644 --- a/source/js/Ox.App.js +++ b/source/js/Ox.App.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /* ============================================================================ Application diff --git a/source/js/Ox.Bar.js b/source/js/Ox.Bar.js index 7fb55c2b..21f37fa8 100644 --- a/source/js/Ox.Bar.js +++ b/source/js/Ox.Bar.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** */ Ox.Bar = function(options, self) { diff --git a/source/js/Ox.BlockTimeline.js b/source/js/Ox.BlockTimeline.js index eec9a0f2..9bcd3356 100644 --- a/source/js/Ox.BlockTimeline.js +++ b/source/js/Ox.BlockTimeline.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.BlockTimeline = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.Button.js b/source/js/Ox.Button.js index bc95302b..88955e38 100644 --- a/source/js/Ox.Button.js +++ b/source/js/Ox.Button.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Button = function(options, self) { /** diff --git a/source/js/Ox.ButtonGroup.js b/source/js/Ox.ButtonGroup.js index b8077d1d..f09c6fa5 100644 --- a/source/js/Ox.ButtonGroup.js +++ b/source/js/Ox.ButtonGroup.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.ButtonGroup = function(options, self) { /** diff --git a/source/js/Ox.Calendar.js b/source/js/Ox.Calendar.js index 4819ebfc..c85f1176 100644 --- a/source/js/Ox.Calendar.js +++ b/source/js/Ox.Calendar.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Calendar = function(options, self) { self = self || {}; diff --git a/source/js/Ox.CalendarDate.js b/source/js/Ox.CalendarDate.js index cb37a9d1..a888947a 100644 --- a/source/js/Ox.CalendarDate.js +++ b/source/js/Ox.CalendarDate.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.CalendarDate = function(options) { var self = {}, diff --git a/source/js/Ox.Checkbox.js b/source/js/Ox.Checkbox.js index 088d026c..d597b120 100644 --- a/source/js/Ox.Checkbox.js +++ b/source/js/Ox.Checkbox.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Checkbox = function(options, self) { /** diff --git a/source/js/Ox.CheckboxGroup.js b/source/js/Ox.CheckboxGroup.js index 236f7969..11257a07 100644 --- a/source/js/Ox.CheckboxGroup.js +++ b/source/js/Ox.CheckboxGroup.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.CheckboxGroup = function(options, self) { /** diff --git a/source/js/Ox.Clipboard.js b/source/js/Ox.Clipboard.js index 352113b1..a44bc99d 100644 --- a/source/js/Ox.Clipboard.js +++ b/source/js/Ox.Clipboard.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Clipboard = function() { /*** Ox.Clipboard diff --git a/source/js/Ox.CollapsePanel.js b/source/js/Ox.CollapsePanel.js index adf8beb8..02f6e229 100644 --- a/source/js/Ox.CollapsePanel.js +++ b/source/js/Ox.CollapsePanel.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** */ Ox.CollapsePanel = function(options, self) { diff --git a/source/js/Ox.ColorInput.js b/source/js/Ox.ColorInput.js index 179a0e64..a52c5797 100644 --- a/source/js/Ox.ColorInput.js +++ b/source/js/Ox.ColorInput.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.ColorInput = function(options, self) { var self = $.extend(self || {}, { diff --git a/source/js/Ox.ColorPicker.js b/source/js/Ox.ColorPicker.js index 2b37769e..356189ca 100644 --- a/source/js/Ox.ColorPicker.js +++ b/source/js/Ox.ColorPicker.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.ColorPicker = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.Container.js b/source/js/Ox.Container.js index 423e055f..6280f8e2 100644 --- a/source/js/Ox.Container.js +++ b/source/js/Ox.Container.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js // fixme: wouldn't it be better to let the elements be, // rather then $element, $content, and potentially others, // 0, 1, 2, etc, so that append would append 0, and appendTo diff --git a/source/js/Ox.DateInput.js b/source/js/Ox.DateInput.js index 59b189cd..aebeb8d4 100644 --- a/source/js/Ox.DateInput.js +++ b/source/js/Ox.DateInput.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.DateInput = function(options, self) { /** diff --git a/source/js/Ox.DateTimeInput.js b/source/js/Ox.DateTimeInput.js index 33d0f9ac..cef8c548 100644 --- a/source/js/Ox.DateTimeInput.js +++ b/source/js/Ox.DateTimeInput.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.DateTimeInput = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.Dialog.js b/source/js/Ox.Dialog.js index 507ee0a2..0a4657b2 100644 --- a/source/js/Ox.Dialog.js +++ b/source/js/Ox.Dialog.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Dialog = function(options, self) { // fixme: dialog should be derived from a generic draggable diff --git a/source/js/Ox.Element.js b/source/js/Ox.Element.js index 4326629b..f72e9708 100644 --- a/source/js/Ox.Element.js +++ b/source/js/Ox.Element.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js // check out http://ejohn.org/apps/learn/#36 (-#38, making fns work w/o new) Ox.Element = function() { diff --git a/source/js/Ox.FilesView.js b/source/js/Ox.FilesView.js index e6d3dfee..8a06fd32 100644 --- a/source/js/Ox.FilesView.js +++ b/source/js/Ox.FilesView.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js // fixme: this is not necessarily part of OxUI /* diff --git a/source/js/Ox.Filter.js b/source/js/Ox.Filter.js index 560b6e82..17d414a9 100644 --- a/source/js/Ox.Filter.js +++ b/source/js/Ox.Filter.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Filter = function(options, self) { /*** diff --git a/source/js/Ox.Flipbook.js b/source/js/Ox.Flipbook.js index 13e9e452..aa3d0f34 100644 --- a/source/js/Ox.Flipbook.js +++ b/source/js/Ox.Flipbook.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js // fixme: rename! Ox.Flipbook = function(options, self) { diff --git a/source/js/Ox.Focus.js b/source/js/Ox.Focus.js index eb331588..1b080ccb 100644 --- a/source/js/Ox.Focus.js +++ b/source/js/Ox.Focus.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Focus = function() { /*** Ox.Focus diff --git a/source/js/Ox.Form.js b/source/js/Ox.Form.js index acb52c01..233930c8 100644 --- a/source/js/Ox.Form.js +++ b/source/js/Ox.Form.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Form = function(options, self) { /** diff --git a/source/js/Ox.FormElementGroup.js b/source/js/Ox.FormElementGroup.js index 103670d4..b49c82e7 100644 --- a/source/js/Ox.FormElementGroup.js +++ b/source/js/Ox.FormElementGroup.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.FormElementGroup = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.FormItem.js b/source/js/Ox.FormItem.js index 94fadbba..52dffa18 100644 --- a/source/js/Ox.FormItem.js +++ b/source/js/Ox.FormItem.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.FormItem = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.History.js b/source/js/Ox.History.js index 2432f7a2..04bd96d2 100644 --- a/source/js/Ox.History.js +++ b/source/js/Ox.History.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /*** Ox.History ***/ diff --git a/source/js/Ox.IconItem.js b/source/js/Ox.IconItem.js index 2958e81b..6c28a0b7 100644 --- a/source/js/Ox.IconItem.js +++ b/source/js/Ox.IconItem.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.IconItem = function(options, self) { //Ox.print('IconItem', options, self) diff --git a/source/js/Ox.IconList.js b/source/js/Ox.IconList.js index c3001355..7d4ff2bd 100644 --- a/source/js/Ox.IconList.js +++ b/source/js/Ox.IconList.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.IconList = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.Input.js b/source/js/Ox.Input.js index 1d4009d3..838b6792 100644 --- a/source/js/Ox.Input.js +++ b/source/js/Ox.Input.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Input = function(options, self) { /** diff --git a/source/js/Ox.InputGroup.js b/source/js/Ox.InputGroup.js index d0e92a1d..6eaf24a6 100644 --- a/source/js/Ox.InputGroup.js +++ b/source/js/Ox.InputGroup.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.InputGroup = function(options, self) { /*** @@ -130,4 +131,4 @@ Ox.InputGroup = function(options, self) { return that; -}; \ No newline at end of file +}; diff --git a/source/js/Ox.ItemInput.js b/source/js/Ox.ItemInput.js index 92f4a5d6..99974ae0 100644 --- a/source/js/Ox.ItemInput.js +++ b/source/js/Ox.ItemInput.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.ItemInput = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.JQueryElement.js b/source/js/Ox.JQueryElement.js index 31bf5d70..9eeb1f78 100644 --- a/source/js/Ox.JQueryElement.js +++ b/source/js/Ox.JQueryElement.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js // Basic jQuery element Ox.JQueryElement = function($element) { var that = this; diff --git a/source/js/Ox.Keyboard.js b/source/js/Ox.Keyboard.js index 99eef396..29d8da4d 100644 --- a/source/js/Ox.Keyboard.js +++ b/source/js/Ox.Keyboard.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /*** Ox.Keyboard ***/ diff --git a/source/js/Ox.Label.js b/source/js/Ox.Label.js index f824e818..2a22be8a 100644 --- a/source/js/Ox.Label.js +++ b/source/js/Ox.Label.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Label = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.LargeTimeline.js b/source/js/Ox.LargeTimeline.js index ec29808c..0508a15b 100644 --- a/source/js/Ox.LargeTimeline.js +++ b/source/js/Ox.LargeTimeline.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.LargeTimeline = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.List.js b/source/js/Ox.List.js index a0de2e39..ea2a7972 100644 --- a/source/js/Ox.List.js +++ b/source/js/Ox.List.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.List = function(options, self) { /*** diff --git a/source/js/Ox.ListItem.js b/source/js/Ox.ListItem.js index 5e1de19d..1ade0ef6 100644 --- a/source/js/Ox.ListItem.js +++ b/source/js/Ox.ListItem.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.ListItem = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.ListMap.js b/source/js/Ox.ListMap.js index 4b5450b7..bf2ba6b4 100644 --- a/source/js/Ox.ListMap.js +++ b/source/js/Ox.ListMap.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.ListMap = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.ListPage.js b/source/js/Ox.ListPage.js index 852035bc..b865ae4c 100644 --- a/source/js/Ox.ListPage.js +++ b/source/js/Ox.ListPage.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.ListPage = function(options, self) { var self = self || {}, that = new Ox.Element({}, self) diff --git a/source/js/Ox.LoadingIcon.js b/source/js/Ox.LoadingIcon.js index 37136c88..c7320c2a 100644 --- a/source/js/Ox.LoadingIcon.js +++ b/source/js/Ox.LoadingIcon.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.LoadingIcon = function(options, self) { var self = self || {}, that = new Ox.Element('img', self) diff --git a/source/js/Ox.MainMenu.js b/source/js/Ox.MainMenu.js index 597b07be..f091d18f 100644 --- a/source/js/Ox.MainMenu.js +++ b/source/js/Ox.MainMenu.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** */ Ox.MainMenu = function(options, self) { diff --git a/source/js/Ox.Map.js b/source/js/Ox.Map.js index d04b6ca6..0c4b1b0e 100644 --- a/source/js/Ox.Map.js +++ b/source/js/Ox.Map.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Map = function(options, self) { var self = self || {} diff --git a/source/js/Ox.MapImage.js b/source/js/Ox.MapImage.js index 737a945e..527c473a 100644 --- a/source/js/Ox.MapImage.js +++ b/source/js/Ox.MapImage.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.MapImage = function(options, self) { /** diff --git a/source/js/Ox.MapMarker.js b/source/js/Ox.MapMarker.js index f854bfff..f23fdf3d 100644 --- a/source/js/Ox.MapMarker.js +++ b/source/js/Ox.MapMarker.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.MapMarker = function(options) { var options = Ox.extend({ diff --git a/source/js/Ox.MapPlace.js b/source/js/Ox.MapPlace.js index 2210c7c0..721104f7 100644 --- a/source/js/Ox.MapPlace.js +++ b/source/js/Ox.MapPlace.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.MapPlace = function(options) { options = Ox.extend({ diff --git a/source/js/Ox.MapRectangle.js b/source/js/Ox.MapRectangle.js index b960d469..9e9c2f74 100644 --- a/source/js/Ox.MapRectangle.js +++ b/source/js/Ox.MapRectangle.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.MapRectangle = function(options, self) { var options = Ox.extend({ diff --git a/source/js/Ox.MapRectangleMarker.js b/source/js/Ox.MapRectangleMarker.js index f962dca5..15d1380c 100644 --- a/source/js/Ox.MapRectangleMarker.js +++ b/source/js/Ox.MapRectangleMarker.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.MapRectangleMarker = function(options, self) { var options = Ox.extend({ diff --git a/source/js/Ox.Menu.js b/source/js/Ox.Menu.js index 52f48855..914e83af 100644 --- a/source/js/Ox.Menu.js +++ b/source/js/Ox.Menu.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** options element the element the menu is attached to diff --git a/source/js/Ox.MenuItem.js b/source/js/Ox.MenuItem.js index 1a093296..bbb3fb3c 100644 --- a/source/js/Ox.MenuItem.js +++ b/source/js/Ox.MenuItem.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.MenuItem = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.OptionGroup.js b/source/js/Ox.OptionGroup.js index 55f09524..642c893d 100644 --- a/source/js/Ox.OptionGroup.js +++ b/source/js/Ox.OptionGroup.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.OptionGroup = function(items, min, max, property) { /* diff --git a/source/js/Ox.Panel.js b/source/js/Ox.Panel.js index 7679a5a2..649c2a1b 100644 --- a/source/js/Ox.Panel.js +++ b/source/js/Ox.Panel.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** */ Ox.Panel = function(options, self) { diff --git a/source/js/Ox.Picker.js b/source/js/Ox.Picker.js index 5db50bf3..e5c809c2 100644 --- a/source/js/Ox.Picker.js +++ b/source/js/Ox.Picker.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Picker = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.PlaceInput.js b/source/js/Ox.PlaceInput.js index f74ddc9e..d3709910 100644 --- a/source/js/Ox.PlaceInput.js +++ b/source/js/Ox.PlaceInput.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.PlaceInput = function(options, self) { var self = $.extend(self || {}, { diff --git a/source/js/Ox.PlacePicker.js b/source/js/Ox.PlacePicker.js index f360ad64..26b3f9cb 100644 --- a/source/js/Ox.PlacePicker.js +++ b/source/js/Ox.PlacePicker.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.PlacePicker = function(options, self) { var self = $.extend(self || {}, { diff --git a/source/js/Ox.Progressbar.js b/source/js/Ox.Progressbar.js index d917bc5e..99a64f79 100644 --- a/source/js/Ox.Progressbar.js +++ b/source/js/Ox.Progressbar.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** Ox.Progressbar */ diff --git a/source/js/Ox.Range.js b/source/js/Ox.Range.js index f98b0919..3cb8b95d 100644 --- a/source/js/Ox.Range.js +++ b/source/js/Ox.Range.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Range = function(options, self) { /** diff --git a/source/js/Ox.Request.js b/source/js/Ox.Request.js index 62ddd4b9..3486486b 100644 --- a/source/js/Ox.Request.js +++ b/source/js/Ox.Request.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Request = function(options) { /*** diff --git a/source/js/Ox.Resizebar.js b/source/js/Ox.Resizebar.js index 64544d4a..e7bdf906 100644 --- a/source/js/Ox.Resizebar.js +++ b/source/js/Ox.Resizebar.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** */ Ox.Resizebar = function(options, self) { diff --git a/source/js/Ox.Select.js b/source/js/Ox.Select.js index d39c1b54..9d4afb71 100644 --- a/source/js/Ox.Select.js +++ b/source/js/Ox.Select.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Select = function(options, self) { // fixme: selected item needs attribute "checked", not "selected" ... that's strange diff --git a/source/js/Ox.SmallTimeline.js b/source/js/Ox.SmallTimeline.js index 9e34df5d..c0eec761 100644 --- a/source/js/Ox.SmallTimeline.js +++ b/source/js/Ox.SmallTimeline.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.SmallTimeline = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.SplitPanel.js b/source/js/Ox.SplitPanel.js index d18dffca..43438391 100644 --- a/source/js/Ox.SplitPanel.js +++ b/source/js/Ox.SplitPanel.js @@ -1,4 +1,4 @@ - +//vim: et:ts=4:sw=4:sts=4:ft=js /** options: elements: [{ array of one, two or three elements diff --git a/source/js/Ox.TabPanel.js b/source/js/Ox.TabPanel.js index 03456f24..63fbaaae 100644 --- a/source/js/Ox.TabPanel.js +++ b/source/js/Ox.TabPanel.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.TabPanel = function(options, self) { }; diff --git a/source/js/Ox.Tabbar.js b/source/js/Ox.Tabbar.js index 93ccc2b1..1131c7e4 100644 --- a/source/js/Ox.Tabbar.js +++ b/source/js/Ox.Tabbar.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** */ Ox.Tabbar = function(options, self) { diff --git a/source/js/Ox.TextList.js b/source/js/Ox.TextList.js index 458fe360..a354b9ae 100644 --- a/source/js/Ox.TextList.js +++ b/source/js/Ox.TextList.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.TextList = function(options, self) { // fixme: rename to TableList diff --git a/source/js/Ox.Theme.js b/source/js/Ox.Theme.js index 1a2ae845..d27bd8ee 100644 --- a/source/js/Ox.Theme.js +++ b/source/js/Ox.Theme.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js // fixme: this should be Ox.Theme, and provide Ox.Theme.set(), Ox.Theme.load, etc. /** if name is given as argument, switch to this theme. diff --git a/source/js/Ox.TimeInput.js b/source/js/Ox.TimeInput.js index 149887fc..f9ff00b7 100644 --- a/source/js/Ox.TimeInput.js +++ b/source/js/Ox.TimeInput.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.TimeInput = function(options, self) { // fixme: seconds get set even if options.seconds is false diff --git a/source/js/Ox.Toolbar.js b/source/js/Ox.Toolbar.js index bcfc2874..54d4e884 100644 --- a/source/js/Ox.Toolbar.js +++ b/source/js/Ox.Toolbar.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /** fixme: no need for this */ diff --git a/source/js/Ox.Tooltip.js b/source/js/Ox.Tooltip.js index 12895288..ff3c6d47 100644 --- a/source/js/Ox.Tooltip.js +++ b/source/js/Ox.Tooltip.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Tooltip = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.TreeList.js b/source/js/Ox.TreeList.js index 04c6b83d..d132fe33 100644 --- a/source/js/Ox.TreeList.js +++ b/source/js/Ox.TreeList.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.TreeList = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.URL.js b/source/js/Ox.URL.js index d9932f30..fabeb8e6 100644 --- a/source/js/Ox.URL.js +++ b/source/js/Ox.URL.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js /*** Ox.URL ***/ diff --git a/source/js/Ox.VideoEditorPlayer.js b/source/js/Ox.VideoEditorPlayer.js index 87be806d..d2d8c23d 100644 --- a/source/js/Ox.VideoEditorPlayer.js +++ b/source/js/Ox.VideoEditorPlayer.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.VideoEditorPlayer = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.VideoElement.js b/source/js/Ox.VideoElement.js index 21584074..f328e723 100644 --- a/source/js/Ox.VideoElement.js +++ b/source/js/Ox.VideoElement.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.VideoElement = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.VideoPanelPlayer.js b/source/js/Ox.VideoPanelPlayer.js index d31b607e..d6249815 100644 --- a/source/js/Ox.VideoPanelPlayer.js +++ b/source/js/Ox.VideoPanelPlayer.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.VideoPanelPlayer = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.VideoPlayer.js b/source/js/Ox.VideoPlayer.js index 98b3c8ea..b0c97f65 100644 --- a/source/js/Ox.VideoPlayer.js +++ b/source/js/Ox.VideoPlayer.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.VideoEditor = function(options, self) { var self = self || {}, diff --git a/source/js/Ox.Window.js b/source/js/Ox.Window.js index 6c527ddb..0350252f 100644 --- a/source/js/Ox.Window.js +++ b/source/js/Ox.Window.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js Ox.Window = function(options, self) { self = self || {}, diff --git a/source/js/Ox.js b/source/js/Ox.js index d2c1f643..8a167de9 100644 --- a/source/js/Ox.js +++ b/source/js/Ox.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js // todo: check http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/ Ox = function(val) { diff --git a/source/js/OxUI.js b/source/js/OxUI.js index 62033ecc..e22cff0a 100644 --- a/source/js/OxUI.js +++ b/source/js/OxUI.js @@ -1,3 +1,4 @@ +//vim: et:ts=4:sw=4:sts=4:ft=js (function() { var path = Array.prototype.slice.apply( From 840eadf9140ad30d0f908828ca2c4d1159b3f08f Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 23 Apr 2011 01:07:55 +0200 Subject: [PATCH 4/6] new import path --- .bzrignore | 2 +- demos/list/index.html | 6 ++---- demos/list/js/list.js | 6 +++--- demos/mouse/index.html | 6 ++---- demos/mouse/js/mouse.js | 4 ++-- demos/png/index.html | 6 +++--- demos/splitpanel/index.html | 8 +++----- demos/splitpanel2/index.html | 9 +++------ demos/test/app.html | 4 +--- demos/test/app.js | 2 +- demos/test/index.html | 8 +++----- demos/test/list.html | 6 ++---- demos/test/list.js | 2 +- demos/test/menu.html | 4 +--- demos/test/menu.js | 4 ++-- docs/index.html | 5 ++--- 16 files changed, 32 insertions(+), 50 deletions(-) diff --git a/.bzrignore b/.bzrignore index a3c39f02..947f0057 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,2 +1,2 @@ .DS_Store -build/js +build/js/* diff --git a/demos/list/index.html b/demos/list/index.html index 82e653e1..32080562 100644 --- a/demos/list/index.html +++ b/demos/list/index.html @@ -4,10 +4,8 @@ ox.js list demo - - - + - \ No newline at end of file + diff --git a/demos/list/js/list.js b/demos/list/js/list.js index eeafcb32..47512bd3 100644 --- a/demos/list/js/list.js +++ b/demos/list/js/list.js @@ -1,4 +1,4 @@ -$(function() { +Ox.UI(function() { Ox.theme('modern'); @@ -42,7 +42,7 @@ $(function() { }) .bindEvent({ click: function() { - $text.html(JSON.stringify($treeList.$element.options('items'))) + $text.html(JSON.stringify($treeList.$element.options('items'))); } }) .appendTo($debug), @@ -60,4 +60,4 @@ $(function() { orientation: 'horizontal' }).appendTo($('body')); -}); \ No newline at end of file +}); diff --git a/demos/mouse/index.html b/demos/mouse/index.html index 4b25b260..b6085562 100644 --- a/demos/mouse/index.html +++ b/demos/mouse/index.html @@ -4,10 +4,8 @@ OxJS Mouse Events Demo - - - + - \ No newline at end of file + diff --git a/demos/mouse/js/mouse.js b/demos/mouse/js/mouse.js index d2e60c75..62da972d 100644 --- a/demos/mouse/js/mouse.js +++ b/demos/mouse/js/mouse.js @@ -1,4 +1,4 @@ -$(function() { +Ox.UI(function() { var $target = Ox.Element() .css({ position: 'absolute', @@ -54,4 +54,4 @@ $(function() { event == 'anyclick' && Ox.print(e); }); }); -}); \ No newline at end of file +}); diff --git a/demos/png/index.html b/demos/png/index.html index 149d1f13..5db29236 100644 --- a/demos/png/index.html +++ b/demos/png/index.html @@ -4,8 +4,8 @@ - - + + - \ No newline at end of file + diff --git a/demos/splitpanel/index.html b/demos/splitpanel/index.html index 2326c9b0..d4b74932 100644 --- a/demos/splitpanel/index.html +++ b/demos/splitpanel/index.html @@ -4,11 +4,9 @@ ox.js SplitPanel Demo - - - + - \ No newline at end of file + diff --git a/demos/splitpanel2/index.html b/demos/splitpanel2/index.html index 11a5c582..7da3090a 100644 --- a/demos/splitpanel2/index.html +++ b/demos/splitpanel2/index.html @@ -4,12 +4,9 @@ OxJS SplitPanel Demo - - - - + - \ No newline at end of file + diff --git a/demos/test/app.html b/demos/test/app.html index fae46439..3c654b33 100644 --- a/demos/test/app.html +++ b/demos/test/app.html @@ -3,9 +3,7 @@ - - - + diff --git a/demos/test/app.js b/demos/test/app.js index 905b0134..fb24f9f0 100644 --- a/demos/test/app.js +++ b/demos/test/app.js @@ -1,4 +1,4 @@ -$(function() { +Ox.UI(function() { var app = new Ox.App({ requestURL: "http://blackbook.local:8000/api/" }), diff --git a/demos/test/index.html b/demos/test/index.html index 7008d270..c5c1d049 100644 --- a/demos/test/index.html +++ b/demos/test/index.html @@ -30,11 +30,9 @@ padding: 0 4px 0 4px; } - - - + - \ No newline at end of file + diff --git a/demos/test/list.html b/demos/test/list.html index f7b28d88..d23034e1 100644 --- a/demos/test/list.html +++ b/demos/test/list.html @@ -5,10 +5,8 @@ - - - + - \ No newline at end of file + diff --git a/demos/test/list.js b/demos/test/list.js index ce250ec8..1ad65c81 100644 --- a/demos/test/list.js +++ b/demos/test/list.js @@ -1,4 +1,4 @@ -$(function() { +Ox.UI(function() { Ox.theme("modern"); var $body = $("body"), $document = $(document), diff --git a/demos/test/menu.html b/demos/test/menu.html index f3048ad7..6051602b 100644 --- a/demos/test/menu.html +++ b/demos/test/menu.html @@ -3,9 +3,7 @@ - - - + diff --git a/demos/test/menu.js b/demos/test/menu.js index 60819522..38803d32 100644 --- a/demos/test/menu.js +++ b/demos/test/menu.js @@ -1,4 +1,4 @@ -$(function() { +Ox.UI(function() { var button = new Ox.Button({ value: "First", }).css({ @@ -147,4 +147,4 @@ $(function() { $("