Merge branch 'master' of github.com:driftyco/ionic

Author: perrygovier

js/angular/directive/slideBox.js

@@ -37,12 +37,13 @@
  */
 IonicModule
 .directive('ionSlideBox', [
+  '$animate',
   '$timeout',
   '$compile',
   '$ionicSlideBoxDelegate',
   '$ionicHistory',
   '$ionicScrollDelegate',
-function($timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScrollDelegate) {
+function($animate, $timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScrollDelegate) {
   return {
     restrict: 'E',
     replace: true,
@@ -155,6 +156,9 @@ function($timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScroll
     '</div>',
 
     link: function($scope, $element, $attr) {
+      // Disable ngAnimate for slidebox and its children
+      $animate.enabled(false, $element);
+
       // if showPager is undefined, show the pager
       if (!isDefined($attr.showPager)) {
         $scope.showPager = true;

js/angular/directive/tabs.js

@@ -25,7 +25,7 @@
  *
  * @usage
  * ```html
- * <ion-tabs class="tabs-positive tabs-icon-only">
+ * <ion-tabs class="tabs-positive tabs-icon-top">
  *
  *   <ion-tab title="Home" icon-on="ion-ios-filing" icon-off="ion-ios-filing-outline">
  *     <!-- Tab 1 content -->

js/angular/service/backdrop.js

@@ -18,24 +18,39 @@
  * For example, if `retain` is called three times, the backdrop will be shown until `release`
  * is called three times.
  *
+ * **Notes:**
+ * - The backdrop service will broadcast 'backdrop.shown' and 'backdrop.hidden' events from the root scope,
+ * this is useful for alerting native components not in html.
+ *
  * @usage
  *
  * ```js
- * function MyController($scope, $ionicBackdrop, $timeout) {
+ * function MyController($scope, $ionicBackdrop, $timeout, $rootScope) {
  *   //Show a backdrop for one second
  *   $scope.action = function() {
  *     $ionicBackdrop.retain();
  *     $timeout(function() {
  *       $ionicBackdrop.release();
  *     }, 1000);
  *   };
+ *
+ *   // Execute action on backdrop disappearing
+ *   $scope.$on('backdrop.hidden', function() {
+ *     // Execute action
+ *   });
+ *
+ *   // Execute action on backdrop appearing
+ *   $scope.$on('backdrop.shown', function() {
+ *     // Execute action
+ *   });
+ *
  * }
  * ```
  */
 IonicModule
 .factory('$ionicBackdrop', [
-  '$document', '$timeout', '$$rAF',
-function($document, $timeout, $$rAF) {
+  '$document', '$timeout', '$$rAF', '$rootScope',
+function($document, $timeout, $$rAF, $rootScope) {
 
   var el = jqLite('<div class="backdrop">');
   var backdropHolds = 0;
@@ -67,6 +82,7 @@ function($document, $timeout, $$rAF) {
     backdropHolds++;
     if (backdropHolds === 1) {
       el.addClass('visible');
+      $rootScope.$broadcast('backdrop.shown');
       $$rAF(function() {
         // If we're still at >0 backdropHolds after async...
         if (backdropHolds >= 1) el.addClass('active');
@@ -76,6 +92,7 @@ function($document, $timeout, $$rAF) {
   function release() {
     if (backdropHolds === 1) {
       el.removeClass('active');
+      $rootScope.$broadcast('backdrop.hidden');
       $timeout(function() {
         // If we're still at 0 backdropHolds after async...
         if (backdropHolds === 0) el.removeClass('visible');

js/utils/keyboard.js

@@ -95,6 +95,12 @@ var keyboardLandscapeViewportHeight = 0;
  */
 var keyboardActiveElement;
 
+/**
+ * The previously focused input used to reset keyboard after focusing on a
+ * new non-keyboard element
+ */
+var lastKeyboardActiveElement;
+
 /**
  * The scroll view containing the currently focused input.
  */
@@ -311,6 +317,9 @@ function keyboardFocusIn(e) {
       e.target.readOnly ||
       !ionic.tap.isKeyboardElement(e.target) ||
       !(scrollView = ionic.DomUtil.getParentWithClass(e.target, SCROLL_CONTAINER_CSS))) {
+    if (keyboardActiveElement) {
+        lastKeyboardActiveElement = keyboardActiveElement;
+    }
     keyboardActiveElement = null;
     return;
   }
@@ -546,9 +555,9 @@ function keyboardHide() {
   ionic.keyboard.isOpen = false;
   ionic.keyboard.isClosing = false;
 
-  if (keyboardActiveElement) {
+  if (keyboardActiveElement || lastKeyboardActiveElement) {
     ionic.trigger('resetScrollView', {
-      target: keyboardActiveElement
+      target: keyboardActiveElement || lastKeyboardActiveElement
     }, true);
   }
 
@@ -572,6 +581,7 @@ function keyboardHide() {
   }
 
   keyboardActiveElement = null;
+  lastKeyboardActiveElement = null;
 }
 
 /**

release/js/ionic-angular.js

@@ -238,7 +238,7 @@ jqLite.prototype.addClass = function(cssClasses) {
       el = this[x];
       if (el.setAttribute) {
 
-        if (cssClasses.indexOf(' ') < 0 && el.classList.add) {
+        if (cssClasses.indexOf(' ') < 0 && el.classList && el.classList.add) {
           el.classList.add(cssClasses);
         } else {
           existingClasses = (' ' + (el.getAttribute('class') || '') + ' ')
@@ -13532,4 +13532,4 @@ IonicModule
   };
 });
 
-})();
+})();

scss/_button-bar.scss

@@ -51,6 +51,9 @@
     border-right-width: 1px;
     border-radius: 0px $button-border-radius $button-border-radius 0px;
   }
+  &:only-child {
+    border-radius: $button-border-radius;
+  }
 }
 
 .button-bar > .button-small {

scss/_checkbox.scss

@@ -127,6 +127,10 @@ input:checked + .checkbox-icon:before {
   height: 7px;
 }
 
+.platform-android .item-checkbox-right .checkbox-square .checkbox-icon::after {
+  top: 31%;
+}
+
 .grade-c .checkbox input:after,
 .grade-c .checkbox-icon:after {
   @include rotate(0);

scss/_form.scss

@@ -156,6 +156,15 @@ textarea {
   height: $line-height-computed + $font-size-base + 12px;
 }
 
+.item-select.item-stacked-label select {
+  position: relative; 
+  padding: 0px; 
+  max-width: 90%; 
+  direction:ltr; 
+  white-space: pre-wrap;
+  margin: -3px;
+}
+
 .item-floating-label {
   display: block;
   background-color: transparent;

test/html/sideMenu.html

@@ -15,9 +15,9 @@
 
         <ion-side-menu-content edge-drag-threshold="true" drag-content="!$root.disableDrag">
           <header class="bar bar-header bar-positive">
-            <button class="button button-icon ion-navicon" ng-click="toggleLeft()" ng-hide="$exposeAside.active"></button>
+            <button class="button button-icon ion-navicon" menu-toggle="left" ng-hide="$exposeAside.active"></button>
             <h1 class="title">Slide me</h1>
-            <button class="button button-icon ion-navicon" ng-click="toggleRight()"></button>
+            <button class="button button-icon ion-navicon" menu-toggle="right"></button>
           </header>
           <ion-content class="has-header">
             <ion-toggle ng-model="$root.disableDrag">Disable Drag Content?</ion-toggle>
@@ -67,9 +67,6 @@ <h1 class="title">Right</h1>
 
       .controller('MenuCtrl', function($scope, $ionicSideMenuDelegate) {
 
-        $scope.toggleLeft = $ionicSideMenuDelegate.toggleLeft;
-        $scope.toggleRight = $ionicSideMenuDelegate.toggleRight;
-
         $scope.list = [];
         for(var i = 0; i < 20; i++) {
           $scope.list.push({