release: v1.2.1 "amsterdam"

Author: Ionitron

CHANGELOG.md

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

bower.json

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

component.json

@@ -1,3 +1,2 @@
-amsterdam
 brussels
 Copenhagen

config/CODENAMES

@@ -3,7 +3,7 @@
  * Copyright 2015 Drifty Co.
  * http://drifty.com/
  *
- * Ionic, v1.2.0
+ * Ionic, v1.2.1
  * A powerful HTML5 mobile app framework.
  * http://ionicframework.com/
  *
@@ -7241,9 +7241,6 @@ ion-slides {
   text-align: center; }
 
 .swiper-container {
-  position: absolute;
-  left: 0;
-  top: 0;
   width: 100%;
   height: 100%;
   padding: 0;
@@ -7257,10 +7254,6 @@ ion-slides {
   height: 100%;
   padding: 0; }
 
-.swiper-container {
-  width: 100%;
-  height: 100%; }
-
 .swiper-slide {
   width: 100%;
   height: 100%;
@@ -7695,10 +7688,6 @@ input[type="color"] {
 .platform-android input[type="week"] {
   padding-top: 8px; }
 
-.platform-ios textarea,
-.platform-android textarea {
-  text-indent: -3px; }
-
 .item-input input,
 .item-input textarea {
   width: 100%; }

release/css/ionic.css

@@ -2,7 +2,7 @@
  * Copyright 2015 Drifty Co.
  * http://drifty.com/
  *
- * Ionic, v1.2.0
+ * Ionic, v1.2.1
  * A powerful HTML5 mobile app framework.
  * http://ionicframework.com/
  *
@@ -2556,6 +2556,13 @@ function($rootScope, $ionicBody, $compile, $timeout, $ionicPlatform, $ionicTempl
 
       return $timeout(function() {
         if (!self._isShown) return;
+        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) {
+            e.preventDefault();
+          }
+        });
         //After animating in, allow hide on backdrop click
         self.$el.on('click', function(e) {
           if (self.backdropClickToClose && e.target === self.el && stack.isHighest(self)) {
@@ -4701,8 +4708,9 @@ function($timeout, $document, $q, $ionicClickBlock, $ionicConfig, $ionicNavBarDe
           if (renderStart && renderEnd) {
             // CSS "auto" transitioned, not manually transitioned
             // wait a frame so the styles apply before auto transitioning
-            ionic.requestAnimationFrame(onReflow);
-
+            $timeout(function() {
+              ionic.requestAnimationFrame(onReflow);
+            });
           } else if (!renderEnd) {
             // just the start of a manual transition
             // but it will not render the end of the transition
@@ -6808,13 +6816,22 @@ IonicModule
       $onPulling: '&onPulling'
     });
 
+    function handleMousedown(e) {
+      e.touches = e.touches || [{
+        screenX: e.screenX,
+        screenY: e.screenY
+      }];
+      // Mouse needs this
+      startY = Math.floor(e.touches[0].screenY);
+    }
+
     function handleTouchend() {
+      // reset Y
+      startY = null;
       // if this wasn't an overscroll, get out immediately
       if (!canOverscroll && !isDragging) {
         return;
       }
-      // reset Y
-      startY = null;
       // the user has overscrolled but went back to native scrolling
       if (!isDragging) {
         dragOffset = 0;
@@ -6838,13 +6855,23 @@ IonicModule
     }
 
     function handleTouchmove(e) {
+      e.touches = e.touches || [{
+        screenX: e.screenX,
+        screenY: e.screenY
+      }];
+
+      // Force mouse events to have had a down event first
+      if(!startY && e.type == 'mousemove') {
+        return;
+      }
+
       // if multitouch or regular scroll event, get out immediately
       if (!canOverscroll || e.touches.length > 1) {
         return;
       }
       //if this is a new drag, keep track of where we start
       if (startY === null) {
-        startY = parseInt(e.touches[0].screenY, 10);
+        startY = e.touches[0].screenY;
       }
 
       // kitkat fix for touchcancel events http://updates.html5rocks.com/2014/05/A-More-Compatible-Smoother-Touch
@@ -6854,7 +6881,7 @@ IonicModule
       }
 
       // how far have we dragged so far?
-      deltaY = parseInt(e.touches[0].screenY, 10) - startY;
+      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) {
@@ -6865,7 +6892,7 @@ IonicModule
         }
 
         if (isDragging) {
-          nativescroll(scrollParent, parseInt(deltaY - dragOffset, 10) * -1);
+          nativescroll(scrollParent, deltaY - dragOffset * -1);
         }
 
         // if we're not at overscroll 0 yet, 0 out
@@ -6890,7 +6917,7 @@ IonicModule
 
       isDragging = true;
       // overscroll according to the user's drag so far
-      overscroll(parseInt((deltaY - dragOffset) / 3, 10));
+      overscroll((deltaY - dragOffset) / 3);
 
       // update the icon accordingly
       if (!activated && lastOverscroll > ptrThreshold) {
@@ -6986,7 +7013,7 @@ IonicModule
           // fraction based on the easing method
           easedT = easeOutCubic(time);
 
-        overscroll(parseInt((easedT * (Y - from)) + from, 10));
+        overscroll(Math.floor((easedT * (Y - from)) + from));
 
         if (time < 1) {
           ionic.requestAnimationFrame(scroll);
@@ -7007,6 +7034,21 @@ IonicModule
     }
 
 
+    var touchMoveEvent, touchEndEvent;
+    if (window.navigator.pointerEnabled) {
+      //touchStartEvent = 'pointerdown';
+      touchMoveEvent = 'pointermove';
+      touchEndEvent = 'pointerup';
+    } else if (window.navigator.msPointerEnabled) {
+      //touchStartEvent = 'MSPointerDown';
+      touchMoveEvent = 'MSPointerMove';
+      touchEndEvent = 'MSPointerUp';
+    } else {
+      //touchStartEvent = 'touchstart';
+      touchMoveEvent = 'touchmove';
+      touchEndEvent = 'touchend';
+    }
+
     self.init = function() {
       scrollParent = $element.parent().parent()[0];
       scrollChild = $element.parent()[0];
@@ -7016,17 +7058,24 @@ IonicModule
         throw new Error('Refresher must be immediate child of ion-content or ion-scroll');
       }
 
-      ionic.on('touchmove', handleTouchmove, scrollChild);
-      ionic.on('touchend', handleTouchend, scrollChild);
+
+      ionic.on(touchMoveEvent, handleTouchmove, scrollChild);
+      ionic.on(touchEndEvent, handleTouchend, scrollChild);
+      ionic.on('mousedown', handleMousedown, scrollChild);
+      ionic.on('mousemove', handleTouchmove, scrollChild);
+      ionic.on('mouseup', handleTouchend, scrollChild);
       ionic.on('scroll', handleScroll, scrollParent);
 
       // cleanup when done
       $scope.$on('$destroy', destroy);
     };
 
     function destroy() {
-      ionic.off('touchmove', handleTouchmove, scrollChild);
-      ionic.off('touchend', handleTouchend, scrollChild);
+      ionic.off(touchMoveEvent, handleTouchmove, scrollChild);
+      ionic.off(touchEndEvent, handleTouchend, scrollChild);
+      ionic.off('mousedown', handleMousedown, scrollChild);
+      ionic.off('mousemove', handleTouchmove, scrollChild);
+      ionic.off('mouseup', handleTouchend, scrollChild);
       ionic.off('scroll', handleScroll, scrollParent);
       scrollParent = null;
       scrollChild = null;
@@ -10464,7 +10513,15 @@ IonicModule
       this.$scope = $scope;
       this.$element = $element;
 
-      this.input = $element[0].querySelector('input,textarea');
+      this.setInputAriaLabeledBy = function(id) {
+        var inputs = $element[0].querySelectorAll('input,textarea');
+        inputs.length && inputs[0].setAttribute('aria-labelledby', id);
+      };
+
+      this.focus = function() {
+        var inputs = $element[0].querySelectorAll('input,textarea');
+        inputs.length && inputs[0].focus();
+      };
     }]
   };
 }]);
@@ -10511,12 +10568,13 @@ IonicModule
           $element.attr('id', id);
         }
 
-        if (ionInputCtrl && ionInputCtrl.input) {
-          ionInputCtrl.input.setAttribute('aria-labelledby', id);
+        if (ionInputCtrl) {
+
+          ionInputCtrl.setInputAriaLabeledBy(id);
 
           $element.on('click', function() {
             $timeout(function() {
-              ionInputCtrl.input.focus();
+              ionInputCtrl.focus();
             });
           });
         }
@@ -10545,8 +10603,8 @@ IonicModule
           $element.attr('id', id);
         }
 
-        if (ionInputCtrl && ionInputCtrl.input) {
-          ionInputCtrl.input.setAttribute('aria-labelledby', id);
+        if (ionInputCtrl) {
+          ionInputCtrl.setInputAriaLabeledBy(id);
         }
 
       };
@@ -12319,7 +12377,7 @@ function($timeout, $controller, $ionicBind, $ionicConfig) {
         if (!$scope.direction) { $scope.direction = 'y'; }
         var isPaging = $scope.$eval($scope.paging) === true;
 
-        if(nativeScrolling) {
+        if (nativeScrolling) {
           $element.addClass('overflow-scroll');
         }
 
@@ -13047,7 +13105,9 @@ function($animate, $timeout) {
       this.update = function() {
         $timeout(function() {
           _this.__slider.update();
-          _this.__slider.createLoop();
+          if (_this._options.loop) {
+            _this.__slider.createLoop();
+          }
 
           // Don't allow pager to show with > 10 slides
           if (_this.__slider.slides.length > 10) {
@@ -13073,8 +13133,10 @@ function($animate, $timeout) {
         preloadImages: false
       }, options);
 
+      this._options = newOptions;
+
       $timeout(function() {
-        var slider = new ionic.views.Swiper($element.children()[0], newOptions);
+        var slider = new ionic.views.Swiper($element.children()[0], newOptions, $scope);
 
         _this.__slider = slider;
         $scope.slider = _this.__slider;