kaerus-component-slideshow 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72670e2a3117f1b09dee06ac66e4dc779eb6de14
-  data.tar.gz: b673b2987bcce655535569a18a1dd841a5696d3e
+  metadata.gz: c42ee0299b0b413078cd14398439e471ee1abcfb
+  data.tar.gz: a5ce0e39c633e36f8b195b7e5609460a50e99766
 SHA512:
-  metadata.gz: 8941862bcda605072cd69cec6b2b38fadabb644d89f4a6325b9a04d7922336561e8e4581ca4bbc434308835c41b1f9a3c3081250c82bda9dd6c23d1c9acbc111
-  data.tar.gz: 6e33bd319d6af1cbdb08a18b3876c0b84b335123a9a0154412813dd4a9430c0d40d4a3e90a71dac460228e349cdaef1840fbf3d9a6e8cae5f39a12dc211644b3
+  metadata.gz: e9d5b211e83f971527eea2da78c6f6f67376752c9b9d5908f463812322003a76efa315380e46830c1e6adbde7de9154ac80c6b0dd6e9b686754efa9f2ca148f3
+  data.tar.gz: 14c1bfd9c2dad67ded51cdd6ce773ddf9c9d38b3ecc86598781bdd3e6f88ab07dbc5cc4a66bb7ece3c78bfaa90c30d55b4ce2cc66867dd541e1991afa82467f2

data/lib/kaerus/component/slideshow/version.rb

@@ -1,7 +1,7 @@
 module Kaerus
   module Component
     module Slideshow
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/vendor/assets/javascripts/kaerus_component_slideshow.js

@@ -645,7 +645,7 @@ function Slideshow(container,options){
     Slideshow.prototype = {
         init: function(container,options){
             var settings = this.settings,
-                id = settings.id,
+                id = this.id = settings.id,
                 slides = '\n', 
                 navItems = '\n', 
                 navId = id + '-nav',
@@ -689,6 +689,8 @@ function Slideshow(container,options){
 
             attachHandlers(this);  
 
+            this.inTransition = false;
+
             this.emit('init');
 
             /* autostart on initialization */
@@ -717,26 +719,14 @@ function Slideshow(container,options){
             return this;
         },
         next: function(){
-            var self = this;
-
-            if(!this.inTransition) {
-                this.carousel.next();
+            if(this.whenReady('next'));
                 this.emit('next');
-            } else this.once('transition-end',function(){
-                self.next();
-            });
 
             return this;
         },
         prev: function(){
-            var self = this;
-
-            if(!this.inTransition) {
-                this.carousel.prev();
+            if(this.whenReady('prev'));
                 this.emit('prev');
-            } else this.once('transition-end',function(){
-                self.prev();
-            });
 
             return this;
         },
@@ -760,6 +750,28 @@ function Slideshow(container,options){
             else slides.style.display = 'none';
 
             return this;
+        },
+        whenReady: function(action){
+            var self = this, handlers, hasHandler;
+
+            if(!this.inTransition) {
+                this.carousel[action]();
+                return true;
+            } else {
+                handlers = this.listeners('transition-end');
+                for(var h in handlers){
+                    if(handlers[h]._of && handlers[h]._of === self[action]){
+                        hasHandler = true;
+                        break;
+                    }
+                }
+                
+                if(!hasHandler){
+                    this.once('transition-end', self[action]);
+                }
+            }
+
+            return false;
         }
     }
 
@@ -772,21 +784,24 @@ function Slideshow(container,options){
             prev = document.getElementById(id+'-prev');
 
         /* add slidshow UI handlers */
-        if(slideshow.settings.canPause) 
-            addPauseHandler(slides, slideshow);
-        
-        addNavHandler(nav,slideshow);
-        addTransitionHandler(nav, slides, slideshow);
-
         addEvent(next,'click',function(event){
+            event = event ? event : window.event;
             slideshow.next();
             event.stopPropagation();
         }); 
 
         addEvent(prev,'click',function(event){
+            event = event ? event : window.event;
             slideshow.prev();
             event.stopPropagation();
         }); 
+
+        if(slideshow.settings.canPause) 
+            addPauseHandler(slides, slideshow);
+        
+        addNavHandler(nav,slideshow);
+
+        addTransitionHandler(nav, slides, slideshow);
     }
 
     function applyStyle(elem,prop,attr){
@@ -853,11 +868,9 @@ function Slideshow(container,options){
         var settings = slideshow.settings,
             transition = settings.transition,
             navItems = nav.getElementsByTagName('li'), 
-            timer, durationProp, duration, s = 0, 
+            timer, durationProp, s = 0, 
             ix, fx, lx = navItems.length, slide = [], node;
 
-/*        $('#objectID').css('-webkit-transition-duration');*/
-
         durationProp = getStyleProperty('transition-duration',true);
 
         for(var x in slides.childNodes){
@@ -872,36 +885,35 @@ function Slideshow(container,options){
             ix = index % lx;
             fx = from % lx;
 
-            slideshow.inTransition = true;
-
             slideshow.emit('transition',slide[ix],ix);
 
             if(from !== undefined){
+                slideshow.inTransition = true;
+
                 navItems[fx].className = "navItem";
                 // apply transitions after first slide to avoid animations on startup
                 if(!slideshow.hasTransitions){
                     applyTransitions(document.getElementById(settings.id + '-slides'));
                     slideshow.hasTransitions = true;
                 }
-            }
-            
-            navItems[ix].className = "active navItem";
 
+                s = window.getComputedStyle(slide[ix],null).getPropertyValue(durationProp);
             
-            s = window.getComputedStyle(slide[ix],null).getPropertyValue(durationProp);
-            
-            if(s.indexOf('s') > 0) s = parseInt(s,10) * 1000;
-            else s = parseInt(s,10);
+                if(s.indexOf('s') > 0) s = parseInt(s,10) * 1000;
+                else s = parseInt(s,10);
 
-            current = ix;
+                current = ix;
 
-            if(s){
-                /* note: workaround for problematic transition-end event */
-                timer = setTimeout(function(){
-                    slideshow.inTransition = false;
-                    slideshow.emit('transition-end',slide[current],current);
-                },s);
+                if(s){
+                    /* note: workaround for problematic transition-end event */
+                    timer = setTimeout(function(){
+                        slideshow.inTransition = false;
+                        slideshow.emit('transition-end',slide[current],current);
+                    },s);
+                }
             }
+            
+            navItems[ix].className = "active navItem";
 
             slideshow.carousel.transit(index,from);
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaerus-component-slideshow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Anders Elo