diff --git a/source/Ox.UI/Ox.UI.js b/source/Ox.UI/Ox.UI.js index 81a06e6a..99b9d455 100644 --- a/source/Ox.UI/Ox.UI.js +++ b/source/Ox.UI/Ox.UI.js @@ -413,11 +413,11 @@ Ox.load.UI = function(options, callback) { Ox.UI.PATH = Ox.PATH + 'Ox.UI/'; //@ Ox.UI.SCOLLBAR_SIZE size of scrollbar Ox.UI.SCROLLBAR_SIZE = $.browser.webkit ? 8 : (function() { - var inner = $('

').css({ + var inner = Ox.$('

').css({ height: '200px', width: '100%' }), - outer = $('

').css({ + outer = Ox.$('
').css({ height: '150px', left: 0, overflow: 'hidden', @@ -426,8 +426,7 @@ Ox.load.UI = function(options, callback) { visibility: 'hidden', width: '200px' }).append(inner).appendTo($('body')), - width; - width = inner[0].offsetWidth; + width = inner[0].offsetWidth; outer.css({overflow: 'scroll'}); width = 1 + width - (inner[0].offsetWidth == width ? outer[0].clientWidth : inner[0].offsetWidth); diff --git a/source/Ox.UI/js/Map/Map.js b/source/Ox.UI/js/Map/Map.js index 13adb37a..79c22993 100644 --- a/source/Ox.UI/js/Map/Map.js +++ b/source/Ox.UI/js/Map/Map.js @@ -361,7 +361,7 @@ Ox.Map = function(options, self) { bottom: 0 }) .appendTo(that); - self.$placeFlag = $('') + self.$placeFlag = Ox.$('') .addClass('OxFlag') .attr({ src: Ox.PATH + 'Ox.Geo/png/icons/16/NTHH.png' @@ -1252,7 +1252,7 @@ Ox.Map = function(options, self) { .data({country: country}) .empty() .append( - $('').attr({ + Ox.$('').attr({ src: Ox.getFlagByGeoname(place.geoname, 16) }) ) @@ -1602,7 +1602,7 @@ Ox.Map = function(options, self) { self.$placeControls.name.options({title: value}); } else if (key == 'geoname') { self.$placeControls.flag.empty().append( - $('').attr({ + Ox.$('').attr({ src: Ox.getFlagByGeoname(value, 16) }) ); diff --git a/source/Ox.UI/js/Map/MapEditor.js b/source/Ox.UI/js/Map/MapEditor.js index 362a46d0..1d87e621 100644 --- a/source/Ox.UI/js/Map/MapEditor.js +++ b/source/Ox.UI/js/Map/MapEditor.js @@ -79,7 +79,7 @@ Ox.MapEditor = function(options, self) { { format: function(value, data) { return data.type - ? $('') + ? Ox.$('') .attr({ src: Ox.getFlagByGeoname(data.geoname, 16) }) @@ -121,7 +121,7 @@ Ox.MapEditor = function(options, self) { } }); return data.type - ? $('
') + ? Ox.$('
') .addClass('OxTypeIcon') .css({ width: iconSize + 'px', @@ -148,7 +148,7 @@ Ox.MapEditor = function(options, self) { format: function(value, data) { return data.type ? value - : $('').addClass('OxWarning').html(value); + : Ox.$('').addClass('OxWarning').html(value); }, id: 'name', operator: '+', @@ -427,7 +427,7 @@ Ox.MapEditor = function(options, self) { self.$placeTitlebar = Ox.Bar({ size: 24 }); - self.$placeTitle = $('
') + self.$placeTitle = Ox.$('
') .hide() .appendTo(self.$placeTitlebar); if (self.options.mode == 'define') { @@ -443,7 +443,7 @@ Ox.MapEditor = function(options, self) { .hide() .appendTo(self.$placeTitle); } - self.$placeFlag = $('') + self.$placeFlag = Ox.$('') .addClass('OxFlag') .attr({ src: Ox.getFlagByGeoname('', 16) diff --git a/source/Ox.UI/js/Menu/MainMenu.js b/source/Ox.UI/js/Menu/MainMenu.js index 0bcc712b..7f6d1153 100644 --- a/source/Ox.UI/js/Menu/MainMenu.js +++ b/source/Ox.UI/js/Menu/MainMenu.js @@ -37,7 +37,7 @@ Ox.MainMenu = function(options, self) { }); if (self.options.extras.length) { - that.extras = $('
') + that.extras = Ox.$('
') .addClass('OxExtras') .appendTo(that); self.options.extras.forEach(function(extra) { @@ -49,7 +49,7 @@ Ox.MainMenu = function(options, self) { that.titles[position] = $('
') .addClass('OxTitle') .html(menu.title) - .data('position', position); + .data({position: position}); if (position == 0) { if (that.titles.length == 1) { that.titles[position].appendTo(that); diff --git a/source/Ox.UI/js/Menu/MenuButton.js b/source/Ox.UI/js/Menu/MenuButton.js index 178b4706..aae4eabe 100644 --- a/source/Ox.UI/js/Menu/MenuButton.js +++ b/source/Ox.UI/js/Menu/MenuButton.js @@ -66,7 +66,7 @@ Ox.MenuButton = function(options, self) { }); if (self.options.type == 'text') { - self.$title = $('
') + self.$title = Ox.$('
') .addClass('OxTitle') .css({width: self.options.width - 24 + 'px'}) .html(self.options.title) diff --git a/source/Ox.UI/js/Menu/MenuItem.js b/source/Ox.UI/js/Menu/MenuItem.js index d4671e21..1906005f 100644 --- a/source/Ox.UI/js/Menu/MenuItem.js +++ b/source/Ox.UI/js/Menu/MenuItem.js @@ -71,7 +71,7 @@ Ox.MenuItem = function(options, self) { } that.append( - that.$status = $('') + that.$status = Ox.$('') .addClass('OxCell OxStatus') .html(self.options.checked ? Ox.UI.symbols.check : '') ) @@ -80,12 +80,12 @@ Ox.MenuItem = function(options, self) { .addClass('OxCell OxIcon') .append( self.options.icon - ? $('').attr({src: self.options.icon}) + ? Ox.$('').attr({src: self.options.icon}) : null ) ) .append( - that.$title = $('') + that.$title = Ox.$('') .addClass('OxCell OxTitle') .css( self.options.maxWidth @@ -110,12 +110,12 @@ Ox.MenuItem = function(options, self) { : ( Ox.isString(self.options.title[0]) ? self.options.title[0] - : $('
').html(self.options.title[0]).html() + : Ox.$('
').html(self.options.title[0]).html() ) ) ) .append( - that.$modifiers = $('') + that.$modifiers = Ox.$('') .addClass('OxCell OxModifiers') .html( self.options.keyboard.modifiers.map(function(modifier) { @@ -124,7 +124,7 @@ Ox.MenuItem = function(options, self) { ) ) .append( - that.$key = $('') + that.$key = Ox.$('') .addClass( 'OxCell Ox' + (self.options.items.length ? 'Submenu' : 'Key') ) diff --git a/source/Ox.UI/js/Video/VideoPreview.js b/source/Ox.UI/js/Video/VideoPreview.js index a364b324..bad8b195 100644 --- a/source/Ox.UI/js/Video/VideoPreview.js +++ b/source/Ox.UI/js/Video/VideoPreview.js @@ -49,11 +49,11 @@ Ox.VideoPreview = function(options, self) { self.loaded = []; self.queue = []; - self.$frameElement = $('
') + self.$frameElement = Ox.$('
') .addClass('OxFrame') .appendTo(that); - self.$frame = $('') + self.$frame = Ox.$('') .attr({src: self.options.getFrame(self.options.position)}) .css(getFrameCSS()) .appendTo(self.$frameElement);