javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tab demo

Browse Source
This commit is contained in:
Max Lynch
2013-10-14 16:10:59 -05:00
parent 38b8c6e4b1
commit b0923f84b5
12 changed files with 79 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,9 @@ angular.module('ionic.ui.content', [])
if(attr.hasHeader) {
c.addClass('has-header');
}
if(attr.hasFooter) {
c.addClass('has-footer');
}
if(attr.hasTabs) {
c.addClass('has-tabs');
}

1
js/ext/angular/src/directive/ionicList.js vendored
View File

@ -60,7 +60,6 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
$scope.$watch('isEditing', function(v) {
_this.isEditing = true;
console.log('Is Editing Changed', v);
});
},

21
js/ext/angular/src/directive/ionicTabBar.js vendored
View File

@ -46,13 +46,21 @@ angular.module('ionic.ui.tabs', [])
return {
restrict: 'CA',
replace: true,
transclude: true,
template: '<div ng-show="isVisible" ng-transclude></div>',
require: '^tabController',
scope: true,
link: function(scope, element, attrs, tabsCtrl) {
scope.$watch('isVisible', function(value) {
if(!value) {
element[0].style.display = 'none';
} else {
element[0].style.display = 'block';
}
});
scope.title = attrs.title;
scope.icon = attrs.icon;
scope.iconOn = attrs.iconOn;
scope.iconOff = attrs.iconOff;
tabsCtrl.addController(scope);
}
}
@ -67,7 +75,7 @@ angular.module('ionic.ui.tabs', [])
replace: true,
scope: true,
template: '<div class="tabs tabs-primary">' +
'<tab-item title="{{controller.title}}" icon="{{controller.icon}}" active="controller.isVisible" index="$index" ng-repeat="controller in controllers"></tab-item>' +
'<tab-item title="{{controller.title}}" icon="{{controller.icon}}" icon-on="{{controller.iconOn}}" icon-off="{{controller.iconOff}}" active="controller.isVisible" index="$index" ng-repeat="controller in controllers"></tab-item>' +
'</div>'
}
})
@ -79,7 +87,8 @@ angular.module('ionic.ui.tabs', [])
require: '^tabController',
scope: {
title: '@',
icon: '@',
iconOn: '@',
iconOff: '@',
active: '=',
tabSelected: '@',
index: '='
@ -92,7 +101,9 @@ angular.module('ionic.ui.tabs', [])
},
template:
'<a href="#" ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' +
'<i class="{{icon}}"></i> {{title}}' +
'<i class="{{icon}}" ng-if="icon"></i>' +
'<i class="{{iconOn}}" ng-if="active"></i>' +
'<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' +
'</a>'
}
});

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

@ -4,43 +4,46 @@
<title>Tab Bars</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="stylesheet" href="../../../../dist/ionic.css">
<link rel="stylesheet" href="../../../../dist/css/ionic.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular-touch.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.2/angular-animate.js"></script>
<style>
.content {
height: 100%;
}
</style>
</head>
<body>
<tab-controller>
<div title="Home" icon="icon-home" class="tab-content">
<header class="bar bar-header bar-dark">
<h1 class="title">Tab Bars</h1>
<div title="Home" icon-on="icon-ios7-filing" icon-off="icon-ios7-filing-outline" class="tab-content" ng-controller="HomeCtrl">
<header class="bar bar-header bar-secondary">
<h1 class="title">Tasks</h1>
<button class="button button-clear button-primary" ng-click="isEditingItems = !isEditingItems">Edit</button>
</header>
<content has-header="true" has-tabs="true">
<h1>Home</h1>
<ul class="list" ng-controller="HomeCtrl">
<a href="#" class="list-item" ng-repeat="item in items">
<list is-editing="isEditingItems" animation="my-repeat-animation" delete-icon="icon-minus-circled" reorder-icon="icon-navicon">
<list-item ng-repeat="item in items"
buttons="item.buttons"
can-delete="true"
can-reorder="true"
can-swipe="true"
on-delete="deleteProject(project)"
on-select="selectProject(project)">
{{item.title}}
</a>
</ul>
<i class="{{item.icon}}"></i>
</list-item>
</list>
</content>
</div>
<div title="About" icon="icon-info" class="tab-content">
<header class="bar bar-header bar-success">
<h1 class="title">About</h1>
<div title="About" icon-on="icon-ios7-clock" icon-off="icon-ios7-clock-outline" class="tab-content">
<header class="bar bar-header bar-secondary">
<h1 class="title">Deadlines</h1>
</header>
<content has-header="true" has-tabs="true">
<h1>About Us</h1>
<h1>Deadlines</h1>
</content>
</div>
<div title="Settings" icon="icon-gear" class="tab-content">
<header class="bar bar-header bar-dark">
<div title="Settings" icon-on="icon-ios7-gear" icon-off="icon-ios7-gear-outline" class="tab-content">
<header class="bar bar-header bar-secondary">
<h1 class="title">Settings</h1>
</header>
<content has-header="true" has-tabs="true">
@ -49,17 +52,16 @@
</div>
</tab-controller>
<script src="../../../../dist/ionic.js"></script>
<script src="../src/directive/ionicContent.js"></script>
<script src="../src/directive/ionicTabBar.js"></script>
<script src="../../../../dist/js/ionic.js"></script>
<script src="../../../../dist/js/ionic-angular.js"></script>
<script>
angular.module('tabsTest', ['ionic.ui.tabs'])
angular.module('tabsTest', ['ionic.ui'])
.controller('HomeCtrl', function($scope) {
$scope.items = [];
for(var i = 0; i < 100; i++) {
for(var i = 0; i < 30; i++) {
$scope.items.push({
title: 'Item ' + i
title: 'Task ' + (i + 1)
});
}
})