change symbols from png to svg

build/css/ox.ui.css

@@ -214,6 +214,8 @@ input[type=submit] {
 }
 input[type=image] {
     cursor: default;
+    -moz-user-select: none;
+    -webkit-user-select: none;
 }
 input:focus,
 textarea:focus {
@@ -266,25 +268,12 @@ input.OxSmall {
     -moz-border-radius: 6px;
     -webkit-border-radius: 6px;
 }
+
 input[type=image] {
-    padding: 0;
+    height: 10px;
-    -moz-user-select: none;
+    padding: 2px;
-    -webkit-user-select: none;
-}
-/*
-input[type=image].OxLarge {
-    width: 22px;
-}
-*/
-input[type=image].OxLarge {
-    width: 18px;
-}
-input[type=image].OxMedium {
-    width: 14px;
-}
-input[type=image].OxSmall {
-    width: 10px;
 }
+
 input::-moz-focus-inner {
     border: none;
 }
@@ -310,7 +299,7 @@ OxButton
 .OxButton.OxSymbol,
 .OxButton.OxSymbol:active,
 .OxButton.OxSymbol:focus {
-    padding: 0;
+    padding: 2;
     border: 1px solid rgba(0, 0, 0, 0);
     background: rgba(0, 0, 0, 0);
     -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
@@ -418,8 +407,6 @@ div.OxCheckbox {
     -webkit-border-radius: 8px;
 }
 input.OxCheckbox {
-    width: 14px;
-    height: 14px;
     -moz-border-radius: 8px;
     -webkit-border-radius: 8px;
 }
@@ -643,12 +630,12 @@ OxSelect
     margin-right: -16px;
 }
 .OxButton[type=image].OxOverlapLeft {
-    padding-left: 15px;
+    padding-left: 17px;
-    padding-right: 1px;
+    padding-right: 3px;
 }
 .OxButton[type=image].OxOverlapRight {
-    padding-left: 1px;
+    padding-left: 3px;
-    padding-right: 15px;
+    padding-right: 17px;
 }
 .OxCheckbox.OxOverlapLeft > .OxInput {
     padding-left: 20px;

build/js/ox.load.js

@@ -56,7 +56,7 @@ $(function() {
 
     function start() {
         var image = new Image(),
-            src = path + 'png/ox.ui.classic/loading.png';
+            src = path + 'svg/ox.ui.classic/symbolLoading.svg';
         image.src = src;
         image.onload = function() {
             var $img = $('<img>')
@@ -70,7 +70,8 @@ $(function() {
                     .mousedown(function(e) {
                         e.preventDefault();
                     })
-                    .appendTo($div),
+                    .appendTo($div);
+                /*
                 deg = 0,
                 interval = setInterval(function() {
                     deg = (deg + 30) % 360;
@@ -79,6 +80,7 @@ $(function() {
                         WebkitTransform: 'rotate(' + deg + 'deg)',
                     });
                 }, 83);
+                */
         };
     }
 

build/js/ox.map.js

@@ -214,10 +214,10 @@ Ox.COUNTRIES = [
     {code: 'TW', continent: 'Asia', name: 'Taiwan', region: 'Eastern Asia', type: 'unrecognized'},
     {code: 'MD-TR', continent: 'Europe', name: 'Transnistria', region: 'Eastern Europe', type: 'unrecognized'},
     {code: 'AQ', continent: 'Antarctica', country: ['Argentina', 'Australia', 'Chile', 'France', 'New Zealand', 'Norway', 'United Kingdom'], name: 'Antarctica'},
-	{code: 'AU-AC', country: 'Australia', name: 'Ashmore and Cartier Islands', type: 'dependent'},
+	{code: 'AU-AC', continent: 'Asia', country: 'Australia', name: 'Ashmore and Cartier Islands', type: 'dependent'},
     {code: 'CX', continent: 'Asia', country: 'Australia', name: 'Christmas Island', region: 'South-Eastern Asia', type: 'dependent'},
     {code: 'CC', continent: 'Asia', country: 'Australia', name: 'Cocos Islands', region: 'South-Eastern Asia', type: 'dependent'},
-    {code: 'AU-CS', country: 'Australia', name: 'Coral Sea Islands', type: 'dependent'},
+    {code: 'AU-CS', continent: 'Oceania', country: 'Australia', name: 'Coral Sea Islands', type: 'dependent'},
     {code: 'HM', continent: 'Antarctica', country: 'Australia', name: 'Heard Island and McDonald Islands', type: 'dependent'},
     {code: 'NF', continent: 'Oceania', country: 'Australia', name: 'Norfolk Island', region: 'Australia and New Zealand', type: 'dependent'},
     {code: 'HK', continent: 'Asia', country: 'China', name: 'Hong Kong', region: 'Eastern Asia', type: 'dependent'},

build/js/ox.ui.js

@@ -14,19 +14,49 @@ requires
 
 (function() {
 
+    Ox.UI = (function() {
+        $(function() {
+            Ox.extend(Ox.UI, {
+                $body: $('body'),
+                $document: $(document),
+                $window: $(window)
+            });
+            Ox.theme(Ox.UI.DEFAULT_THEME);
+        });
+        return {
+            $elements: {},
+            DEFAULT_THEME: 'classic',
+            DIMENSIONS: {
+                horizontal: ['width', 'height'],
+                vertical: ['height', 'width']
+            },
+            EDGES: {
+                horizontal: ['left', 'right', 'top', 'bottom'],
+                vertical: ['top', 'bottom', 'left', 'right']
+            },
+            getImagePath: function(filename) {
+                return Ox.UI.PATH + filename.split('.').pop() +
+                    '/ox.ui.' + Ox.UI.theme() + '/' + filename;
+            },
+            PATH: $('script[src*="ox.ui.js"]')
+                .attr('src').replace('js/ox.ui.js', ''),
+            SCROLLBAR_SIZE: $.browser.mozilla ? 16 : 12,
+            theme: function() {
+                var theme;
+                Ox.forEach(Ox.UI.$body.attr('class').split(' '), function(v) {
+                    if (Ox.startsWith(v, 'OxTheme')) {
+                        theme = v.replace('OxTheme', '').toLowerCase();
+                        return false;
+                    }
+                });
+                return theme || Ox.UI.DEFAULT_THEME; // fixme: shouldn't be neccessary
+            },
+        };
+    })();
+
     // fixme: move into Ox.UI
     var oxui = {
-            defaultTheme: 'classic',
             elements: {},
-            getDimensions: function(orientation) {
-                return orientation == 'horizontal' ?
-                    ['width', 'height'] : ['height', 'width'];
-            },
-            getEdges: function(orientation) {
-                return orientation == 'horizontal' ?
-                    ['left', 'right', 'top', 'bottom'] :
-                    ['top', 'bottom', 'left', 'right'];
-            },
             getBarSize: function(size) {
                 var sizes = {
                     small: 20,
@@ -35,8 +65,6 @@ requires
                 };
                 return sizes[size];
             },
-            path: $('script[src*="ox.ui.js"]').attr('src').replace('js/ox.ui.js', ''),
-            scrollbarSize: $.browser.mozilla ? 16 : 12,
             symbols: {
                 alt: '\u2325',
                 apple: '\uF8FF',
@@ -91,18 +119,7 @@ requires
                 warning: '\u26A0',
                 white_star: '\u2606'
             }
-        },
+        };
-        $elements = {},
-        $window, $document, $body;
-
-    _$elements = $elements;
-
-    $(function() {
-        $window = $(window);
-        $document = $(document);
-        $body = $('body');
-        Ox.theme(oxui.defaultTheme);
-    });
 
     /*
     ============================================================================
@@ -186,12 +203,16 @@ requires
 
             function loadImages(callback) {
                 window.OxImageCache = [];
-                $.getJSON(oxui.path + 'json/ox.ui.images.json', function(data) {
+                $.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 = oxui.path + src;
+                        image.src = Ox.UI.PATH + src;
                         image.onload = function() {
                             (++counter == length) && callback();
                         }
@@ -263,8 +284,8 @@ requires
                     loadImages(launchCallback);
                     function launchCallback() {
                         ++counter == 2 && $(function() {
-                            var $div = $body.find('div');
+                            var $div = Ox.UI.$body.find('div');
-                            $body.find('img').remove();
+                            Ox.UI.$body.find('img').remove();
                             $div.animate({
                                 opacity: 0
                             }, 1000, function() {
@@ -334,7 +355,7 @@ requires
                             stack.splice(stack.length - 2, 0, stack.pop());
                     //$elements[id].removeClass('OxFocus');
                     $('.OxFocus').removeClass('OxFocus'); // fixme: the above is better, and should work
-                    stack.length && $elements[stack[stack.length - 1]].addClass('OxFocus');
+                    stack.length && Ox.UI.$elements[stack[stack.length - 1]].addClass('OxFocus');
                     Ox.print('blur', id, stack);
                 }
             },
@@ -344,7 +365,7 @@ requires
                     index > -1 && stack.splice(index, 1);
                     stack.push(id);
                     $('.OxFocus').removeClass('OxFocus'); // fixme: see above
-                    $elements[id].addClass('OxFocus');
+                    Ox.UI.$elements[id].addClass('OxFocus');
                     Ox.print('focus', id, stack);
                 }
             },
@@ -494,8 +515,8 @@ requires
             // if the cursor is at the start/end of an input element
             // on linux, it doesn't seem to fire if the input element has focus
             if ($.browser.mozilla) {
-                $document.keypress(keypress);
+                Ox.UI.$document.keypress(keypress);
-                $document.keydown(function(event) {
+                Ox.UI.$document.keydown(function(event) {
                     var $element = $('input:focus');
                     if ($element.length) {
                         if (
@@ -513,7 +534,7 @@ requires
                     }
                 });
             } else {
-                $document.keydown(keypress);
+                Ox.UI.$document.keydown(keypress);
             }
         });
 
@@ -540,8 +561,8 @@ requires
                 buffer += key == 'SPACE' ? ' ' : key;
                 bufferTime = time;
             }
-            focused !== null && $elements[focused].triggerEvent('key_' + key);
+            focused !== null && Ox.UI.$elements[focused].triggerEvent('key_' + key);
-            if (['down', 'space', 'up'].indexOf(key) > -1 && !$elements[focused].hasClass('OxInput')) {
+            if (['down', 'space', 'up'].indexOf(key) > -1 && !Ox.UI.$elements[focused].hasClass('OxInput')) {
                 // prevent chrome from scrolling
                 return false;
             }
@@ -779,45 +800,6 @@ requires
         
     };
 
-    Ox.UI = (function() {
-        /*
-        $(function() {
-            Ox.extend(Ox.UI, {
-                $body: $('body'),
-                $document: $(document),
-                $window: $(window)
-            });
-        });
-        */
-        return {
-            getDimensions: function(orientation) {
-                return orientation == 'horizontal' ?
-                    ['width', 'height'] : ['height', 'width'];
-            },
-            getEdges: function(orientation) {
-                return orientation == 'horizontal' ?
-                    ['left', 'right', 'top', 'bottom'] :
-                    ['top', 'bottom', 'left', 'right'];
-            },
-            DIMENSIONS: {
-                horizontal: ['width', 'height'],
-                vertical: ['height', 'width']
-            },
-            EDGES: {
-                horizontal: [['left', 'right'], ['top', 'bottom']],
-                vertical: [['top', 'bottom'], ['left', 'right']]
-            },
-            PATH: $('script[src*="ox.ui.js"]')
-                .attr('src').replace('js/ox.ui.js', ''),
-            theme: function() {
-                
-            },
-            themePath: function() {
-                
-            }
-        };
-    }());
-
     /***
     Ox.URL
     ***/
@@ -873,11 +855,11 @@ requires
                     // so that we can do oxObj.jqFn().oxFn()
                     /*
                     if (fn == 'appendTo') {
-                        Ox.print('ret', ret, $element, ret.jquery && $elements[id = ret.data('ox')] == true)
+                        Ox.print('ret', ret, $element, ret.jquery && Ox.UI.$elements[id = ret.data('ox')] == true)
                     }
                     */
-                    return ret.jquery && $elements[id = ret.data('ox')] ?
+                    return ret.jquery && Ox.UI.$elements[id = ret.data('ox')] ?
-                            $elements[id] : ret;
+                            Ox.UI.$elements[id] : ret;
                 };
             });
             return that;
@@ -919,7 +901,7 @@ requires
                 },
                 mousedown: mousedown
             });
-            $elements[that.id] = that;
+            Ox.UI.$elements[that.id] = that;
 
             $.extend(that, Ox.jQueryElement(that));
 
@@ -958,11 +940,11 @@ requires
                             mouseInterval = setInterval(function() {
                                 that.triggerEvent('mouserepeat');
                             }, 50);
-                            $window.unbind('mouseup', mouseup)
+                            Ox.UI.$window.unbind('mouseup', mouseup)
                                 .mousemove(mousemove)
                                 .one('mouseup', function(e) {
                                     clearInterval(mouseInterval);
-                                    $window.unbind('mousemove', mousemove);
+                                    Ox.UI.$window.unbind('mousemove', mousemove);
                                     that.triggerEvent('dragend', e);
                                 });
                             that.one('mouseleave', function() {
@@ -976,7 +958,7 @@ requires
                     self.mouseTimeout = 0;
                     that.triggerEvent('doubleclick');
                 }
-                $window.one('mouseup', mouseup);
+                Ox.UI.$window.one('mouseup', mouseup);
                 function mousemove(e) {
                     that.triggerEvent('drag', e);
                 }
@@ -1099,7 +1081,7 @@ requires
                 that.loseFocus();
                 delete self.$eventHandler;
                 that.$element.remove();
-                delete $elements[that.ox];
+                delete Ox.UI.$elements[that.ox];
                 return that;
             };
 
@@ -1219,20 +1201,20 @@ requires
     */
     Ox.theme = function() {
         var length = arguments.length,
-            classes = $body.attr('class').split(' '),
+            classes = Ox.UI.$body.attr('class').split(' '),
             arg, theme;
         $.each(classes, function(i, v) {
             if (Ox.startsWith(v, 'OxTheme')) {
                 theme = v.replace('OxTheme', '').toLowerCase();
                 if (length == 1) {
-                    $body.removeClass(v);
+                    Ox.UI.$body.removeClass(v);
                 }
                 return false;
             }
         });
         if (length == 1) {
             arg = arguments[0]
-            $body.addClass('OxTheme' + Ox.toTitleCase(arg));
+            Ox.UI.$body.addClass('OxTheme' + Ox.toTitleCase(arg));
             if (theme) {
                 $('img').each(function() {
                     var $this = $(this);
@@ -1281,7 +1263,7 @@ requires
                 })
                 .options(options || {})
                 .addClass('OxBar Ox' + Ox.toTitleCase(self.options.orientation)),
-            dimensions = oxui.getDimensions(self.options.orientation);
+            dimensions = Ox.UI.DIMENSIONS[self.options.orientation];
         self.options.size = Ox.isString(self.options.size) ?
                 oxui.getBarSize(self.options.size) : self.options.size;
         that.css(dimensions[0], '100%')
@@ -1331,8 +1313,8 @@ requires
 
         $.extend(self, {
             clientXY: self.options.orientation == 'horizontal' ? 'clientY' : 'clientX',
-            dimensions: oxui.getDimensions(self.options.orientation), // fixme: should orientation be the opposite orientation here?
+            dimensions: Ox.UI.DIMENSIONS[self.options.orientation], // fixme: should orientation be the opposite orientation here?
-            edges: oxui.getEdges(self.options.orientation),
+            edges: Ox.UI.EDGES[self.options.orientation],
             leftOrTop: self.options.edge == 'left' || self.options.edge == 'top'
         });
 
@@ -1569,7 +1551,7 @@ requires
             .mouseup(mouseupLayer);
 
         function center() {
-            var documentHeight = $document.height();
+            var documentHeight = Ox.UI.$document.height();
             that.css({
                 left: 0,
                 top: Math.max(parseInt(-documentHeight / 10), self.options.height - documentHeight + 40) + 'px',
@@ -1581,8 +1563,8 @@ requires
 
         function dragstart(event, e) {
             self.drag = {
-                bodyWidth: $body.width(),
+                bodyWidth: Ox.UI.$body.width(),
-                bodyHeight: $document.height(),
+                bodyHeight: Ox.UI.$document.height(),
                 elementWidth: that.width(),
                 offset: that.offset(),
                 x: e.clientX,
@@ -1612,8 +1594,8 @@ requires
 
         function dragstartResize(event, e) {
             self.drag = {
-                documentWidth: $document.width(),
+                documentWidth: Ox.UI.$document.width(),
-                documentHeight: $document.height(),
+                documentHeight: Ox.UI.$document.height(),
                 elementWidth: that.width(),
                 elementHeight: that.height(),
                 offset: that.offset(),
@@ -1812,7 +1794,7 @@ requires
                 that.remove();
                 callback();
             });
-            $window.unbind('mouseup', mouseupLayer)
+            Ox.UI.$window.unbind('mouseup', mouseupLayer)
             return that;
         };
 
@@ -1848,17 +1830,17 @@ requires
 
         that.open = function() {
             //Ox.print('before open')
-            that.$layer.appendTo($body);
+            that.$layer.appendTo(Ox.UI.$body);
             that.css({
                 opacity: 0
-            }).appendTo($body).animate({
+            }).appendTo(Ox.UI.$body).animate({
                 opacity: 1
             }, 200);
             center();
             reset();
             // fixme: the following line prevents preview-style dialog
             that.gainFocus();
-            $window.bind('mouseup', mouseupLayer)
+            Ox.UI.$window.bind('mouseup', mouseupLayer)
             //Ox.print('after open')
             return that;
         };
@@ -2559,8 +2541,9 @@ requires
             self.title = title;
             if (self.options.type == 'image') {
                 that.attr({
-                    src: oxui.path + 'png/ox.ui.' + Ox.theme() +
+                    src: Ox.UI.getImagePath(
-                        '/symbol' + Ox.toTitleCase(title) + '.png'
+                        'symbol' + title[0].toUpperCase() + title.substr(1) + '.svg'
+                    )
                 });
             } else {
                 that.val(title);
@@ -3009,7 +2992,7 @@ requires
             self.arrows[0] = [
                 new Ox.Button({
                         overlap: 'right',
-                        title: 'previous',
+                        title: 'left',
                         type: 'image'
                     })
                     .css({
@@ -3021,7 +3004,7 @@ requires
                     .appendTo(that),
                 new Ox.Button({
                         overlap: 'left',
-                        title: 'next',
+                        title: 'right',
                         type: 'image'
                     })
                     .css({
@@ -3043,7 +3026,7 @@ requires
         if (self.options.clear) {
             self.$button = new Ox.Button({
                     overlap: 'left',
-                    title: 'clear',
+                    title: 'close',
                     type: 'image'
                 })
                 .css({
@@ -3378,8 +3361,8 @@ requires
             self.options.placeholder && setPlaceholder();
             self.options.validate && validate();
             if (self.bindKeyboard) {
-                $document.unbind('keydown', keypress);
+                Ox.UI.$document.unbind('keydown', keypress);
-                $document.unbind('keypress', keypress);
+                Ox.UI.$document.unbind('keypress', keypress);
             }
             that.triggerEvent('blur', {});
         }
@@ -3462,8 +3445,8 @@ requires
             if (self.bindKeyboard) {
                 //Ox.print('binding...')
                 // fixme: different in webkit and firefox (?), see keyboard handler, need generic function
-                $document.keydown(keypress);
+                Ox.UI.$document.keydown(keypress);
-                $document.keypress(keypress);
+                Ox.UI.$document.keypress(keypress);
                 self.options.autocompleteSelect && setTimeout(autocomplete, 0); // fixme: why is the timeout needed?
             }
         }
@@ -4457,7 +4440,7 @@ requires
                 .defaults({
                     arrows: false,
                     arrowStep: 1,
-                    arrowSymbols: ['previous', 'next'],
+                    arrowSymbols: ['left', 'right'],
                     max: 100,
                     min: 0,
                     orientation: 'horizontal',
@@ -4993,13 +4976,13 @@ requires
                     MozBorderRadius: '8px 8px 0 0',
                     WebkitBorderRadius: '8px 8px 0 0'
                 });
-            self.$layer.appendTo($body);
+            self.$layer.appendTo(Ox.UI.$body);
             self.$menu
                 .css({
                     left: left + 'px',
                     top: top + 'px'
                 })
-                .appendTo($body);
+                .appendTo(Ox.UI.$body);
             that.triggerEvent('show');
         };
 
@@ -5481,8 +5464,8 @@ requires
         if (self.options.clear) {
             that.$clear = new Ox.Button({
                     overlap: 'left',
-                    type: 'image',
+                    title: 'close',
-                    value: 'clear'
+                    type: 'image'
                 })
                 .css({
                     float: 'right'
@@ -5932,8 +5915,8 @@ requires
                 }
             }
             if (self.bindKeyboard) {
-                $document.unbind('keydown', keypress);
+                Ox.UI.$document.unbind('keydown', keypress);
-                $document.unbind('keypress', keypress);
+                Ox.UI.$document.unbind('keypress', keypress);
             }
         }
 
@@ -5982,8 +5965,8 @@ requires
             }
             if (self.bindKeyboard) {
                 // fixme: different in webkit and firefox (?), see keyboard handler, need generic function
-                $document.keydown(keypress);
+                Ox.UI.$document.keydown(keypress);
-                $document.keypress(keypress);
+                Ox.UI.$document.keypress(keypress);
                 //Ox.print('calling autosuggest...')
                 self.options.autosuggest && setTimeout(autosuggestCall, 0); // fixme: why is the timeout needed?
             }
@@ -6039,7 +6022,7 @@ requires
                     animate: false,
                     arrows: false,
                     arrowStep: 1,
-                    arrowSymbols: ['previous', 'next'],
+                    arrowSymbols: ['left', 'right'],
                     max: 100,
                     min: 0,
                     orientation: 'horizontal',
@@ -6152,11 +6135,11 @@ requires
                 return getVal(e.clientX - left - offset);
             }
             setValue(val(e), 200);
-            $window.mousemove(function(e) {
+            Ox.UI.$window.mousemove(function(e) {
                 setValue(val(e));
             });
-            $window.one('mouseup', function() {
+            Ox.UI.$window.one('mouseup', function() {
-                $window.unbind('mousemove');
+                Ox.UI.$window.unbind('mousemove');
             });
         }
         function getPx(val) {
@@ -6400,7 +6383,7 @@ requires
             height: self.options.size * 1.5,
             lineLength: self.options.size == 64 ? 15 : 23,
             lines: self.options.size == 64 ? 4 : 5,
-            url: oxui.path + '/png/ox.ui/transparent.png',
+            url: Ox.UI.PATH + '/png/ox.ui/transparent.png',
             width: self.options.size
         });
         self.title = formatText(self.options.title, self.lines - 1, self.lineLength);
@@ -6675,7 +6658,7 @@ requires
             updateQuery(self.options.selected);
         }
         that.bindEvent(self.keyboardEvents);
-        $window.resize(that.size); // fixme: this is not the widget's job
+        Ox.UI.$window.resize(that.size); // fixme: this is not the widget's job
 
         function addAboveToSelection() {
             var pos = getAbove();
@@ -6885,7 +6868,7 @@ requires
             //Ox.print('dragItem', e);
             //Ox.print(e.offsetY, offsets)
             $item.addClass('OxDrag');
-            $window.mousemove(function(e) {
+            Ox.UI.$window.mousemove(function(e) {
                 var clientY = e.clientY - that.offset()['top'],
                     offset = clientY % 16,
                     position = Ox.limit(parseInt(clientY / 16), 0, self.$items.length - 1);
@@ -6899,9 +6882,9 @@ requires
                     pos = stopPos;
                 }
             });
-            $window.one('mouseup', function() {
+            Ox.UI.$window.one('mouseup', function() {
                 dropItem(id, pos);
-                $window.unbind('mousemove');
+                Ox.UI.$window.unbind('mousemove');
             });
         }
 
@@ -6998,7 +6981,7 @@ requires
         }
 
         function getHeight() {
-            return that.height() - (that.$content.width() > that.width() ? oxui.scrollbarSize : 0);
+            return that.height() - (that.$content.width() > that.width() ? Ox.UI.SCROLLBAR_SIZE : 0);
         }
 
         function getListSize() {
@@ -7139,7 +7122,7 @@ requires
         }
 
         function getWidth() {
-            return that.width() - (that.$content.height() > that.height() ? oxui.scrollbarSize : 0);
+            return that.width() - (that.$content.height() > that.height() ? Ox.UI.SCROLLBAR_SIZE : 0);
         }
 
         function invertSelection() {
@@ -7354,7 +7337,7 @@ requires
                                 self.dragTimeout = 0;
                             }
                         }, 250);
-                        $window.one('mouseup', function(e) {
+                        Ox.UI.$window.one('mouseup', function(e) {
                             if (self.dragTimeout) {
                                 clearTimeout(self.dragTimeout);
                                 self.dragTimeout = 0;
@@ -8148,7 +8131,7 @@ requires
             that.$head = new Ox.Container()
                 .addClass('OxHead')
                 .css({
-                    right: self.options.scrollbarVisible ? oxui.scrollbarSize + 'px' : 0
+                    right: self.options.scrollbarVisible ? Ox.UI.SCROLLBAR_SIZE + 'px' : 0
                 })
                 .appendTo(that.$bar);
             that.$head.$content.addClass('OxTitles');
@@ -8507,7 +8490,7 @@ requires
             return Math.max(
                 Ox.sum(self.columnWidths),
                 that.$element.width() -
-                (self.options.scrollbarVisible ? oxui.scrollbarSize : 0)
+                (self.options.scrollbarVisible ? Ox.UI.SCROLLBAR_SIZE : 0)
             );
             //return Ox.sum(self.columnWidths)
         }
@@ -8849,8 +8832,9 @@ requires
                         $('<img>')
                             .addClass('OxToggle')
                             .attr({
-                                src: oxui.path + '/png/ox.ui.' + Ox.theme() + '/symbol' +
+                                src: Ox.UI.getImagePath(
-                                    (data.expanded ? 'Collapse' : 'Expand') + '.png'
+                                    'symbol' + (data.expanded ? 'Collapse' : 'Expand') + '.svg'
+                                )
                             })
                     )
                     .appendTo($item);
@@ -8937,8 +8921,9 @@ requires
                 }
             })
             $img.attr({
-                src: oxui.path + '/png/ox.ui.' + Ox.theme() + '/symbol' +
+                src: Ox.UI.getImagePath(
-                    (item.expanded ? 'Collapse' : 'Expand') + '.png'
+                    'symbol' + (item.expanded ? 'Down' : 'Right') + '.svg'
+                )
             });
             item.expanded ?
                 that.$element.addItems(pos + 1, parseItems(item.items, item.level + 1)) :
@@ -9019,7 +9004,7 @@ requires
                     return $('<img>')
                         .attr({
                             // fixme: not the right place to do these
-                            src: '/static/oxjs/build/svg/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg')
+                            src: Ox.UI.PATH + 'svg/ox.map/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg')
                         })
                         .load(function() {
                             $(this).css({
@@ -9513,7 +9498,7 @@ requires
                     top: '24px'
                 }),
             'east': new Ox.Button({
-                    title: 'next',
+                    title: 'right',
                     type: 'image'
                 })
                 .addClass('OxMapButton')
@@ -9522,7 +9507,7 @@ requires
                     top: '24px',
                 }),
             'north': new Ox.Button({
-                    title: 'above',
+                    title: 'up',
                     type: 'image'
                 })
                 .addClass('OxMapButton')
@@ -9531,7 +9516,7 @@ requires
                     top: '4px',
                 }),
             'south': new Ox.Button({
-                    title: 'below',
+                    title: 'down',
                     type: 'image'
                 })
                 .addClass('OxMapButton')
@@ -9540,7 +9525,7 @@ requires
                     top: '44px',
                 }),
             'west': new Ox.Button({
-                    title: 'previous',
+                    title: 'left',
                     type: 'image'
                 })
                 .addClass('OxMapButton')
@@ -10470,7 +10455,7 @@ requires
                 cursor: that.place.editing ? 'move' : 'pointer',
                 draggable: that.place.editing,
                 icon: new google.maps.MarkerImage(
-                    oxui.path + 'png/ox.ui/mapMarker' +
+                    Ox.UI.PATH + 'png/ox.map/marker' +
                         (that.place.id[0] == '_' ? 'Result' : '') +
                         (that.place.editing ? 'Editing' : (
                             that.place.selected ? 'Selected' : ''
@@ -10630,7 +10615,7 @@ requires
             cursor: that.position + '-resize',
             draggable: true,
             icon: new google.maps.MarkerImage(
-                oxui.path + 'png/ox.ui/mapMarkerResize.png',
+                Ox.UI.PATH + 'png/ox.ui/markerResize.png',
                 new google.maps.Size(16, 16),
                 new google.maps.Point(0, 0),
                 new google.maps.Point(8, 8)
@@ -10753,7 +10738,7 @@ requires
             });
             $.each(self.markers, function(k, markers) {
                 if (markers.length) {
-                    self.src += '&markers=icon:' + 'http://dev.pan.do:8000' + oxui.path + 'png/ox.ui/marker' +
+                    self.src += '&markers=icon:' + 'http://dev.pan.do:8000' + Ox.UI.PATH + 'png/ox.map/marker' +
                             Ox.toTitleCase(self.options['markerColor' + Ox.toTitleCase(k)]) + '.png|' +
                             markers.join('|')
                 }
@@ -11602,9 +11587,9 @@ requires
                 return;
             }
             if (!self.options.parent && !that.$layer.parent().length) {
-                that.$layer.appendTo($body);
+                that.$layer.appendTo(Ox.UI.$body);
             }
-            that.parent().length == 0 && that.appendTo($body);
+            that.parent().length == 0 && that.appendTo(Ox.UI.$body);
             that.css({
                 left: '-1000px',
                 top: '-1000px',
@@ -11614,15 +11599,15 @@ requires
                 height = self.options.element.outerHeight(),
                 left = Ox.limit(
                     offset.left + self.options.offset.left + (self.options.side == 'bottom' ? 0 : width),
-                    0, $window.width() - that.width()
+                    0, Ox.UI.$window.width() - that.width()
                 ),
                 top = offset.top + self.options.offset.top + (self.options.side == 'bottom' ? height : 0),
                 menuHeight = that.$content.outerHeight(); // fixme: why is outerHeight 0 when hidden?
-                menuMaxHeight = Math.floor($window.height() - top - 16);
+                menuMaxHeight = Math.floor(Ox.UI.$window.height() - top - 16);
             if (self.options.parent) {
                 if (menuHeight > menuMaxHeight) {
                     top = Ox.limit(top - menuHeight + menuMaxHeight, self.options.parent.offset().top, top);
-                    menuMaxHeight = Math.floor($window.height() - top - 16);
+                    menuMaxHeight = Math.floor(Ox.UI.$window.height() - top - 16);
                 }
             }
             that.css({
@@ -11790,8 +11775,8 @@ requires
                 .addClass('OxCollapsePanel'),
             // fixme: the following should all be self.foo
             title = self.options.collapsed ?
-                [{id: 'expand', title: 'expand'}, {id: 'collapse', title: 'collapse'}] :
+                [{id: 'expand', title: 'right'}, {id: 'collapse', title: 'down'}] :
-                [{id: 'collapse', title: 'collapse'}, {id: 'expand', title: 'expand'}],
+                [{id: 'collapse', title: 'down'}, {id: 'expand', title: 'right'}],
             $titlebar = new Ox.Bar({
                     orientation: 'horizontal',
                     size: self.options.size,
@@ -12085,8 +12070,8 @@ requires
                 .addClass('OxSplitPanel');
 
         $.extend(self, {
-            dimensions: oxui.getDimensions(self.options.orientation),
+            dimensions: Ox.UI.DIMENSIONS[self.options.orientation],
-            edges: oxui.getEdges(self.options.orientation),
+            edges: Ox.UI.EDGES[self.options.orientation],
             length: self.options.elements.length,
             resizebarElements: [],
             $resizebars: []
@@ -12313,8 +12298,6 @@ requires
     ============================================================================
     */
 
-    /**
-    */
     Ox.LoadingIcon = function(options, self) {
         var self = self || {},
             that = new Ox.Element('img', self)
@@ -12323,45 +12306,21 @@ requires
                 })
                 .options(options || {})
                 .attr({
-                    src: oxui.path + '/png/ox.ui.' + Ox.theme() + '/loading.png' // fixme: oxui.themePath needed?
+                    src: Ox.UI.getImagePath('symbolLoading.svg')
                 })
                 .addClass(
                     'OxLoadingIcon Ox' + Ox.toTitleCase(self.options.size)
                 );
-        self.deg = 0;
-        self.interval = 0;
-        self.isRunning = false;
-        function clear() {
-            clearInterval(self.interval);
-            self.deg = 0;
-            self.interval = 0;
-            update();
-        }
-        function update() {
-            that.css({
-                MozTransform: 'rotate(' + self.deg + 'deg)',
-                WebkitTransform: 'rotate(' + self.deg + 'deg)'
-            });
-        }
         that.start = function() {
-            self.isRunning = true;
-            clear();
             that.animate({
                 opacity: 1
             }, 250);
-            self.interval = setInterval(function() {
-                self.deg = (self.deg + 30) % 360;
-                update();
-            }, 83);
             return that;
         };
         that.stop = function() {
             that.animate({
                 opacity: 0
-            }, 250, function() {
+            }, 250);
-                self.isRunning && clear();
-                self.isRunning = false;
-            });
             return that;
         }
         return that;
@@ -12550,7 +12509,7 @@ requires
             self.$markerPosition = $('<img>')
                 .addClass('OxMarkerPosition')
                 .attr({
-                    src: '/static/oxjs/build/png/ox.ui/videoMarkerPlay.png'
+                    src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png'
                 })
                 .css({
                     position: 'absolute',
@@ -12567,7 +12526,7 @@ requires
                 self.$markerPoint[i] = $('<img>')
                     .addClass('OxMarkerPoint' + titleCase)
                     .attr({
-                        src: '/static/oxjs/build/png/ox.ui/videoMarker' + titleCase + '.png'
+                        src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png'
                     })
                     .appendTo(that.$element);
                 setMarkerPoint(i);
@@ -13016,7 +12975,7 @@ requires
             self.$cuts[i] = $('<img>')
                 .addClass('OxCut')
                 .attr({
-                    src: '/static/oxjs/build/png/ox.ui/videoMarkerCut.png'
+                    src: Ox.UI.PATH + 'png/ox.ui/videoMarkerCut.png'
                 })
                 .css({
                     left: (v * self.fps) + 'px'
@@ -13027,7 +12986,7 @@ requires
         self.$markerPosition = $('<img>')
             .addClass('OxMarkerPosition')
             .attr({
-                src: '/static/oxjs/build/png/ox.ui/videoMarkerPlay.png'
+                src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png'
             })
             .appendTo(that.$element);
         setMarker();
@@ -13036,7 +12995,7 @@ requires
             self.$markerPoint[i] = $('<img>')
                 .addClass('OxMarkerPoint' + v)
                 .attr({
-                    src: '/static/oxjs/build/png/ox.ui/videoMarker' + v + '.png'
+                    src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + v + '.png'
                 })
                 .appendTo(self.$timeline);
             setMarkerPoint(i);
@@ -13217,7 +13176,7 @@ requires
         self.$markerPosition = $('<img>')
             .addClass('OxMarkerPosition')
             .attr({
-                src: '/static/oxjs/build/png/ox.ui/videoMarkerPlay.png'
+                src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png'
             })
             .css({
                 position: 'absolute',
@@ -13234,7 +13193,7 @@ requires
             self.$markerPoint[i] = $('<img>')
                 .addClass('OxMarkerPoint' + titleCase)
                 .attr({
-                    src: '/static/oxjs/build/png/ox.ui/videoMarker' + titleCase + '.png'
+                    src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png'
                 })
                 .appendTo(that.$element);
             setMarkerPoint(i);
@@ -13698,7 +13657,7 @@ requires
 
         function getSizes(scrollbarIsVisible) {
             //Ox.print('getSizes', scrollbarIsVisible)
-            var scrollbarWidth = oxui.scrollbarSize,
+            var scrollbarWidth = Ox.UI.SCROLLBAR_SIZE,
 				contentWidth = self.options.width - 
 				    (self.options.showAnnotations * self.options.annotationsSize) - 1 -
 				    (scrollbarIsVisible ? scrollbarWidth : 0),
@@ -14034,7 +13993,7 @@ requires
                 self.$markerPoint[point][edge] = $('<img>')
                     .addClass('OxMarkerPoint OxMarker' + titleCase)
                     .attr({
-                        src: '/static/oxjs/build/png/ox.ui/videoMarker' + titleCase + '.png' // fixme: remove static path
+                        src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png'
                     })
                     .hide()
                     .appendTo(that.$element);
@@ -14968,11 +14927,11 @@ requires
         that.show = function(x, y) {
             var left, top, width, height;
             $('.OxTooltip').remove(); // fixme: don't use dom
-            that.appendTo($body);
+            that.appendTo(Ox.UI.$body);
             width = that.width();
             height = that.height();
-            left = Ox.limit(x - width / 2, 0, $document.width() - width);
+            left = Ox.limit(x - width / 2, 0, Ox.UI.$document.width() - width);
-            top = y > $document.height() - height - 16 ? y - 32 : y + 16;
+            top = y > Ox.UI.$document.height() - height - 16 ? y - 32 : y + 16;
             that.css({
                     left: left + 'px',
                     top: top + 'px'

build/json/ox.ui.images.json

@@ -1,4 +1,11 @@
 [
+    "png/ox.map/marker.png", 
+    "png/ox.map/markerEditing.png", 
+    "png/ox.map/markerResize.png", 
+    "png/ox.map/markerResult.png", 
+    "png/ox.map/markerResultEditing.png", 
+    "png/ox.map/markerResultSelected.png", 
+    "png/ox.map/markerSelected.png", 
     "png/ox.ui/browserChrome128.png", 
     "png/ox.ui/browserFirefox128.png", 
     "png/ox.ui/browserInternetExplorer128.png", 
@@ -14,112 +21,422 @@
     "png/ox.ui/videoMarkerOutBottom.png", 
     "png/ox.ui/videoMarkerOutTop.png", 
     "png/ox.ui/videoMarkerPlay.png", 
-    "png/ox.ui.classic/loading.png", 
     "png/ox.ui.classic/scrollbarHorizontalDecrement.png", 
     "png/ox.ui.classic/scrollbarHorizontalIncrement.png", 
     "png/ox.ui.classic/scrollbarVerticalDecrement.png", 
     "png/ox.ui.classic/scrollbarVerticalIncrement.png", 
-    "png/ox.ui.classic/symbolAbove.png", 
-    "png/ox.ui.classic/symbolAdd.png", 
-    "png/ox.ui.classic/symbolBelow.png", 
-    "png/ox.ui.classic/symbolCheck.png", 
-    "png/ox.ui.classic/symbolClear.png", 
-    "png/ox.ui.classic/symbolClick.png", 
-    "png/ox.ui.classic/symbolClose.png", 
-    "png/ox.ui.classic/symbolCollapse.png", 
-    "png/ox.ui.classic/symbolDate.png", 
-    "png/ox.ui.classic/symbolEdit.png", 
-    "png/ox.ui.classic/symbolExpand.png", 
-    "png/ox.ui.classic/symbolFill.png", 
-    "png/ox.ui.classic/symbolFind.png", 
-    "png/ox.ui.classic/symbolFit.png", 
-    "png/ox.ui.classic/symbolGoToIn.png", 
-    "png/ox.ui.classic/symbolGoToOut.png", 
-    "png/ox.ui.classic/symbolGrow.png", 
-    "png/ox.ui.classic/symbolHelp.png", 
-    "png/ox.ui.classic/symbolIcon.png", 
-    "png/ox.ui.classic/symbolInfo.png", 
-    "png/ox.ui.classic/symbolList.png", 
-    "png/ox.ui.classic/symbolLocation.png", 
-    "png/ox.ui.classic/symbolLock.png", 
-    "png/ox.ui.classic/symbolMore.png", 
-    "png/ox.ui.classic/symbolMute.png", 
-    "png/ox.ui.classic/symbolNext.png", 
-    "png/ox.ui.classic/symbolNone.png", 
-    "png/ox.ui.classic/symbolPause.png", 
-    "png/ox.ui.classic/symbolPlay.png", 
-    "png/ox.ui.classic/symbolPlayInToOut.png", 
-    "png/ox.ui.classic/symbolPrevious.png", 
-    "png/ox.ui.classic/symbolPublish.png", 
-    "png/ox.ui.classic/symbolRemove.png", 
-    "png/ox.ui.classic/symbolSelect.png", 
-    "png/ox.ui.classic/symbolSet.png", 
-    "png/ox.ui.classic/symbolSetIn.png", 
-    "png/ox.ui.classic/symbolSetOut.png", 
-    "png/ox.ui.classic/symbolShrink.png", 
-    "png/ox.ui.classic/symbolSpin.png", 
-    "png/ox.ui.classic/symbolStar.png", 
-    "png/ox.ui.classic/symbolTime.png", 
-    "png/ox.ui.classic/symbolUnlock.png", 
-    "png/ox.ui.classic/symbolUnmute.png", 
-    "png/ox.ui.classic/symbolUser.png", 
-    "png/ox.ui.classic/symbolVolume.png", 
-    "png/ox.ui.classic/symbolWarning.png", 
-    "png/ox.ui.future/buttonAdd.png", 
-    "png/ox.ui.future/buttonClose.png", 
-    "png/ox.ui.future/buttonPause.png", 
-    "png/ox.ui.future/buttonPlay.png", 
-    "png/ox.ui.future/buttonRemove.png", 
-    "png/ox.ui.modern/buttonClear.png", 
-    "png/ox.ui.modern/icon.png", 
-    "png/ox.ui.modern/iconFind.png", 
-    "png/ox.ui.modern/loading.png", 
     "png/ox.ui.modern/scrollbarHorizontalDecrement.png", 
     "png/ox.ui.modern/scrollbarHorizontalIncrement.png", 
     "png/ox.ui.modern/scrollbarVerticalDecrement.png", 
     "png/ox.ui.modern/scrollbarVerticalIncrement.png", 
-    "png/ox.ui.modern/symbolAbove.png", 
+    "svg/ox.map/AC.svg", 
-    "png/ox.ui.modern/symbolAdd.png", 
+    "svg/ox.map/AD.svg", 
-    "png/ox.ui.modern/symbolBelow.png", 
+    "svg/ox.map/AE.svg", 
-    "png/ox.ui.modern/symbolCheck.png", 
+    "svg/ox.map/AF.svg", 
-    "png/ox.ui.modern/symbolClear.png", 
+    "svg/ox.map/AG.svg", 
-    "png/ox.ui.modern/symbolClick.png", 
+    "svg/ox.map/AI.svg", 
-    "png/ox.ui.modern/symbolClose.png", 
+    "svg/ox.map/AIDJ.svg", 
-    "png/ox.ui.modern/symbolCollapse.png", 
+    "svg/ox.map/AL.svg", 
-    "png/ox.ui.modern/symbolDate.png", 
+    "svg/ox.map/AM.svg", 
-    "png/ox.ui.modern/symbolEdit.png", 
+    "svg/ox.map/ANHH.svg", 
-    "png/ox.ui.modern/symbolExpand.png", 
+    "svg/ox.map/AO.svg", 
-    "png/ox.ui.modern/symbolFill.png", 
+    "svg/ox.map/AQ.svg", 
-    "png/ox.ui.modern/symbolFind.png", 
+    "svg/ox.map/AR.svg", 
-    "png/ox.ui.modern/symbolFit.png", 
+    "svg/ox.map/AS.svg", 
-    "png/ox.ui.modern/symbolGoToIn.png", 
+    "svg/ox.map/AT.svg", 
-    "png/ox.ui.modern/symbolGoToOut.png", 
+    "svg/ox.map/AU-AC.svg", 
-    "png/ox.ui.modern/symbolGrow.png", 
+    "svg/ox.map/AU-CS.svg", 
-    "png/ox.ui.modern/symbolHelp.png", 
+    "svg/ox.map/AU.svg", 
-    "png/ox.ui.modern/symbolInfo.png", 
+    "svg/ox.map/AW.svg", 
-    "png/ox.ui.modern/symbolList.png", 
+    "svg/ox.map/AX.svg", 
-    "png/ox.ui.modern/symbolLocation.png", 
+    "svg/ox.map/AZ-NK.svg", 
-    "png/ox.ui.modern/symbolLock.png", 
+    "svg/ox.map/AZ.svg", 
-    "png/ox.ui.modern/symbolMore.png", 
+    "svg/ox.map/BA.svg", 
-    "png/ox.ui.modern/symbolMute.png", 
+    "svg/ox.map/BB.svg", 
-    "png/ox.ui.modern/symbolNext.png", 
+    "svg/ox.map/BD.svg", 
-    "png/ox.ui.modern/symbolNone.png", 
+    "svg/ox.map/BE.svg", 
-    "png/ox.ui.modern/symbolPause.png", 
+    "svg/ox.map/BF.svg", 
-    "png/ox.ui.modern/symbolPlay.png", 
+    "svg/ox.map/BG.svg", 
-    "png/ox.ui.modern/symbolPlayInToOut.png", 
+    "svg/ox.map/BH.svg", 
-    "png/ox.ui.modern/symbolPrevious.png", 
+    "svg/ox.map/BI.svg", 
-    "png/ox.ui.modern/symbolPublish.png", 
+    "svg/ox.map/BJ.svg", 
-    "png/ox.ui.modern/symbolRemove.png", 
+    "svg/ox.map/BL.svg", 
-    "png/ox.ui.modern/symbolSelect.png", 
+    "svg/ox.map/BM.svg", 
-    "png/ox.ui.modern/symbolSet.png", 
+    "svg/ox.map/BN.svg", 
-    "png/ox.ui.modern/symbolSetIn.png", 
+    "svg/ox.map/BO.svg", 
-    "png/ox.ui.modern/symbolSetOut.png", 
+    "svg/ox.map/BQ.svg", 
-    "png/ox.ui.modern/symbolShrink.png", 
+    "svg/ox.map/BQAQ.svg", 
-    "png/ox.ui.modern/symbolStar.png", 
+    "svg/ox.map/BR.svg", 
-    "png/ox.ui.modern/symbolTime.png", 
+    "svg/ox.map/BS.svg", 
-    "png/ox.ui.modern/symbolUnlock.png", 
+    "svg/ox.map/BT.svg", 
-    "png/ox.ui.modern/symbolUnmute.png", 
+    "svg/ox.map/BUMM.svg", 
-    "png/ox.ui.modern/symbolUser.png", 
+    "svg/ox.map/BV.svg", 
-    "png/ox.ui.modern/symbolVolume.png", 
+    "svg/ox.map/BW.svg", 
-    "png/ox.ui.modern/symbolWarning.png"
+    "svg/ox.map/BY.svg", 
+    "svg/ox.map/BYAA.svg", 
+    "svg/ox.map/BZ.svg", 
+    "svg/ox.map/CA.svg", 
+    "svg/ox.map/CC.svg", 
+    "svg/ox.map/CD.svg", 
+    "svg/ox.map/CF.svg", 
+    "svg/ox.map/CG.svg", 
+    "svg/ox.map/CH.svg", 
+    "svg/ox.map/CI.svg", 
+    "svg/ox.map/CK.svg", 
+    "svg/ox.map/CL.svg", 
+    "svg/ox.map/CM.svg", 
+    "svg/ox.map/CN.svg", 
+    "svg/ox.map/CO.svg", 
+    "svg/ox.map/CP.svg", 
+    "svg/ox.map/CR.svg", 
+    "svg/ox.map/CSHH.svg", 
+    "svg/ox.map/CSXX.svg", 
+    "svg/ox.map/CTKI.svg", 
+    "svg/ox.map/CU.svg", 
+    "svg/ox.map/CV.svg", 
+    "svg/ox.map/CW.svg", 
+    "svg/ox.map/CX.svg", 
+    "svg/ox.map/CY-NC.svg", 
+    "svg/ox.map/CY.svg", 
+    "svg/ox.map/CZ.svg", 
+    "svg/ox.map/DDDE.svg", 
+    "svg/ox.map/DE.svg", 
+    "svg/ox.map/DEDE.svg", 
+    "svg/ox.map/DG.svg", 
+    "svg/ox.map/DJ.svg", 
+    "svg/ox.map/DK.svg", 
+    "svg/ox.map/DM.svg", 
+    "svg/ox.map/DO.svg", 
+    "svg/ox.map/DYBJ.svg", 
+    "svg/ox.map/DZ.svg", 
+    "svg/ox.map/EA.svg", 
+    "svg/ox.map/EC.svg", 
+    "svg/ox.map/EE.svg", 
+    "svg/ox.map/EG.svg", 
+    "svg/ox.map/EH.svg", 
+    "svg/ox.map/ER.svg", 
+    "svg/ox.map/ES.svg", 
+    "svg/ox.map/ET.svg", 
+    "svg/ox.map/EU.svg", 
+    "svg/ox.map/FI.svg", 
+    "svg/ox.map/FJ.svg", 
+    "svg/ox.map/FK.svg", 
+    "svg/ox.map/FM.svg", 
+    "svg/ox.map/FO.svg", 
+    "svg/ox.map/FQHH.svg", 
+    "svg/ox.map/FR.svg", 
+    "svg/ox.map/FXFR.svg", 
+    "svg/ox.map/GA.svg", 
+    "svg/ox.map/GB-ENG.svg", 
+    "svg/ox.map/GB-NIR.svg", 
+    "svg/ox.map/GB-SCT.svg", 
+    "svg/ox.map/GB-WLS.svg", 
+    "svg/ox.map/GB.svg", 
+    "svg/ox.map/GD.svg", 
+    "svg/ox.map/GE-AB.svg", 
+    "svg/ox.map/GE-SO.svg", 
+    "svg/ox.map/GE.svg", 
+    "svg/ox.map/GEHH.svg", 
+    "svg/ox.map/GF.svg", 
+    "svg/ox.map/GG.svg", 
+    "svg/ox.map/GH.svg", 
+    "svg/ox.map/GI.svg", 
+    "svg/ox.map/GL.svg", 
+    "svg/ox.map/GM.svg", 
+    "svg/ox.map/GN.svg", 
+    "svg/ox.map/GP.svg", 
+    "svg/ox.map/GQ.svg", 
+    "svg/ox.map/GR.svg", 
+    "svg/ox.map/GS.svg", 
+    "svg/ox.map/GT.svg", 
+    "svg/ox.map/GU.svg", 
+    "svg/ox.map/GW.svg", 
+    "svg/ox.map/GY.svg", 
+    "svg/ox.map/HK.svg", 
+    "svg/ox.map/HM.svg", 
+    "svg/ox.map/HN.svg", 
+    "svg/ox.map/HR.svg", 
+    "svg/ox.map/HT.svg", 
+    "svg/ox.map/HU.svg", 
+    "svg/ox.map/HVBF.svg", 
+    "svg/ox.map/IC.svg", 
+    "svg/ox.map/ID.svg", 
+    "svg/ox.map/IE.svg", 
+    "svg/ox.map/IL.svg", 
+    "svg/ox.map/IM.svg", 
+    "svg/ox.map/IN.svg", 
+    "svg/ox.map/IO.svg", 
+    "svg/ox.map/IQ.svg", 
+    "svg/ox.map/IR.svg", 
+    "svg/ox.map/IS.svg", 
+    "svg/ox.map/IT.svg", 
+    "svg/ox.map/JE.svg", 
+    "svg/ox.map/JM.svg", 
+    "svg/ox.map/JO.svg", 
+    "svg/ox.map/JP.svg", 
+    "svg/ox.map/JTUM.svg", 
+    "svg/ox.map/KE.svg", 
+    "svg/ox.map/KG.svg", 
+    "svg/ox.map/KH.svg", 
+    "svg/ox.map/KI.svg", 
+    "svg/ox.map/KM.svg", 
+    "svg/ox.map/KN.svg", 
+    "svg/ox.map/KOHH.svg", 
+    "svg/ox.map/KP.svg", 
+    "svg/ox.map/KR.svg", 
+    "svg/ox.map/KW.svg", 
+    "svg/ox.map/KY.svg", 
+    "svg/ox.map/KZ.svg", 
+    "svg/ox.map/LA.svg", 
+    "svg/ox.map/LB.svg", 
+    "svg/ox.map/LC.svg", 
+    "svg/ox.map/LI.svg", 
+    "svg/ox.map/LK.svg", 
+    "svg/ox.map/LR.svg", 
+    "svg/ox.map/LS.svg", 
+    "svg/ox.map/LT.svg", 
+    "svg/ox.map/LU.svg", 
+    "svg/ox.map/LV.svg", 
+    "svg/ox.map/LY.svg", 
+    "svg/ox.map/MA.svg", 
+    "svg/ox.map/MC.svg", 
+    "svg/ox.map/MD-TR.svg", 
+    "svg/ox.map/MD.svg", 
+    "svg/ox.map/ME.svg", 
+    "svg/ox.map/MF.svg", 
+    "svg/ox.map/MG.svg", 
+    "svg/ox.map/MH.svg", 
+    "svg/ox.map/MIUM.svg", 
+    "svg/ox.map/MK.svg", 
+    "svg/ox.map/ML.svg", 
+    "svg/ox.map/MM.svg", 
+    "svg/ox.map/MN.svg", 
+    "svg/ox.map/MO.svg", 
+    "svg/ox.map/MP.svg", 
+    "svg/ox.map/MQ.svg", 
+    "svg/ox.map/MR.svg", 
+    "svg/ox.map/MS.svg", 
+    "svg/ox.map/MT.svg", 
+    "svg/ox.map/MU.svg", 
+    "svg/ox.map/MV.svg", 
+    "svg/ox.map/MW.svg", 
+    "svg/ox.map/MX.svg", 
+    "svg/ox.map/MY.svg", 
+    "svg/ox.map/MZ.svg", 
+    "svg/ox.map/NA.svg", 
+    "svg/ox.map/NC.svg", 
+    "svg/ox.map/NE.svg", 
+    "svg/ox.map/NF.svg", 
+    "svg/ox.map/NG.svg", 
+    "svg/ox.map/NHVU.svg", 
+    "svg/ox.map/NI.svg", 
+    "svg/ox.map/NL.svg", 
+    "svg/ox.map/NO.svg", 
+    "svg/ox.map/NP.svg", 
+    "svg/ox.map/NQAQ.svg", 
+    "svg/ox.map/NR.svg", 
+    "svg/ox.map/NTHH.svg", 
+    "svg/ox.map/NU.svg", 
+    "svg/ox.map/NZ.svg", 
+    "svg/ox.map/OM.svg", 
+    "svg/ox.map/PA.svg", 
+    "svg/ox.map/PCHH.svg", 
+    "svg/ox.map/PE.svg", 
+    "svg/ox.map/PF.svg", 
+    "svg/ox.map/PG.svg", 
+    "svg/ox.map/PH.svg", 
+    "svg/ox.map/PK.svg", 
+    "svg/ox.map/PL.svg", 
+    "svg/ox.map/PM.svg", 
+    "svg/ox.map/PN.svg", 
+    "svg/ox.map/PR.svg", 
+    "svg/ox.map/PS.svg", 
+    "svg/ox.map/PT.svg", 
+    "svg/ox.map/PUUM.svg", 
+    "svg/ox.map/PW.svg", 
+    "svg/ox.map/PY.svg", 
+    "svg/ox.map/PZPA.png", 
+    "svg/ox.map/QA.svg", 
+    "svg/ox.map/RE.png", 
+    "svg/ox.map/RHZW.svg", 
+    "svg/ox.map/RO.svg", 
+    "svg/ox.map/RS-KO.svg", 
+    "svg/ox.map/RS.svg", 
+    "svg/ox.map/RU.svg", 
+    "svg/ox.map/RW.svg", 
+    "svg/ox.map/SA.svg", 
+    "svg/ox.map/SB.svg", 
+    "svg/ox.map/SC.svg", 
+    "svg/ox.map/SD-SS.svg", 
+    "svg/ox.map/SD.svg", 
+    "svg/ox.map/SE.svg", 
+    "svg/ox.map/SG.svg", 
+    "svg/ox.map/SH.svg", 
+    "svg/ox.map/SI.svg", 
+    "svg/ox.map/SITH.svg", 
+    "svg/ox.map/SJ.svg", 
+    "svg/ox.map/SK.svg", 
+    "svg/ox.map/SKIN.svg", 
+    "svg/ox.map/SL.svg", 
+    "svg/ox.map/SM.svg", 
+    "svg/ox.map/SN.svg", 
+    "svg/ox.map/SO-SO.svg", 
+    "svg/ox.map/SO.svg", 
+    "svg/ox.map/SR.svg", 
+    "svg/ox.map/ST.svg", 
+    "svg/ox.map/SUHH.svg", 
+    "svg/ox.map/SV.svg", 
+    "svg/ox.map/SX.svg", 
+    "svg/ox.map/SY.svg", 
+    "svg/ox.map/SZ.svg", 
+    "svg/ox.map/TA.svg", 
+    "svg/ox.map/TC.svg", 
+    "svg/ox.map/TD.svg", 
+    "svg/ox.map/TF.svg", 
+    "svg/ox.map/TG.svg", 
+    "svg/ox.map/TH.svg", 
+    "svg/ox.map/TJ.svg", 
+    "svg/ox.map/TK.svg", 
+    "svg/ox.map/TL.svg", 
+    "svg/ox.map/TM.svg", 
+    "svg/ox.map/TN.svg", 
+    "svg/ox.map/TO.svg", 
+    "svg/ox.map/TPTL.svg", 
+    "svg/ox.map/TR.svg", 
+    "svg/ox.map/TT.svg", 
+    "svg/ox.map/TV.svg", 
+    "svg/ox.map/TW.svg", 
+    "svg/ox.map/TZ.svg", 
+    "svg/ox.map/UA.svg", 
+    "svg/ox.map/UG.svg", 
+    "svg/ox.map/UK.svg", 
+    "svg/ox.map/UM.svg", 
+    "svg/ox.map/US.svg", 
+    "svg/ox.map/UY.svg", 
+    "svg/ox.map/UZ.svg", 
+    "svg/ox.map/VA.svg", 
+    "svg/ox.map/VC.svg", 
+    "svg/ox.map/VDVN.svg", 
+    "svg/ox.map/VE.svg", 
+    "svg/ox.map/VG.svg", 
+    "svg/ox.map/VI.svg", 
+    "svg/ox.map/VN.svg", 
+    "svg/ox.map/VU.svg", 
+    "svg/ox.map/WF.svg", 
+    "svg/ox.map/WKUM.svg", 
+    "svg/ox.map/WS.svg", 
+    "svg/ox.map/YDYE.svg", 
+    "svg/ox.map/YE.svg", 
+    "svg/ox.map/YT.svg", 
+    "svg/ox.map/YUCS.svg", 
+    "svg/ox.map/ZA.svg", 
+    "svg/ox.map/ZM.svg", 
+    "svg/ox.map/ZRCD.svg", 
+    "svg/ox.map/ZW.svg", 
+    "svg/ox.ui.classic/symbolAdd.svg", 
+    "svg/ox.ui.classic/symbolArrowDown.svg", 
+    "svg/ox.ui.classic/symbolArrowLeft.svg", 
+    "svg/ox.ui.classic/symbolArrowRight.svg", 
+    "svg/ox.ui.classic/symbolArrowUp.svg", 
+    "svg/ox.ui.classic/symbolBracket.svg", 
+    "svg/ox.ui.classic/symbolCenter.svg", 
+    "svg/ox.ui.classic/symbolCheck.svg", 
+    "svg/ox.ui.classic/symbolClose.svg", 
+    "svg/ox.ui.classic/symbolDelete.svg", 
+    "svg/ox.ui.classic/symbolDown.svg", 
+    "svg/ox.ui.classic/symbolDownload.svg", 
+    "svg/ox.ui.classic/symbolEdit.svg", 
+    "svg/ox.ui.classic/symbolFill.svg", 
+    "svg/ox.ui.classic/symbolFind.svg", 
+    "svg/ox.ui.classic/symbolFit.svg", 
+    "svg/ox.ui.classic/symbolFlag.svg", 
+    "svg/ox.ui.classic/symbolGoToIn.svg", 
+    "svg/ox.ui.classic/symbolGoToOut.svg", 
+    "svg/ox.ui.classic/symbolGrow.svg", 
+    "svg/ox.ui.classic/symbolHelp.svg", 
+    "svg/ox.ui.classic/symbolInfo.svg", 
+    "svg/ox.ui.classic/symbolLeft.svg", 
+    "svg/ox.ui.classic/symbolLike.svg", 
+    "svg/ox.ui.classic/symbolLoading.svg", 
+    "svg/ox.ui.classic/symbolLock.svg", 
+    "svg/ox.ui.classic/symbolMount.svg", 
+    "svg/ox.ui.classic/symbolMute.svg", 
+    "svg/ox.ui.classic/symbolNone.svg", 
+    "svg/ox.ui.classic/symbolPause.svg", 
+    "svg/ox.ui.classic/symbolPlayInToOut.svg", 
+    "svg/ox.ui.classic/symbolPublish.svg", 
+    "svg/ox.ui.classic/symbolRedo.svg", 
+    "svg/ox.ui.classic/symbolRemove.svg", 
+    "svg/ox.ui.classic/symbolRight.svg", 
+    "svg/ox.ui.classic/symbolSelect.svg", 
+    "svg/ox.ui.classic/symbolSet.svg", 
+    "svg/ox.ui.classic/symbolSetIn.svg", 
+    "svg/ox.ui.classic/symbolSetOut.svg", 
+    "svg/ox.ui.classic/symbolShrink.svg", 
+    "svg/ox.ui.classic/symbolStar.svg", 
+    "svg/ox.ui.classic/symbolSync.svg", 
+    "svg/ox.ui.classic/symbolUndo.svg", 
+    "svg/ox.ui.classic/symbolUnlock.svg", 
+    "svg/ox.ui.classic/symbolUnmount.svg", 
+    "svg/ox.ui.classic/symbolUnmute.svg", 
+    "svg/ox.ui.classic/symbolUp.svg", 
+    "svg/ox.ui.classic/symbolUser.svg", 
+    "svg/ox.ui.classic/symbolView.svg", 
+    "svg/ox.ui.classic/symbolVolumeDown.svg", 
+    "svg/ox.ui.classic/symbolVolumeUp.svg", 
+    "svg/ox.ui.classic/symbolWarning.svg", 
+    "svg/ox.ui.classic/symbolZoom.svg", 
+    "svg/ox.ui.modern/symbolAdd.svg", 
+    "svg/ox.ui.modern/symbolArrowDown.svg", 
+    "svg/ox.ui.modern/symbolArrowLeft.svg", 
+    "svg/ox.ui.modern/symbolArrowRight.svg", 
+    "svg/ox.ui.modern/symbolArrowUp.svg", 
+    "svg/ox.ui.modern/symbolBracket.svg", 
+    "svg/ox.ui.modern/symbolCenter.svg", 
+    "svg/ox.ui.modern/symbolCheck.svg", 
+    "svg/ox.ui.modern/symbolClose.svg", 
+    "svg/ox.ui.modern/symbolDelete.svg", 
+    "svg/ox.ui.modern/symbolDown.svg", 
+    "svg/ox.ui.modern/symbolDownload.svg", 
+    "svg/ox.ui.modern/symbolEdit.svg", 
+    "svg/ox.ui.modern/symbolFill.svg", 
+    "svg/ox.ui.modern/symbolFind.svg", 
+    "svg/ox.ui.modern/symbolFit.svg", 
+    "svg/ox.ui.modern/symbolFlag.svg", 
+    "svg/ox.ui.modern/symbolGoToIn.svg", 
+    "svg/ox.ui.modern/symbolGoToOut.svg", 
+    "svg/ox.ui.modern/symbolGrow.svg", 
+    "svg/ox.ui.modern/symbolHelp.svg", 
+    "svg/ox.ui.modern/symbolInfo.svg", 
+    "svg/ox.ui.modern/symbolLeft.svg", 
+    "svg/ox.ui.modern/symbolLike.svg", 
+    "svg/ox.ui.modern/symbolLoading.svg", 
+    "svg/ox.ui.modern/symbolLock.svg", 
+    "svg/ox.ui.modern/symbolMount.svg", 
+    "svg/ox.ui.modern/symbolMute.svg", 
+    "svg/ox.ui.modern/symbolNone.svg", 
+    "svg/ox.ui.modern/symbolPause.svg", 
+    "svg/ox.ui.modern/symbolPlayInToOut.svg", 
+    "svg/ox.ui.modern/symbolPublish.svg", 
+    "svg/ox.ui.modern/symbolRedo.svg", 
+    "svg/ox.ui.modern/symbolRemove.svg", 
+    "svg/ox.ui.modern/symbolRight.svg", 
+    "svg/ox.ui.modern/symbolSelect.svg", 
+    "svg/ox.ui.modern/symbolSet.svg", 
+    "svg/ox.ui.modern/symbolSetIn.svg", 
+    "svg/ox.ui.modern/symbolSetOut.svg", 
+    "svg/ox.ui.modern/symbolShrink.svg", 
+    "svg/ox.ui.modern/symbolStar.svg", 
+    "svg/ox.ui.modern/symbolSync.svg", 
+    "svg/ox.ui.modern/symbolUndo.svg", 
+    "svg/ox.ui.modern/symbolUnlock.svg", 
+    "svg/ox.ui.modern/symbolUnmount.svg", 
+    "svg/ox.ui.modern/symbolUnmute.svg", 
+    "svg/ox.ui.modern/symbolUp.svg", 
+    "svg/ox.ui.modern/symbolUser.svg", 
+    "svg/ox.ui.modern/symbolView.svg", 
+    "svg/ox.ui.modern/symbolVolumeDown.svg", 
+    "svg/ox.ui.modern/symbolVolumeUp.svg", 
+    "svg/ox.ui.modern/symbolWarning.svg", 
+    "svg/ox.ui.modern/symbolZoom.svg"
 ]