diff --git a/addons/web/static/lib/spinjs/spin.js b/addons/web/static/lib/spinjs/spin.js index d8e21786a1f..434d76a6870 100644 --- a/addons/web/static/lib/spinjs/spin.js +++ b/addons/web/static/lib/spinjs/spin.js @@ -1,47 +1,45 @@ -//fgnass.github.com/spin.js#v1.2.5 -(function(window, document, undefined) { +//fgnass.github.com/spin.js#v1.2.7 +!function(window, document, undefined) { -/** - * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de] - * Licensed under the MIT license - */ + /** + * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de] + * Licensed under the MIT license + */ - var prefixes = ['webkit', 'Moz', 'ms', 'O']; /* Vendor prefixes */ - var animations = {}; /* Animation rules keyed by their name */ - var useCssAnimations; + var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */ + , animations = {} /* Animation rules keyed by their name */ + , useCssAnimations /** * Utility function to create elements. If no tag name is given, * a DIV is created. Optionally properties can be passed. */ function createEl(tag, prop) { - var el = document.createElement(tag || 'div'); - var n; + var el = document.createElement(tag || 'div') + , n - for(n in prop) { - el[n] = prop[n]; - } - return el; + for(n in prop) el[n] = prop[n] + return el } /** * Appends children and returns the parent. */ function ins(parent /* child1, child2, ...*/) { - for (var i=1, n=arguments.length; i> 1) : o.left+mid) + 'px', - top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : o.top+mid) + 'px' - }); + left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : parseInt(o.left, 10) + mid) + 'px', + top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid) + 'px' + }) } - el.setAttribute('aria-role', 'progressbar'); - self.lines(el, self.opts); + el.setAttribute('aria-role', 'progressbar') + self.lines(el, self.opts) if (!useCssAnimations) { // No CSS animation support, use setTimeout() instead - var i = 0; - var fps = o.fps; - var f = fps/o.speed; - var ostep = (1-o.opacity)/(f*o.trail / 100); - var astep = f/o.lines; + var i = 0 + , fps = o.fps + , f = fps/o.speed + , ostep = (1-o.opacity) / (f*o.trail / 100) + , astep = f/o.lines - !function anim() { + ;(function anim() { i++; for (var s=o.lines; s; s--) { - var alpha = Math.max(1-(i+s*astep)%f * ostep, o.opacity); - self.opacity(el, o.lines-s, alpha, o); + var alpha = Math.max(1-(i+s*astep)%f * ostep, o.opacity) + self.opacity(el, o.lines-s, alpha, o) } - self.timeout = self.el && setTimeout(anim, ~~(1000/fps)); - }(); + self.timeout = self.el && setTimeout(anim, ~~(1000/fps)) + })() } - return self; + return self }, + stop: function() { - var el = this.el; + var el = this.el if (el) { - clearTimeout(this.timeout); - if (el.parentNode) el.parentNode.removeChild(el); - this.el = undefined; + clearTimeout(this.timeout) + if (el.parentNode) el.parentNode.removeChild(el) + this.el = undefined } - return this; + return this }, + lines: function(el, o) { - var i = 0; - var seg; + var i = 0 + , seg function fill(color, shadow) { return css(createEl(), { @@ -208,9 +210,10 @@ boxShadow: shadow, transformOrigin: 'left', transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)', - borderRadius: (o.width>>1) + 'px' - }); + borderRadius: (o.corners * o.width>>1) + 'px' + }) } + for (; i < o.lines; i++) { seg = css(createEl(), { position: 'absolute', @@ -218,16 +221,20 @@ transform: o.hwaccel ? 'translate3d(0,0,0)' : '', opacity: o.opacity, animation: useCssAnimations && addAnimation(o.opacity, o.trail, i, o.lines) + ' ' + 1/o.speed + 's linear infinite' - }); - if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})); - ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))); + }) + + if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})) + + ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))) } - return el; + return el }, + opacity: function(el, i, val) { - if (i < el.childNodes.length) el.childNodes[i].style.opacity = val; + if (i < el.childNodes.length) el.childNodes[i].style.opacity = val } - }); + + }) ///////////////////////////////////////////////////////////////////////// // VML rendering for IE @@ -236,36 +243,41 @@ /** * Check and init VML support */ - !function() { + ;(function() { function vml(tag, attr) { - return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr); + return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr) } - var s = css(createEl('group'), {behavior: 'url(#default#VML)'}); + var s = css(createEl('group'), {behavior: 'url(#default#VML)'}) if (!vendor(s, 'transform') && s.adj) { // VML support detected. Insert CSS rule ... - sheet.addRule('.spin-vml', 'behavior:url(#default#VML)'); + sheet.addRule('.spin-vml', 'behavior:url(#default#VML)') Spinner.prototype.lines = function(el, o) { - var r = o.length+o.width; - var s = 2*r; + var r = o.length+o.width + , s = 2*r function grp() { - return css(vml('group', {coordsize: s +' '+s, coordorigin: -r +' '+-r}), {width: s, height: s}); + return css( + vml('group', { + coordsize: s + ' ' + s, + coordorigin: -r + ' ' + -r + }), + { width: s, height: s } + ) } - var margin = -(o.width+o.length)*2+'px'; - var g = css(grp(), {position: 'absolute', top: margin, left: margin}); - - var i; + var margin = -(o.width+o.length)*2 + 'px' + , g = css(grp(), {position: 'absolute', top: margin, left: margin}) + , i function seg(i, dx, filter) { ins(g, ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}), - ins(css(vml('roundrect', {arcsize: 1}), { + ins(css(vml('roundrect', {arcsize: o.corners}), { width: r, height: o.width, left: o.radius, @@ -276,31 +288,33 @@ vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change ) ) - ); + ) } - if (o.shadow) { - for (i = 1; i <= o.lines; i++) { - seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)'); - } - } - for (i = 1; i <= o.lines; i++) seg(i); - return ins(el, g); - }; + if (o.shadow) + for (i = 1; i <= o.lines; i++) + seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)') + + for (i = 1; i <= o.lines; i++) seg(i) + return ins(el, g) + } + Spinner.prototype.opacity = function(el, i, val, o) { - var c = el.firstChild; - o = o.shadow && o.lines || 0; + var c = el.firstChild + o = o.shadow && o.lines || 0 if (c && i+o < c.childNodes.length) { - c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild; - if (c) c.opacity = val; + c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild + if (c) c.opacity = val } - }; + } } - else { - useCssAnimations = vendor(s, 'animation'); - } - }(); + else + useCssAnimations = vendor(s, 'animation') + })() - window.Spinner = Spinner; + if (typeof define == 'function' && define.amd) + define(function() { return Spinner }) + else + window.Spinner = Spinner -})(window, document); \ No newline at end of file +}(window, document);