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

README.md

@@ -66,25 +66,7 @@ For most cases, you'll need AngularJS as well.  This is bundled in `js/angular/`
 
 ## Authors
 
-**Max Lynch**
-
-+ <https://twitter.com/maxlynch>
-+ <https://github.com/mlynch>
-
-**Ben Sperry**
-
-+ <https://twitter.com/benjsperry>
-+ <https://github.com/bensperry>
-
-**Adam Bradley**
-
-+ <https://twitter.com/adamdbradley>
-+ <https://github.com/adamdbradley>
-
-**Andrew Joslin**
-
-+ <https://twitter.com/andrewtjoslin>
-+ <https://github.com/ajoslin>
+Originally created by [Adam Bradley](http://twitter.com/adamdbradley), [Ben Sperry](http://twitter.com/benjsperry), and [Max Lynch](http://twitter.com/maxlynch), Ionic has seen hundreds of great [contributors](https://github.com/driftyco/ionic/graphs/contributors) from around the world, including Ionic Team Members [Andrew Joslin](http://twitter.com/andrewtjoslin), [Perry Govier](http://twitter.com/perrygovier), and [Mike Hartington](http://twitter.com/mhartington).
 
 ## Development
 

js/angular/controller/scrollController.js

@@ -67,7 +67,10 @@ function($scope, scrollViewOptions, $timeout, $window, $location, $document, $io
 
   $scope.$on('$destroy', function() {
     deregisterInstance();
-    scrollView.__cleanup();
+    //Windows: make sure the scrollView.__cleanup exists before calling it
+    if (scrollView.__cleanup) {
+        scrollView.__cleanup();
+    }
     ionic.off('resize', resize, $window);
     $window.removeEventListener('resize', resize);
     scrollViewOptions = null;

js/angular/service/viewService.js

@@ -9,6 +9,36 @@ IonicModule
     $log.warn('$ionicViewService' + oldMethod + ' is deprecated, please use $ionicHistory' + newMethod + ' instead: http://ionicframework.com/docs/nightly/api/service/$ionicHistory/');
   }
 
+  // always reset the keyboard state when change stage
+  $rootScope.$on('$stateChangeStart', function(){
+      //Windows: no hide method available
+      if (ionic.keyboard.hide) {
+          ionic.keyboard.hide();
+      }
+  });
+
+  $rootScope.$on('viewState.changeHistory', function(e, data) {
+    if(!data) return;
+
+    var hist = (data.historyId ? $rootScope.$viewHistory.histories[ data.historyId ] : null );
+    if(hist && hist.cursor > -1 && hist.cursor < hist.stack.length) {
+      // the history they're going to already exists
+      // go to it's last view in its stack
+      var view = hist.stack[ hist.cursor ];
+      return view.go(data);
+    }
+
+    // this history does not have a URL, but it does have a uiSref
+    // figure out its URL from the uiSref
+    if(!data.url && data.uiSref) {
+      data.url = $state.href(data.uiSref);
+    }
+
+    if(data.url) {
+      // don't let it start with a #, messes with $location.url()
+      if(data.url.indexOf('#') === 0) {
+        data.url = data.url.replace('#', '');
+      }
   warn('', '');
 
   var methodsMap = {

release/js/ionic-angular.js

@@ -6559,7 +6559,10 @@ function($scope, scrollViewOptions, $timeout, $window, $location, $document, $io
 
   $scope.$on('$destroy', function() {
     deregisterInstance();
-    scrollView.__cleanup();
+    //Windows: make sure the scrollView.__cleanup exists before calling it
+    if (scrollView.__cleanup) {
+        scrollView.__cleanup();
+    }
     ionic.off('resize', resize, $window);
     $window.removeEventListener('resize', resize);
     scrollViewOptions = null;

scss/_form.scss

@@ -214,10 +214,13 @@ input[type="color"] {
   }
 }
 
-input,
-textarea {
-  width: 100%;
+.item-input {
+  input,
+  textarea {
+    width: 100%;
+  }
 }
+
 textarea {
   padding-left: 0;
   @include placeholder($input-color-placeholder, -3px);
@@ -255,14 +258,16 @@ input[type="checkbox"] {
 }
 
 // Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto; // Override of generic input selector
+.item-input {
+  input[type="file"],
+  input[type="image"],
+  input[type="submit"],
+  input[type="reset"],
+  input[type="button"],
+  input[type="radio"],
+  input[type="checkbox"] {
+    width: auto; // Override of generic input selector
+  }
 }
 
 // Set the height of file to match text inputs

scss/_items.scss

@@ -474,6 +474,7 @@ button.item.item-button-right {
     max-width: $item-avatar-width;
     max-height: $item-avatar-height;
     width: 100%;
+    height: 100%;
     border-radius: $item-avatar-border-radius;
   }
 }
@@ -491,6 +492,7 @@ button.item.item-button-right {
     max-width: $item-avatar-width;
     max-height: $item-avatar-height;
     width: 100%;
+    height: 100%;
     border-radius: $item-avatar-border-radius;
   }
 }
@@ -513,6 +515,7 @@ button.item.item-button-right {
     max-width: $item-thumbnail-width;
     max-height: $item-thumbnail-height;
     width: 100%;
+    height: 100%;
   }
 }
 .item-avatar.item-complex,
@@ -536,6 +539,7 @@ button.item.item-button-right {
     max-width: $item-thumbnail-width;
     max-height: $item-thumbnail-height;
     width: 100%;
+    height: 100%;
   }
 }
 .item-avatar-right.item-complex,

scss/_platform.scss

@@ -33,7 +33,7 @@
     .has-subheader {
       top: $bar-height + $bar-subheader-height + $ios-statusbar-height;
     }
-    .has-tabs-top {
+    .has-header.has-tabs-top {
       top: $bar-height + $tabs-height + $ios-statusbar-height;
     }
     .has-header.has-subheader.has-tabs-top {

scss/_range.scss

@@ -4,7 +4,7 @@
  * --------------------------------------------------
  */
 
-input[type="range"] {
+ .range input{
   display: inline-block;
   overflow: hidden;
   margin-top: 5px;
@@ -119,4 +119,3 @@ input[type="range"] {
   padding-right: 5px;
   padding-left: 0;
 }
-

scss/_scaffolding.scss

@@ -41,6 +41,7 @@ body,
   text-rendering: optimizeLegibility;
   -webkit-backface-visibility: hidden;
   -webkit-user-drag: none;
+  -ms-content-zooming: none;
 }
 
 body.grade-b,