feat(scroll): freeze scroll on ion-option-button swipe

Closes #2950
ionic-team · Feb 12, 2015 · 9a88c41 · 9a88c41
1 parent c0b0d78
commit 9a88c41
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 114 deletions.
diff --git a/js/angular/controller/navViewController.js b/js/angular/controller/navViewController.js
@@ -45,7 +45,14 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
     $element.data('$uiView', viewData);
 
     var deregisterInstance = $ionicNavViewDelegate._registerInstance(self, $attrs.delegateHandle);
-    $scope.$on('$destroy', deregisterInstance);
+    $scope.$on('$destroy', function() {
+      deregisterInstance();
+
+      // ensure no scrolls have been left frozen
+      if (self.isSwipeFreeze) {
+        $ionicScrollDelegate.freezeAllScrolls(false);
+      }
+    });
 
     $scope.$on('$ionicHistory.deselect', self.cacheCleanup);
 
@@ -176,6 +183,11 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
     }
 
     navSwipeAttr('');
+
+    // ensure no scrolls have been left frozen
+    if (self.isSwipeFreeze) {
+      $ionicScrollDelegate.freezeAllScrolls(false);
+    }
   };
 
 
@@ -303,7 +315,7 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
 
       if (!windowWidth) windowWidth = window.innerWidth;
 
-      freezeScrolls(true);
+      self.isSwipeFreeze = $ionicScrollDelegate.freezeAllScrolls(true);
 
       var registerData = {
         direction: 'back'
@@ -387,7 +399,7 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
 
       windowWidth = viewTransition = dragPoints = null;
 
-      freezeScrolls(false);
+      self.isSwipeFreeze = $ionicScrollDelegate.freezeAllScrolls(false);
     }
 
     function getDragX(ev) {
@@ -409,13 +421,6 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
   };
 
 
-  function freezeScrolls(freeze) {
-    forEach($ionicScrollDelegate._instances, function(instance) {
-      instance.freezeScroll(freeze);
-    });
-  }
-
-
   function navSwipeAttr(val) {
     ionic.DomUtil.cachedAttr($element, 'nav-swipe', val);
   }

diff --git a/js/angular/controller/scrollController.js b/js/angular/controller/scrollController.js
@@ -158,9 +158,12 @@ function($scope,
     });
   };
 
-  self.freezeScroll = function(shouldFreeze) {
-    if (arguments.length) scrollView.options.freeze = shouldFreeze;
-    return scrollView.options.freeze;
+  self.freezeScroll = scrollView.freeze;
+
+  self.freezeAllScrolls = function(shouldFreeze) {
+    for (var i = 0; i < $ionicScrollDelegate._instances.length; i++) {
+      $ionicScrollDelegate._instances[x].freezeScroll(shouldFreeze);
+    }
   };
 
 

diff --git a/js/angular/directive/list.js b/js/angular/directive/list.js
@@ -91,15 +91,16 @@ function($timeout) {
     controller: '$ionicList',
     compile: function($element, $attr) {
       var listEl = jqLite('<div class="list">')
-        .append( $element.contents() )
+        .append($element.contents())
         .addClass($attr.type);
+
       $element.append(listEl);
 
       return function($scope, $element, $attrs, ctrls) {
         var listCtrl = ctrls[0];
         var scrollCtrl = ctrls[1];
 
-        //Wait for child elements to render...
+        // Wait for child elements to render...
         $timeout(init);
 
         function init() {
@@ -111,9 +112,9 @@ function($timeout) {
             onReorder: function(el, oldIndex, newIndex) {
               var itemScope = jqLite(el).scope();
               if (itemScope && itemScope.$onReorder) {
-                //Make sure onReorder is called in apply cycle,
-                //but also make sure it has no conflicts by doing
-                //$evalAsync
+                // Make sure onReorder is called in apply cycle,
+                // but also make sure it has no conflicts by doing
+                // $evalAsync
                 $timeout(function() {
                   itemScope.$onReorder(oldIndex, newIndex);
                 });
@@ -125,7 +126,7 @@ function($timeout) {
           });
 
           $scope.$on('$destroy', function() {
-            if(listView) {
+            if (listView) {
               listView.deregister && listView.deregister();
               listView = null;
             }

diff --git a/js/angular/service/scrollDelegate.js b/js/angular/service/scrollDelegate.js
@@ -133,10 +133,18 @@ IonicModule
   /**
    * @ngdoc method
    * @name $ionicScrollDelegate#freezeScroll
-   * @description Does not allow the scrollView to scroll in either x or y.
+   * @description Does not allow this scroll view to scroll either x or y.
+   * @param {boolean=} shouldFreeze Should this scroll view be prevented from scrolling or not.
    * @returns {object} If the scroll view is being prevented from scrolling or not.
    */
   'freezeScroll',
+  /**
+   * @ngdoc method
+   * @name $ionicScrollDelegate#freezeAllScrolls
+   * @description Does not allow any of the app's scroll views to scroll either x or y.
+   * @param {boolean=} shouldFreeze Should all app scrolls be prevented from scrolling or not.
+   */
+  'freezeAllScrolls',
   /**
    * @ngdoc method
    * @name $ionicScrollDelegate#getScrollView