cleaning css classes after animation ends + adding active flag to eve…

…nts rather than element
usablica · Aug 7, 2016 · de75a13 · de75a13
1 parent 6d48fd8
commit de75a13
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 18 deletions.
diff --git a/build/scrollanim.js b/build/scrollanim.js
@@ -370,7 +370,7 @@
       var event = element.getAttribute(_options.attribute);
 
       _add(element, {
-         'in': event
+        'in': event
       });
     }
   };
@@ -387,17 +387,24 @@
   * See kissui.position for more options to bind events.
   */
   function _add (element, event) {
+    var eventObj = {};
+
     for (var e in event) {
       kissuiPosition.add(element, e);
+
+      eventObj[e] = {
+        animation: event[e],
+        // adding active flag
+        active: false
+      };
     }
 
     // add visibility: hidden to the element
     element.style.opacity = '0';
 
     _elements.push({
       element: element,
-      event: event,
-      active: false
+      event: eventObj
     });
   };
 
@@ -423,15 +430,47 @@
   */
   function _attach (element, event) {
     for (var e in element.event) {
-      if (e == event && element.active === false) {
+      if (e == event && element.event[e].active === false) {
+
         element.element.style.opacity = '1';
-        element.element.className += ' animated ' + element.event[e];
+        element.element.className += ' animated ' + element.event[e].animation;
+
 
-        //set this flag to prevent processing same element twice
-        element.active = true;
+        (function (element, e) {
+          _addEventListener(element.element, [
+            'webkitAnimationEnd',
+            'mozAnimationEnd',
+            'MSAnimationEnd',
+            'oanimationend',
+            'animationend'], function () {
+              element.element.className = element.element.className.replace('animated ' + element.event[e].animation, '');
+
+              //set this flag to prevent processing same element twice
+              element.event[e].active = true;
+            });
+        }(element, e));
+
+      }
+    }
+  };
 
+  /**
+  * To bind an event to browser
+  *
+  */
+  function _addEventListener (element, event, fn) {
+    // is event an array?
+    if (typeof (event) == 'object') {
+      for (var i = 0; i < event.length;i++) {
+        _addEventListener(element, event[i], fn);
       }
     }
+
+    if (element.addEventListener) { // modern browsers including IE9+
+      element.addEventListener(event, fn, false);
+    } else if (element.attachEvent) { // IE8 and below
+      element.attachEvent('on' + event, fn);
+    }
   };
 
   /**
@@ -445,7 +484,6 @@
     });
 
     kissuiPosition.init();
-
   };
 
   _init()

diff --git a/build/scrollanim.min.js b/build/scrollanim.min.js
diff --git a/scrollanim.js b/scrollanim.js
@@ -43,7 +43,7 @@
       var event = element.getAttribute(_options.attribute);
 
       _add(element, {
-         'in': event
+        'in': event
       });
     }
   };
@@ -60,17 +60,24 @@
   * See kissui.position for more options to bind events.
   */
   function _add (element, event) {
+    var eventObj = {};
+
     for (var e in event) {
       kissuiPosition.add(element, e);
+
+      eventObj[e] = {
+        animation: event[e],
+        // adding active flag
+        active: false
+      };
     }
 
     // add visibility: hidden to the element
     element.style.opacity = '0';
 
     _elements.push({
       element: element,
-      event: event,
-      active: false
+      event: eventObj
     });
   };
 
@@ -96,17 +103,49 @@
   */
   function _attach (element, event) {
     for (var e in element.event) {
-      if (e == event && element.active === false) {
+      if (e == event && element.event[e].active === false) {
+
         element.element.style.opacity = '1';
-        element.element.className += ' animated ' + element.event[e];
+        element.element.className += ' animated ' + element.event[e].animation;
+
 
-        //set this flag to prevent processing same element twice
-        element.active = true;
+        (function (element, e) {
+          _addEventListener(element.element, [
+            'webkitAnimationEnd',
+            'mozAnimationEnd',
+            'MSAnimationEnd',
+            'oanimationend',
+            'animationend'], function () {
+              element.element.className = element.element.className.replace('animated ' + element.event[e].animation, '');
+
+              //set this flag to prevent processing same element twice
+              element.event[e].active = true;
+            });
+        }(element, e));
 
       }
     }
   };
 
+  /**
+  * To bind an event to browser
+  *
+  */
+  function _addEventListener (element, event, fn) {
+    // is event an array?
+    if (typeof (event) == 'object') {
+      for (var i = 0; i < event.length;i++) {
+        _addEventListener(element, event[i], fn);
+      }
+    }
+
+    if (element.addEventListener) { // modern browsers including IE9+
+      element.addEventListener(event, fn, false);
+    } else if (element.attachEvent) { // IE8 and below
+      element.attachEvent('on' + event, fn);
+    }
+  };
+
   /**
   * Start the module
   */
@@ -118,7 +157,6 @@
     });
 
     kissuiPosition.init();
-
   };
 
   _init()