Merge pull request #25 from AndrewKoransky/master

add 'initializing' class to initial load of the pull header.
zippy1978 · Apr 10, 2015 · f2423c3 · f2423c3
2 parents 52f737a + f491b03
commit f2423c3
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/jquery.scrollz.js b/src/jquery.scrollz.js
@@ -211,14 +211,13 @@
 
         // If plugin initialized
         if (_isInitialized($this)) {
-
           var settings = $this.data('options');
           var container = _getMarkupCache($this, 'container');
 
           if (settings.pull) {
             if (animated) {
                 container.animate({scrollTop: _getPullHeaderHeight($this)}, 'fast', function() {
-                    _changePullHeaderState($this, 'initial');
+                    _changePullHeaderState($this, 'initial', true);
                     if (typeof top !== 'undefined') {
                         container.scrollTop(top);
                     }
@@ -229,7 +228,7 @@
                 } else {
                     container.scrollTop(_getPullHeaderHeight($this));
                 }
-                _changePullHeaderState($this, 'initial');
+                _changePullHeaderState($this, 'initial', true);
             }
           }
         }
@@ -418,7 +417,7 @@
 
      // Create pull header
      var pullHeader = $(settings.pullHeaderHTML.initial);
-     pullHeader.addClass('scrollz-pull-header').addClass('initial');
+     pullHeader.addClass('scrollz-pull-header').addClass('initial').addClass('initializing');
 
      // Add pull header
      contentWrapper.prepend(pullHeader);
@@ -442,22 +441,28 @@
   }
 
   /* Change pull header state. */ 
-  function _changePullHeaderState(instance, state) {
-
+  function _changePullHeaderState(instance, state, isDoneInitializing) {
+    isDoneInitializing = typeof isDoneInitializing !== 'undefined' ? isDoneInitializing : false;
     var settings = instance.data('options');
     var contentWrapper = _getMarkupCache(instance, 'contentWrapper');
     var pullHeader = contentWrapper.children('.scrollz-pull-header');
 
     if (!pullHeader.hasClass(state)) {
-      pullHeader.replaceWith($(settings.pullHeaderHTML[state]).addClass('scrollz-pull-header').addClass(state));
+        if (pullHeader.hasClass('initializing')) {
+            pullHeader.replaceWith($(settings.pullHeaderHTML[state]).addClass('scrollz-pull-header').addClass(state).addClass('initializing'));
+        } else {
+            pullHeader.replaceWith($(settings.pullHeaderHTML[state]).addClass('scrollz-pull-header').addClass(state));
+        }
+    }
+    if (pullHeader.hasClass('initializing') && isDoneInitializing) {
+        pullHeader.removeClass('initializing');
     }
 
     // Update pull header in stored markup
     _putMarkupCache(instance, 'pullHeader', contentWrapper.children('.scrollz-pull-header'));
 
     // Store current state
     instance.data('pullHeaderState', state);
-
   }
 
   /* Returns pull header state */
@@ -808,4 +813,4 @@
 
   }
 
-}(jQuery));
+}(jQuery));