Skip to content

Commit 15eb13d

Browse files
author
Adam Bradley
committed
update content directive attr.padding == "true"
1 parent bb91147 commit 15eb13d

File tree

2 files changed

+32
-26
lines changed

2 files changed

+32
-26
lines changed

dist/js/ionic-angular.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ angular.module('ionic.ui.content', [])
637637
link: function(scope, element, attr) {
638638
element.addClass('pane');
639639
}
640-
}
640+
};
641641
})
642642

643643
// The content directive is a core scrollable content area
@@ -656,11 +656,14 @@ angular.module('ionic.ui.content', [])
656656
},
657657
compile: function(element, attr, transclude) {
658658
return function($scope, $element, $attr) {
659-
var c = $element.eq(0);
660-
661-
var scroll = $element[0].querySelector('.scroll');
662-
663-
if(scroll && attr.padding) {
659+
var
660+
c = $element.eq(0),
661+
scroll = $element[0].querySelector('.scroll'),
662+
clone,
663+
sc,
664+
sv;
665+
666+
if(scroll && attr.padding == "true") {
664667
scroll.classList.add('padding');
665668
}
666669

@@ -688,18 +691,18 @@ angular.module('ionic.ui.content', [])
688691

689692
// If they want plain overflow scrolling, add that as a class
690693
if($scope.scroll === "false") {
691-
var clone = transclude($scope.$parent);
694+
clone = transclude($scope.$parent);
692695
$element.append(clone);
693696
} else if(attr.overflowScroll === "true") {
694697
c.addClass('overflow-scroll');
695-
var clone = transclude($scope.$parent);
698+
clone = transclude($scope.$parent);
696699
$element.append(clone);
697700
} else {
698-
var sc = document.createElement('div');
701+
sc = document.createElement('div');
699702
sc.className = 'scroll';
700703
$element.append(sc);
701704
// Otherwise, supercharge this baby!
702-
var sv = new ionic.views.Scroll({
705+
sv = new ionic.views.Scroll({
703706
el: $element[0].firstElementChild,
704707
hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'),
705708
onRefresh: function() {
@@ -715,7 +718,7 @@ angular.module('ionic.ui.content', [])
715718
$scope.scrollView = sv;
716719

717720
// Pass the parent scope down to the child
718-
var clone = transclude($scope.$parent);
721+
clone = transclude($scope.$parent);
719722
angular.element($element[0].firstElementChild).append(clone);
720723
}
721724
};
@@ -744,7 +747,7 @@ angular.module('ionic.ui.content', [])
744747

745748
$scope.$on('scroll.onRefreshOpening', onRefreshOpening);
746749
}
747-
}
750+
};
748751
})
749752

750753
.directive('scroll-refresher', function() {
@@ -753,7 +756,7 @@ angular.module('ionic.ui.content', [])
753756
replace: true,
754757
transclude: true,
755758
template: '<div class="scroll-refresher"><div class="scroll-refresher-content"></div></div>'
756-
}
759+
};
757760
});
758761

759762

js/ext/angular/src/directive/ionicContent.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ angular.module('ionic.ui.content', [])
1313
link: function(scope, element, attr) {
1414
element.addClass('pane');
1515
}
16-
}
16+
};
1717
})
1818

1919
// The content directive is a core scrollable content area
@@ -32,11 +32,14 @@ angular.module('ionic.ui.content', [])
3232
},
3333
compile: function(element, attr, transclude) {
3434
return function($scope, $element, $attr) {
35-
var c = $element.eq(0);
36-
37-
var scroll = $element[0].querySelector('.scroll');
38-
39-
if(scroll && attr.padding) {
35+
var
36+
c = $element.eq(0),
37+
scroll = $element[0].querySelector('.scroll'),
38+
clone,
39+
sc,
40+
sv;
41+
42+
if(scroll && attr.padding == "true") {
4043
scroll.classList.add('padding');
4144
}
4245

@@ -64,18 +67,18 @@ angular.module('ionic.ui.content', [])
6467

6568
// If they want plain overflow scrolling, add that as a class
6669
if($scope.scroll === "false") {
67-
var clone = transclude($scope.$parent);
70+
clone = transclude($scope.$parent);
6871
$element.append(clone);
6972
} else if(attr.overflowScroll === "true") {
7073
c.addClass('overflow-scroll');
71-
var clone = transclude($scope.$parent);
74+
clone = transclude($scope.$parent);
7275
$element.append(clone);
7376
} else {
74-
var sc = document.createElement('div');
77+
sc = document.createElement('div');
7578
sc.className = 'scroll';
7679
$element.append(sc);
7780
// Otherwise, supercharge this baby!
78-
var sv = new ionic.views.Scroll({
81+
sv = new ionic.views.Scroll({
7982
el: $element[0].firstElementChild,
8083
hasPullToRefresh: (typeof $scope.onRefresh !== 'undefined'),
8184
onRefresh: function() {
@@ -91,7 +94,7 @@ angular.module('ionic.ui.content', [])
9194
$scope.scrollView = sv;
9295

9396
// Pass the parent scope down to the child
94-
var clone = transclude($scope.$parent);
97+
clone = transclude($scope.$parent);
9598
angular.element($element[0].firstElementChild).append(clone);
9699
}
97100
};
@@ -120,7 +123,7 @@ angular.module('ionic.ui.content', [])
120123

121124
$scope.$on('scroll.onRefreshOpening', onRefreshOpening);
122125
}
123-
}
126+
};
124127
})
125128

126129
.directive('scroll-refresher', function() {
@@ -129,7 +132,7 @@ angular.module('ionic.ui.content', [])
129132
replace: true,
130133
transclude: true,
131134
template: '<div class="scroll-refresher"><div class="scroll-refresher-content"></div></div>'
132-
}
135+
};
133136
});
134137

135138

0 commit comments

Comments
 (0)