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
dist/js/ionic-angular.js vendored
View File

@@ -1233,16 +1233,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;

2
dist/js/ionic-angular.min.js vendored
View File

File diff suppressed because one or more lines are too long

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;

8
js/ext/angular/test/directive/ionicContent.unit.js
View File

@@ -20,6 +20,14 @@ describe('Ionic Content directive', function() {
expect(element.hasClass('has-header')).toEqual(true);
});
it('should add padding classname', function() {
element = compile('<content padding="true"></content>')(scope);
expect(element.hasClass('scroll-content')).toEqual(true);
expect(element.hasClass('padding')).toEqual(false);
var scrollElement = element.find('.scroll');
expect(scrollElement.hasClass('padding')).toEqual(true);
});
/**
* Not currently possible to mock this AFAIK
*/

6
js/ext/angular/test/tabs.html
View File

@@ -94,7 +94,7 @@
<header class="bar bar-header bar-positive">
<h1 class="title">Deadlines</h1>
</header>
<content has-header="true">
<content has-header="true" padding="true">
<h1>Deadlines</h1>
</content>
</tab>
@@ -103,7 +103,7 @@
<header class="bar bar-header bar-positive">
<h1 class="title">Settings</h1>
</header>
<content has-header="true">
<content has-header="true" padding="true">
<h1>Settings</h1>
</content>
</tab>
@@ -112,7 +112,7 @@
<header class="bar bar-header bar-positive">
<h1 class="title">Settings</h1>
</header>
<content has-header="true">
<content has-header="true" padding="true">
<h1>Settings</h1>
</content>
</tab>