release: v1.2.2 "barcelona"

Author: Ionitron

CHANGELOG.md

@@ -1,7 +1,7 @@
 {
   "name": "ionic",
-  "version": "1.2.1",
-  "codename": "amsterdam",
+  "version": "1.2.2",
+  "codename": "barcelona",
   "homepage": "https://github.com/driftyco/ionic",
   "authors": [
     "Max Lynch <[email protected]>",

bower.json

@@ -1,7 +1,7 @@
 {
     "repo": "driftyco/ionic",
     "development": {},
-    "version": "1.2.1",
+    "version": "1.2.2",
     "styles": [
       "dist/css/ionic.css"
     ],

component.json

@@ -1,2 +1 @@
-barcelona
 copenhagen

config/CODENAMES

@@ -3,7 +3,7 @@
  * Copyright 2015 Drifty Co.
  * http://drifty.com/
  *
- * Ionic, v1.2.1
+ * Ionic, v1.2.2
  * A powerful HTML5 mobile app framework.
  * http://ionicframework.com/
  *
@@ -3335,7 +3335,8 @@ body,
   color: #000;
   word-wrap: break-word;
   font-size: 14px;
-  font-family: "Helvetica Neue", "Roboto", "Segoe UI", sans-serif;
+  font-family: -apple-system;
+  font-family: "-apple-system", "Helvetica Neue", "Roboto", "Segoe UI", sans-serif;
   line-height: 20px;
   text-rendering: optimizeLegibility;
   -webkit-backface-visibility: hidden;
@@ -3497,6 +3498,8 @@ ion-infinite-scroll {
     position: static;
     height: 100%;
     -webkit-transform: translate3d(0, 0, 0); }
+  .overflow-scroll.keyboard-up:not(.keyboard-up-confirm) {
+    overflow: hidden; }
 
 /* If you change these, change platform.scss as well */
 .has-header {
@@ -3588,7 +3591,7 @@ h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
   color: #000;
   font-weight: 500;
-  font-family: "Helvetica Neue", "Roboto", "Segoe UI", sans-serif;
+  font-family: "-apple-system", "Helvetica Neue", "Roboto", "Segoe UI", sans-serif;
   line-height: 1.2; }
   h1 small, h2 small, h3 small, h4 small, h5 small, h6 small,
   .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small {
@@ -5061,7 +5064,7 @@ ion-tabs.tabs-color-active-dark .tab-item {
   white-space: nowrap;
   font-weight: 400;
   font-size: 14px;
-  font-family: "Helvetica Neue", "Roboto", "Segoe UI", sans-serif;
+  font-family: "-apple-system", "Helvetica Neue", "Roboto", "Segoe UI", sans-serif;
   opacity: 0.7; }
   .tab-item:hover {
     cursor: pointer; }
@@ -5228,7 +5231,12 @@ ion-tabs.tabs-color-active-dark .tab-item {
 
 .menu-open .menu-content .pane,
 .menu-open .menu-content .scroll-content {
-  pointer-events: none;
+  pointer-events: none; }
+
+.menu-open .menu-content .scroll-content .scroll {
+  pointer-events: none; }
+
+.menu-open .menu-content .scroll-content:not(.overflow-scroll) {
   overflow: hidden; }
 
 .grade-b .menu-content,
@@ -7480,7 +7488,7 @@ input,
 button,
 select,
 textarea {
-  font-family: "Helvetica Neue", "Roboto", "Segoe UI", sans-serif; }
+  font-family: "-apple-system", "Helvetica Neue", "Roboto", "Segoe UI", sans-serif; }
 
 .item-input {
   display: -webkit-box;

release/css/ionic.css

@@ -2,7 +2,7 @@
  * Copyright 2015 Drifty Co.
  * http://drifty.com/
  *
- * Ionic, v1.2.1
+ * Ionic, v1.2.2
  * A powerful HTML5 mobile app framework.
  * http://ionicframework.com/
  *
@@ -2307,9 +2307,10 @@ function($ionicLoadingConfig, $ionicBody, $ionicTemplateLoader, $ionicBackdrop,
             }
             self.element.removeClass('active');
             $ionicBody.removeClass('loading-active');
-            setTimeout(function() {
+            self.element.removeClass('visible');
+            ionic.requestAnimationFrame(function() {
               !self.isShown && self.element.removeClass('visible');
-            }, 200);
+            });
           }
           $timeout.cancel(self.durationTimeout);
           self.isShown = false;
@@ -2559,7 +2560,7 @@ function($rootScope, $ionicBody, $compile, $timeout, $ionicPlatform, $ionicTempl
         self.$el.on('touchmove', function(e) {
           //Don't allow scrolling while open by dragging on backdrop
           var isInScroll = ionic.DomUtil.getParentOrSelfWithClass(e.target, 'scroll');
-          if(!isInScroll) {
+          if (!isInScroll) {
             e.preventDefault();
           }
         });
@@ -6825,6 +6826,15 @@ IonicModule
       startY = Math.floor(e.touches[0].screenY);
     }
 
+    function handleTouchstart(e) {
+      e.touches = e.touches || [{
+        screenX: e.screenX,
+        screenY: e.screenY
+      }];
+
+      startY = e.touches[0].screenY;
+    }
+
     function handleTouchend() {
       // reset Y
       startY = null;
@@ -6861,7 +6871,7 @@ IonicModule
       }];
 
       // Force mouse events to have had a down event first
-      if(!startY && e.type == 'mousemove') {
+      if (!startY && e.type == 'mousemove') {
         return;
       }
 
@@ -6874,14 +6884,16 @@ IonicModule
         startY = e.touches[0].screenY;
       }
 
+      deltaY = e.touches[0].screenY - startY;
+
+      // how far have we dragged so far?
       // kitkat fix for touchcancel events http://updates.html5rocks.com/2014/05/A-More-Compatible-Smoother-Touch
-      if (ionic.Platform.isAndroid() && ionic.Platform.version() === 4.4 && scrollParent.scrollTop === 0) {
+      // Only do this if we're not on crosswalk
+      if (ionic.Platform.isAndroid() && ionic.Platform.version() === 4.4 && !ionic.Platform.isCrosswalk() && scrollParent.scrollTop === 0 && deltaY > 0) {
         isDragging = true;
         e.preventDefault();
       }
 
-      // how far have we dragged so far?
-      deltaY = e.touches[0].screenY - startY;
 
       // if we've dragged up and back down in to native scroll territory
       if (deltaY - dragOffset <= 0 || scrollParent.scrollTop !== 0) {
@@ -7034,17 +7046,17 @@ IonicModule
     }
 
 
-    var touchMoveEvent, touchEndEvent;
+    var touchStartEvent, touchMoveEvent, touchEndEvent;
     if (window.navigator.pointerEnabled) {
-      //touchStartEvent = 'pointerdown';
+      touchStartEvent = 'pointerdown';
       touchMoveEvent = 'pointermove';
       touchEndEvent = 'pointerup';
     } else if (window.navigator.msPointerEnabled) {
-      //touchStartEvent = 'MSPointerDown';
+      touchStartEvent = 'MSPointerDown';
       touchMoveEvent = 'MSPointerMove';
       touchEndEvent = 'MSPointerUp';
     } else {
-      //touchStartEvent = 'touchstart';
+      touchStartEvent = 'touchstart';
       touchMoveEvent = 'touchmove';
       touchEndEvent = 'touchend';
     }
@@ -7059,6 +7071,7 @@ IonicModule
       }
 
 
+      ionic.on(touchStartEvent, handleTouchstart, scrollChild);
       ionic.on(touchMoveEvent, handleTouchmove, scrollChild);
       ionic.on(touchEndEvent, handleTouchend, scrollChild);
       ionic.on('mousedown', handleMousedown, scrollChild);
@@ -7071,6 +7084,7 @@ IonicModule
     };
 
     function destroy() {
+      ionic.off(touchStartEvent, handleTouchstart, scrollChild);
       ionic.off(touchMoveEvent, handleTouchmove, scrollChild);
       ionic.off(touchEndEvent, handleTouchend, scrollChild);
       ionic.off('mousedown', handleMousedown, scrollChild);
@@ -7328,6 +7342,7 @@ function($scope,
   };
 
   self.freezeScroll = scrollView.freeze;
+  self.freezeScrollShut = scrollView.freezeShut;
 
   self.freezeAllScrolls = function(shouldFreeze) {
     for (var i = 0; i < $ionicScrollDelegate._instances.length; i++) {
@@ -7509,9 +7524,10 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
     // equal 0, otherwise remove the class from the body element
     $ionicBody.enableClass((percentage !== 0), 'menu-open');
 
-    freezeAllScrolls(false);
+    self.content.setCanScroll(percentage == 0);
   };
 
+  /*
   function freezeAllScrolls(shouldFreeze) {
     if (shouldFreeze && !self.isScrollFreeze) {
       $ionicScrollDelegate.freezeAllScrolls(shouldFreeze);
@@ -7521,6 +7537,7 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
     }
     self.isScrollFreeze = shouldFreeze;
   }
+  */
 
   /**
    * Open the menu the given pixel amount.
@@ -7654,7 +7671,6 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
 
     isAsideExposed = shouldExposeAside;
     if ((self.left && self.left.isEnabled) && (self.right && self.right.isEnabled)) {
-      void 0;
       self.content.setMarginLeftAndRight(isAsideExposed ? self.left.width : 0, isAsideExposed ? self.right.width : 0);
     } else if (self.left && self.left.isEnabled) {
       // set the left marget width if it should be exposed
@@ -7672,8 +7688,6 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
 
   // End a drag with the given event
   self._endDrag = function(e) {
-    freezeAllScrolls(false);
-
     if (isAsideExposed) return;
 
     if (isDragging) {
@@ -7711,7 +7725,7 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
 
     if (isDragging) {
       self.openAmount(offsetX + (lastX - startX));
-      freezeAllScrolls(true);
+      //self.content.setCanScroll(false);
     }
   };
 
@@ -7790,12 +7804,10 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
     deregisterBackButtonAction();
     self.$scope = null;
     if (self.content) {
+      self.content.setCanScroll(true);
       self.content.element = null;
       self.content = null;
     }
-
-    // ensure scrolls are unfrozen
-    freezeAllScrolls(false);
   });
 
   self.initialize({
@@ -9788,6 +9800,8 @@ function($timeout, $controller, $ionicBind, $ionicConfig) {
             scrollViewOptions: scrollViewOptions
           });
 
+          $scope.scrollCtrl = scrollCtrl;
+
           $scope.$on('$destroy', function() {
             if (scrollViewOptions) {
               scrollViewOptions.scrollingComplete = noop;
@@ -12610,6 +12624,22 @@ function($timeout, $ionicGesture, $window) {
           element: element[0],
           onDrag: function() {},
           endDrag: function() {},
+          setCanScroll: function(canScroll) {
+            var c = $element[0].querySelector('.scroll');
+
+            if (!c) {
+              return;
+            }
+
+            var content = angular.element(c.parentElement);
+            if (!content) {
+              return;
+            }
+
+            // freeze our scroll container if we have one
+            var scrollScope = content.scope();
+            scrollScope.scrollCtrl && scrollScope.scrollCtrl.freezeScrollShut(!canScroll);
+          },
           getTranslateX: function() {
             return $scope.sideMenuContentTranslateX || 0;
           },
@@ -12677,9 +12707,7 @@ function($timeout, $ionicGesture, $window) {
 
         // add gesture handlers
         var gestureOpts = { stop_browser_behavior: false };
-        if (ionic.DomUtil.getParentOrSelfWithClass($element[0], 'overflow-scroll')) {
-          gestureOpts.prevent_default_directions = ['left', 'right'];
-        }
+        gestureOpts.prevent_default_directions = ['left', 'right'];
         var contentTapGesture = $ionicGesture.on('tap', onContentTap, $element, gestureOpts);
         var dragRightGesture = $ionicGesture.on('dragright', onDragX, $element, gestureOpts);
         var dragLeftGesture = $ionicGesture.on('dragleft', onDragX, $element, gestureOpts);
@@ -13086,7 +13114,8 @@ IonicModule
 .directive('ionSlides', [
   '$animate',
   '$timeout',
-function($animate, $timeout) {
+  '$compile',
+function($animate, $timeout, $compile) {
   return {
     restrict: 'E',
     transclude: true,
@@ -13104,6 +13133,10 @@ function($animate, $timeout) {
 
       this.update = function() {
         $timeout(function() {
+          if (!_this.__slider) {
+            return;
+          }
+
           _this.__slider.update();
           if (_this._options.loop) {
             _this.__slider.createLoop();
@@ -13136,7 +13169,7 @@ function($animate, $timeout) {
       this._options = newOptions;
 
       $timeout(function() {
-        var slider = new ionic.views.Swiper($element.children()[0], newOptions, $scope);
+        var slider = new ionic.views.Swiper($element.children()[0], newOptions, $scope, $compile);
 
         _this.__slider = slider;
         $scope.slider = _this.__slider;
@@ -13149,10 +13182,10 @@ function($animate, $timeout) {
     }],
 
 
-    link: function($scope, $element) {
+    link: function($scope) {
       $scope.showPager = true;
       // Disable ngAnimate for slidebox and its children
-      $animate.enabled(false, $element);
+      //$animate.enabled(false, $element);
     }
   };
 }])