diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index e7e7cd991c..6c6a7c3f72 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -637,7 +637,7 @@ angular.module('ionic.ui.content', []) link: function(scope, element, attr) { element.addClass('pane'); } - } + }; }) // The content directive is a core scrollable content area @@ -656,11 +656,14 @@ angular.module('ionic.ui.content', []) }, compile: function(element, attr, transclude) { return function($scope, $element, $attr) { - var c = $element.eq(0); + var + c = $element.eq(0), + scroll = $element[0].querySelector('.scroll'), + clone, + sc, + sv; - var scroll = $element[0].querySelector('.scroll'); - - if(scroll && attr.padding) { + if(scroll && attr.padding == "true") { scroll.classList.add('padding'); } @@ -688,18 +691,18 @@ 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); + clone = transclude($scope.$parent); $element.append(clone); } else if(attr.overflowScroll === "true") { c.addClass('overflow-scroll'); - var clone = transclude($scope.$parent); + clone = transclude($scope.$parent); $element.append(clone); } else { - var sc = document.createElement('div'); + sc = document.createElement('div'); sc.className = 'scroll'; $element.append(sc); // Otherwise, supercharge this baby! - var sv = new ionic.views.Scroll({ + sv = new ionic.views.Scroll({ el: $element[0].firstElementChild, hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'), onRefresh: function() { @@ -715,7 +718,7 @@ angular.module('ionic.ui.content', []) $scope.scrollView = sv; // Pass the parent scope down to the child - var clone = transclude($scope.$parent); + clone = transclude($scope.$parent); angular.element($element[0].firstElementChild).append(clone); } }; @@ -744,7 +747,7 @@ angular.module('ionic.ui.content', []) $scope.$on('scroll.onRefreshOpening', onRefreshOpening); } - } + }; }) .directive('scroll-refresher', function() { @@ -753,7 +756,7 @@ angular.module('ionic.ui.content', []) replace: true, transclude: true, template: '
' - } + }; }); diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js index 25f451a5cb..d3d4043df6 100644 --- a/js/ext/angular/src/directive/ionicContent.js +++ b/js/ext/angular/src/directive/ionicContent.js @@ -13,7 +13,7 @@ angular.module('ionic.ui.content', []) link: function(scope, element, attr) { element.addClass('pane'); } - } + }; }) // The content directive is a core scrollable content area @@ -32,11 +32,14 @@ angular.module('ionic.ui.content', []) }, compile: function(element, attr, transclude) { return function($scope, $element, $attr) { - var c = $element.eq(0); + var + c = $element.eq(0), + scroll = $element[0].querySelector('.scroll'), + clone, + sc, + sv; - var scroll = $element[0].querySelector('.scroll'); - - if(scroll && attr.padding) { + if(scroll && attr.padding == "true") { scroll.classList.add('padding'); } @@ -64,18 +67,18 @@ 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); + clone = transclude($scope.$parent); $element.append(clone); } else if(attr.overflowScroll === "true") { c.addClass('overflow-scroll'); - var clone = transclude($scope.$parent); + clone = transclude($scope.$parent); $element.append(clone); } else { - var sc = document.createElement('div'); + sc = document.createElement('div'); sc.className = 'scroll'; $element.append(sc); // Otherwise, supercharge this baby! - var sv = new ionic.views.Scroll({ + sv = new ionic.views.Scroll({ el: $element[0].firstElementChild, hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'), onRefresh: function() { @@ -91,7 +94,7 @@ angular.module('ionic.ui.content', []) $scope.scrollView = sv; // Pass the parent scope down to the child - var clone = transclude($scope.$parent); + clone = transclude($scope.$parent); angular.element($element[0].firstElementChild).append(clone); } }; @@ -120,7 +123,7 @@ angular.module('ionic.ui.content', []) $scope.$on('scroll.onRefreshOpening', onRefreshOpening); } - } + }; }) .directive('scroll-refresher', function() { @@ -129,7 +132,7 @@ angular.module('ionic.ui.content', []) replace: true, transclude: true, template: '
' - } + }; });