diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 61a93d3aaf..c6b5bf0b1b 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -797,7 +797,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges // Compile the template with the new scrope, and append it to the navigation's content area var el = $compile(templateString)(childScope, function(cloned, scope) { - var content = angular.element($element[0].querySelector('.content')); + var content = angular.element($element[0].querySelector('.content, .scroll')); //content.append(cloned); //angular.element(content).append(cloned); diff --git a/dist/js/ionic.js b/dist/js/ionic.js index 3eb612815c..13271d85df 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -1990,7 +1990,7 @@ window.ionic = { dragThreshold: 10, // Resistance when scrolling too far up or down - rubberBandResistance: 3, + rubberBandResistance: 2, // Scroll event names. These are custom so can be configured scrollEventName: 'momentumScrolled', diff --git a/js/ext/angular/src/directive/ionicNav.js b/js/ext/angular/src/directive/ionicNav.js index 128ff4cbba..84f284b4b4 100644 --- a/js/ext/angular/src/directive/ionicNav.js +++ b/js/ext/angular/src/directive/ionicNav.js @@ -57,7 +57,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges // Compile the template with the new scrope, and append it to the navigation's content area var el = $compile(templateString)(childScope, function(cloned, scope) { - var content = angular.element($element[0].querySelector('.content')); + var content = angular.element($element[0].querySelector('.content, .scroll')); //content.append(cloned); //angular.element(content).append(cloned); diff --git a/js/ext/angular/test/nav.html b/js/ext/angular/test/nav.html index 23a933f219..4fe1fef4f3 100644 --- a/js/ext/angular/test/nav.html +++ b/js/ext/angular/test/nav.html @@ -7,9 +7,9 @@ - - - + + +