diff --git a/dist/css/ionic.css b/dist/css/ionic.css index bc2cbb0c3b6..283baf7e50d 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /** * Copyright 2013 Drifty Co. * http://drifty.com/ @@ -2326,8 +2327,12 @@ body, .ionic-body { -webkit-transform: scale(2, 2); } } .overflow-scroll { - overflow: auto; + overflow-x: hidden; + overflow-y: scroll; -webkit-overflow-scrolling: touch; } + .overflow-scroll .scroll { + position: static; + height: 100%; } .has-header { top: 44px; } diff --git a/dist/css/themes/ionic-ios7.css b/dist/css/themes/ionic-ios7.css index 680f21850c7..1d85c360f22 100644 --- a/dist/css/themes/ionic-ios7.css +++ b/dist/css/themes/ionic-ios7.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /** * Nav controllers and header bar animations */ diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index b6e74c759ba..9fdb8691cc8 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -24576,7 +24576,7 @@ angular.module('ionic.ui.content', []) return { restrict: 'E', replace: true, - template: '
', + template: '
', transclude: true, scope: { onRefresh: '&', @@ -24618,9 +24618,16 @@ angular.module('ionic.ui.content', []) // If they want plain overflow scrolling, add that as a class if($scope.scroll === "false") { + var clone = transclude($scope.$parent); + $element.append(clone); } else if(attr.overflowScroll === "true") { c.addClass('overflow-scroll'); + var clone = transclude($scope.$parent); + $element.append(clone); } else { + var sc = document.createElement('div'); + sc.className = 'scroll'; + $element.append(sc); // Otherwise, supercharge this baby! var sv = new ionic.views.Scroll({ el: $element[0].firstElementChild, @@ -24636,11 +24643,11 @@ angular.module('ionic.ui.content', []) }); // Let child scopes access this $scope.scrollView = sv; - } - // Pass the parent scope down to the child - var clone = transclude($scope.$parent); - angular.element($element[0].firstElementChild).append(clone); + // Pass the parent scope down to the child + var clone = transclude($scope.$parent); + angular.element($element[0].firstElementChild).append(clone); + } }; } }; @@ -25779,6 +25786,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture']) return; } sideMenuCtrl._handleDrag(e); + e.gesture.srcEvent.preventDefault(); }; var dragGesture = Gesture.on('drag', dragFn, $element); diff --git a/dist/js/ionic.js b/dist/js/ionic.js index 0591d14d934..6fc4dea4bcb 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -743,7 +743,7 @@ window.ionic = { } if(this.srcEvent.preventDefault) { - this.srcEvent.preventDefault(); + //this.srcEvent.preventDefault(); } }, @@ -2145,6 +2145,7 @@ window.ionic = { // Listen for drag and release events ionic.onGesture('drag', function(e) { _this._handleDrag(e); + e.gesture.srcEvent.preventDefault(); }, this.el); ionic.onGesture('release', function(e) { _this._handleEndDrag(e); @@ -3722,6 +3723,7 @@ window.ionic = { // Listen for drag and release events window.ionic.onGesture('drag', function(e) { _this._handleDrag(e); + e.gesture.srcEvent.preventDefault(); }, this.el); window.ionic.onGesture('release', function(e) { _this._handleEndDrag(e); @@ -4612,9 +4614,9 @@ ionic.controllers.NavController = ionic.controllers.ViewController.inherit({ this._rightShowing = false; // Push the z-index of the right menu down - this.right && this.right.pushDown(); + this.right && this.right.pushDown && this.right.pushDown(); // Bring the z-index of the left menu up - this.left && this.left.bringUp(); + this.left && this.left.bringUp && this.left.bringUp(); } else { this._rightShowing = true; this._leftShowing = false; diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js index 3cdbdcaa23e..25f451a5cbe 100644 --- a/js/ext/angular/src/directive/ionicContent.js +++ b/js/ext/angular/src/directive/ionicContent.js @@ -22,7 +22,7 @@ angular.module('ionic.ui.content', []) return { restrict: 'E', replace: true, - template: '
', + template: '
', transclude: true, scope: { onRefresh: '&', @@ -64,9 +64,16 @@ angular.module('ionic.ui.content', []) // If they want plain overflow scrolling, add that as a class if($scope.scroll === "false") { + var clone = transclude($scope.$parent); + $element.append(clone); } else if(attr.overflowScroll === "true") { c.addClass('overflow-scroll'); + var clone = transclude($scope.$parent); + $element.append(clone); } else { + var sc = document.createElement('div'); + sc.className = 'scroll'; + $element.append(sc); // Otherwise, supercharge this baby! var sv = new ionic.views.Scroll({ el: $element[0].firstElementChild, @@ -82,11 +89,11 @@ angular.module('ionic.ui.content', []) }); // Let child scopes access this $scope.scrollView = sv; - } - // Pass the parent scope down to the child - var clone = transclude($scope.$parent); - angular.element($element[0].firstElementChild).append(clone); + // Pass the parent scope down to the child + var clone = transclude($scope.$parent); + angular.element($element[0].firstElementChild).append(clone); + } }; } }; diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js index 56bb3b22f66..b10e45748bc 100644 --- a/js/ext/angular/src/directive/ionicSideMenu.js +++ b/js/ext/angular/src/directive/ionicSideMenu.js @@ -68,6 +68,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture']) return; } sideMenuCtrl._handleDrag(e); + e.gesture.srcEvent.preventDefault(); }; var dragGesture = Gesture.on('drag', dragFn, $element); diff --git a/js/ext/angular/test/sideMenu.html b/js/ext/angular/test/sideMenu.html index cbe92c24589..5f10ce7d2c9 100644 --- a/js/ext/angular/test/sideMenu.html +++ b/js/ext/angular/test/sideMenu.html @@ -18,15 +18,15 @@

Slide me

-
+

Content

-
+

Left

- +