diff --git a/source/js/Ox.UI/List/Ox.ListMap.js b/source/js/Ox.UI/Map/Ox.ListMap.js similarity index 100% rename from source/js/Ox.UI/List/Ox.ListMap.js rename to source/js/Ox.UI/Map/Ox.ListMap.js diff --git a/source/js/Ox.UI/Ox.UI.js b/source/js/Ox.UI/Ox.UI.js index 3dbaf1fe..92df78a5 100644 --- a/source/js/Ox.UI/Ox.UI.js +++ b/source/js/Ox.UI/Ox.UI.js @@ -75,7 +75,7 @@ Ox.load.UI = function(options, callback) { browserSupported ? showIcon() : showWarning(); function showIcon() { - var src = Ox.PATH + 'svg/Ox.UI.' + options.theme + '/symbolLoading.svg' + var src = Ox.PATH + 'svg/Ox.UI.' + options.theme + '/symbolLoadingAnimated.svg' Ox.loadFile(src, function() { Ox.element('') .attr({ @@ -83,13 +83,39 @@ Ox.load.UI = function(options, callback) { }) .css(Ox.extend({ width: '32px', - height: '32px', + height: '32px' }, css)) .mousedown(function(e) { e.preventDefault() }) .appendTo(div); }); + var deg = 0, element, interval, + src = Ox.PATH + 'svg/Ox.UI.' + options.theme + '/symbolLoading.svg' + Ox.loadFile(src, function() { + element = Ox.element('') + .attr({ + src: src + }) + .css({ + position: 'absolute', + top: '250px', + left: '500px', + width: '32px', + height: '32px' + }) + .mousedown(function(e) { + e.preventDefault() + }) + .appendTo(div); + interval = setInterval(function() { + deg = (deg + 30) % 360; + element.css({ + MozTransform: 'rotate(' + deg + 'deg)', + WebkitTransform: 'rotate(' + deg + 'deg)' + }); + }, 83); + }); } function showWarning() { diff --git a/source/svg/Ox.UI.classic/symbolLoading.svg b/source/svg/Ox.UI.classic/symbolLoading.svg index e87df9ed..c9cb836e 100644 --- a/source/svg/Ox.UI.classic/symbolLoading.svg +++ b/source/svg/Ox.UI.classic/symbolLoading.svg @@ -1,40 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/source/svg/Ox.UI.classic/symbolLoadingAnimated.svg b/source/svg/Ox.UI.classic/symbolLoadingAnimated.svg new file mode 100644 index 00000000..e87df9ed --- /dev/null +++ b/source/svg/Ox.UI.classic/symbolLoadingAnimated.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file