release: v1.2.2 "copenhagen"

Author: Ionitron

CHANGELOG.md

@@ -1,7 +1,7 @@
 {
   "name": "ionic",
   "version": "1.2.2",
-  "codename": "barcelona",
+  "codename": "copenhagen",
   "homepage": "https://github.com/driftyco/ionic",
   "authors": [
     "Max Lynch <max@drifty.com>",

bower.json

@@ -1 +1 @@
-copenhagen
+

config/CODENAMES

@@ -1,7 +1,7 @@
 {
   "name": "ionic-sdk",
   "private": false,
-  "version": "1.2.3",
+  "version": "1.2.2",
   "codename": "copenhagen",
   "repository": {
     "url": "git://github.com/driftyco/ionic.git"

package.json

@@ -1780,7 +1780,7 @@ IonicModule
     },
 
     scrolling: {
-      jsScrolling: false
+      jsScrolling: true
     },
 
     spinner: {
@@ -1839,8 +1839,11 @@ IonicModule
     tabs: {
       style: 'striped',
       position: 'top'
-    }
+    },
 
+    scrolling: {
+      jsScrolling: false
+    }
   });
 
   // Windows Phone
@@ -10564,7 +10567,7 @@ IonicModule
 * ```
 */
 IonicModule
-.directive('ionLabel', ['$timeout', function($timeout) {
+.directive('ionLabel', [function() {
   return {
     restrict: 'E',
     require: '?^ionInput',
@@ -10587,9 +10590,7 @@ IonicModule
           ionInputCtrl.setInputAriaLabeledBy(id);
 
           $element.on('click', function() {
-            $timeout(function() {
-              ionInputCtrl.focus();
-            });
+            ionInputCtrl.focus();
           });
         }
       };

release/js/ionic-angular.js

@@ -2975,7 +2975,7 @@ function tapMouseDown(e) {
   if (e.isIonicTap || tapIgnoreEvent(e)) return null;
 
   if (tapEnabledTouchEvents) {
-    void 0;
+    //console.log('mousedown', 'stop event');
     e.stopPropagation();
 
     if (!ionic.Platform.isEdge() && (!ionic.tap.isTextInput(e.target) || tapLastTouchTarget !== e.target) &&
@@ -3049,7 +3049,7 @@ function tapTouchStart(e) {
     var textInput = tapTargetElement(tapContainingElement(e.target));
     if (textInput !== tapActiveEle) {
       // don't preventDefault on an already focused input or else iOS's text caret isn't usable
-      void 0;
+      //console.log('Would prevent default here');
       e.preventDefault();
     }
   }
@@ -3124,7 +3124,7 @@ function tapHandleFocus(ele) {
     // already is the active element and has focus
     triggerFocusIn = true;
 
-  } else if ((/^(input|textarea)$/i).test(ele.tagName) || ele.isContentEditable) {
+  } else if ((/^(input|textarea|ion-label)$/i).test(ele.tagName) || ele.isContentEditable) {
     triggerFocusIn = true;
     ele.focus && ele.focus();
     ele.value = ele.value;
@@ -3147,7 +3147,7 @@ function tapHandleFocus(ele) {
 function tapFocusOutActive() {
   var ele = tapActiveElement();
   if (ele && ((/^(input|textarea|select)$/i).test(ele.tagName) || ele.isContentEditable)) {
-    void 0;
+    //console.log('tapFocusOutActive', ele.tagName);
     ele.blur();
   }
   tapActiveElement(null);
@@ -3168,7 +3168,7 @@ function tapFocusIn(e) {
     // 2) There is an active element which is a text input
     // 3) A text input was just set to be focused on by a touch event
     // 4) A new focus has been set, however the target isn't the one the touch event wanted
-    void 0;
+    //console.log('focusin', 'tapTouchFocusedInput');
     tapTouchFocusedInput.focus();
     tapTouchFocusedInput = null;
   }
@@ -52122,7 +52122,7 @@ IonicModule
     },
 
     scrolling: {
-      jsScrolling: false
+      jsScrolling: true
     },
 
     spinner: {
@@ -52181,8 +52181,11 @@ IonicModule
     tabs: {
       style: 'striped',
       position: 'top'
-    }
+    },
 
+    scrolling: {
+      jsScrolling: false
+    }
   });
 
   // Windows Phone
@@ -60906,7 +60909,7 @@ IonicModule
 * ```
 */
 IonicModule
-.directive('ionLabel', ['$timeout', function($timeout) {
+.directive('ionLabel', [function() {
   return {
     restrict: 'E',
     require: '?^ionInput',
@@ -60929,9 +60932,7 @@ IonicModule
           ionInputCtrl.setInputAriaLabeledBy(id);
 
           $element.on('click', function() {
-            $timeout(function() {
-              ionInputCtrl.focus();
-            });
+            ionInputCtrl.focus();
           });
         }
       };

release/js/ionic-angular.min.js

@@ -2968,7 +2968,7 @@ function tapMouseDown(e) {
   if (e.isIonicTap || tapIgnoreEvent(e)) return null;
 
   if (tapEnabledTouchEvents) {
-    void 0;
+    //console.log('mousedown', 'stop event');
     e.stopPropagation();
 
     if (!ionic.Platform.isEdge() && (!ionic.tap.isTextInput(e.target) || tapLastTouchTarget !== e.target) &&
@@ -3042,7 +3042,7 @@ function tapTouchStart(e) {
     var textInput = tapTargetElement(tapContainingElement(e.target));
     if (textInput !== tapActiveEle) {
       // don't preventDefault on an already focused input or else iOS's text caret isn't usable
-      void 0;
+      //console.log('Would prevent default here');
       e.preventDefault();
     }
   }
@@ -3117,7 +3117,7 @@ function tapHandleFocus(ele) {
     // already is the active element and has focus
     triggerFocusIn = true;
 
-  } else if ((/^(input|textarea)$/i).test(ele.tagName) || ele.isContentEditable) {
+  } else if ((/^(input|textarea|ion-label)$/i).test(ele.tagName) || ele.isContentEditable) {
     triggerFocusIn = true;
     ele.focus && ele.focus();
     ele.value = ele.value;
@@ -3140,7 +3140,7 @@ function tapHandleFocus(ele) {
 function tapFocusOutActive() {
   var ele = tapActiveElement();
   if (ele && ((/^(input|textarea|select)$/i).test(ele.tagName) || ele.isContentEditable)) {
-    void 0;
+    //console.log('tapFocusOutActive', ele.tagName);
     ele.blur();
   }
   tapActiveElement(null);
@@ -3161,7 +3161,7 @@ function tapFocusIn(e) {
     // 2) There is an active element which is a text input
     // 3) A text input was just set to be focused on by a touch event
     // 4) A new focus has been set, however the target isn't the one the touch event wanted
-    void 0;
+    //console.log('focusin', 'tapTouchFocusedInput');
     tapTouchFocusedInput.focus();
     tapTouchFocusedInput = null;
   }