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

Merge branch 'master' of https://github.com/driftyco/ionic

Browse Source 
Conflicts:
	dist/js/ionic-angular.min.js
	dist/js/ionic.min.js
This commit is contained in:
Max Lynch
2014-01-13 12:10:30 -06:00
parent cd13cf396d cafde83d0d
commit e02e1c9c26
5 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,16 +47,17 @@ angular.module('ionic.ui.content', ['ionic.ui.service'])
if(attr.hasSubheader == "true") { element.addClass('has-subheader'); }
if(attr.hasFooter == "true") { element.addClass('has-footer'); }
if(attr.hasTabs == "true") { element.addClass('has-tabs'); }
if(attr.padding == "true") {
var scroll = element.find('.scroll');
if(scroll.length) {
scroll.addClass('padding');
}
}
return function link($scope, $element, $attr) {
var clone, sc, sv,
c = angular.element($element.children()[0]);
// if padding attribute is true, then add padding if it wasn't added to the .scroll
if($scope.$eval($scope.padding) === true) {
c.addClass('padding');
}
if($scope.scroll === "false") {
// No scrolling
return;