Bumped version number to 1.2.5

fgnass · Mar 22, 2012 · e0e0355 · e0e0355
1 parent 489a385
commit e0e0355
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/dist/spin.js b/dist/spin.js
@@ -1,4 +1,4 @@
-//fgnass.github.com/spin.js#v1.2.4
+//fgnass.github.com/spin.js#v1.2.5
 (function(window, document, undefined) {
 
 /**
@@ -125,6 +125,7 @@
     length: 7,            // The length of each line
     width: 5,             // The line thickness
     radius: 10,           // The radius of the inner circle
+    rotate: 0,            // rotation offset
     color: '#000',        // #rgb or #rrggbb
     speed: 1,             // Rounds per second
     trail: 100,           // Afterglow percentage
@@ -143,7 +144,7 @@
   };
 
   Spinner.defaults = {};
-  Spinner.prototype = {
+  merge(Spinner.prototype, {
     spin: function(target) {
       this.stop();
       var self = this;
@@ -206,7 +207,7 @@
           background: color,
           boxShadow: shadow,
           transformOrigin: 'left',
-          transform: 'rotate(' + ~~(360/o.lines*i) + 'deg) translate(' + o.radius+'px' +',0)',
+          transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
           borderRadius: (o.width>>1) + 'px'
         });
       }
@@ -226,7 +227,7 @@
     opacity: function(el, i, val) {
       if (i < el.childNodes.length) el.childNodes[i].style.opacity = val;
     }
-  };
+  });
 
   /////////////////////////////////////////////////////////////////////////
   // VML rendering for IE
@@ -236,20 +237,24 @@
    * Check and init VML support
    */
   !function() {
+
+    function vml(tag, attr) {
+      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr);
+    }
+
     var s = css(createEl('group'), {behavior: 'url(#default#VML)'});
-    var i;
 
     if (!vendor(s, 'transform') && s.adj) {
 
-      // VML support detected. Insert CSS rules ...
-      for (i=4; i--;) sheet.addRule(['group', 'roundrect', 'fill', 'stroke'][i], 'behavior:url(#default#VML)');
+      // VML support detected. Insert CSS rule ...
+      sheet.addRule('.spin-vml', 'behavior:url(#default#VML)');
 
       Spinner.prototype.lines = function(el, o) {
         var r = o.length+o.width;
         var s = 2*r;
 
         function grp() {
-          return css(createEl('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';
@@ -260,15 +265,15 @@
         function seg(i, dx, filter) {
           ins(g,
             ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
-              ins(css(createEl('roundrect', {arcsize: 1}), {
+              ins(css(vml('roundrect', {arcsize: 1}), {
                   width: r,
                   height: o.width,
                   left: o.radius,
                   top: -o.width>>1,
                   filter: filter
                 }),
-                createEl('fill', {color: o.color, opacity: o.opacity}),
-                createEl('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
+                vml('fill', {color: o.color, opacity: o.opacity}),
+                vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
               )
             )
           );

diff --git a/dist/spin.min.js b/dist/spin.min.js
diff --git a/index.html b/index.html
@@ -210,7 +210,7 @@ <h2>Contact</h2>
 </div>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
 <script type="text/javascript" src="assets/fd-slider/fd-slider.js"></script>
-<script src="dist/spin.min.js?v=1.2.4"></script>
+<script src="dist/spin.min.js?v=1.2.5"></script>
 <script>
   $.fn.spin = function(opts) {
     this.each(function() {

diff --git a/spin.js b/spin.js
@@ -1,4 +1,4 @@
-//fgnass.github.com/spin.js#v1.2.4
+//fgnass.github.com/spin.js#v1.2.5
 (function(window, document, undefined) {
 
 /**