fix(ionContent): make scrollable content work as child of non-scrollable

Closes #1421
ionic-team · May 19, 2014 · 488bd5c · 488bd5c · leefernandes · May 23, 2014
1 parent 37d0627
commit 488bd5c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/js/angular/directive/content.js b/js/angular/directive/content.js
@@ -79,7 +79,6 @@ function($timeout, $controller, $ionicBind) {
           $onScroll: '&onScroll',
           $onScrollComplete: '&onScrollComplete',
           hasBouncing: '@',
-          scroll: '@',
           padding: '@',
           hasScrollX: '@',
           hasScrollY: '@',
@@ -96,7 +95,7 @@ function($timeout, $controller, $ionicBind) {
           });
         }
 
-        if ($scope.scroll === "false") {
+        if ($attr.scroll === "false") {
           //do nothing
         } else if(attr.overflowScroll === "true") {
           $element.addClass('overflow-scroll');

diff --git a/test/unit/angular/directive/content.unit.js b/test/unit/angular/directive/content.unit.js
@@ -75,6 +75,20 @@ describe('Ionic Content directive', function() {
     expect(scroll.length).toBe(0);
   });
 
+  it('should work scrollable with nested ionScroll elements', function() {
+    var element = compile(
+      '<ion-content scroll="false" class="content1">' +
+        '<div>' +
+          '<ion-content class="content2">' +
+          '</ion-content>' +
+        '</div>' +
+      '</ion-content>')(scope);
+    scope.$apply();
+
+    expect(jqLite(element[0].querySelector('.content2')).controller('$ionicScroll')).toBeTruthy();
+    expect(element.controller('$ionicScroll')).toBeFalsy();
+  });
+
   it('should add padding classname to scroll element', function() {
     var element = compile('<ion-content padding="shouldPad"></ion-content>')(scope);
     var scroll = element.find('.scroll');