javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

update content directive attr.padding == "true"

Browse Source
This commit is contained in:
Adam Bradley
2013-11-25 17:08:56 -06:00
parent bb911471e6
commit 15eb13d2ea
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dist/js/ionic-angular.js vendored
View File

@@ -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: '<div class="scroll-refresher"><div class="scroll-refresher-content"></div></div>'
}
};
});

27
js/ext/angular/src/directive/ionicContent.js vendored
View File

@@ -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: '<div class="scroll-refresher"><div class="scroll-refresher-content"></div></div>'
}
};
});