javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-06 22:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #64 and fixed sub view controllers and tabs

Browse Source 
Moved tabs to be absolute not fixed so they can easily
be placed inside of containers
This commit is contained in:
Max Lynch
2013-11-08 18:09:48 -06:00
parent c73cc43c21
commit 6ab1f49688
14 changed files with 145 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
transclude: true,
controller: 'TabsCtrl',
//templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html',
template: '<div class="view"><tab-controller-bar></tab-controller-bar></div>',
template: '<div class="content"><tab-controller-bar></tab-controller-bar></div>',
compile: function(element, attr, transclude, tabsCtrl) {
return function($scope, $element, $attr) {
$scope.$watch('activeAnimation', function(value) {

37
js/ext/angular/test/subControllers.html
View File

@ -6,14 +6,14 @@
<!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="/vendor/font-awesome/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../../../dist/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>
<link rel="stylesheet" href="../../../../dist/css/ionic.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.3/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.3/angular-touch.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0-rc.3/angular-animate.js"></script>
</head>
<body>
<side-menus>
<side-menu>
<pane side-menu-content>
<header class="bar bar-header bar-dark">
<a href="#" class="button"><i class="icon-reorder"></i></a>
@ -32,9 +32,8 @@
</ul>
</menu>
<menu side="right">
<h2>Items</h2>
<tab-controller>
<div title="Home" icon="icon-home" class="tab-content">
<tabs>
<tab title="Home" icon="icon-home" class="tab-content">
<header class="bar bar-header bar-dark">
<h1 class="title">Tab Bars</h1>
</header>
@ -46,34 +45,32 @@
</a>
</ul>
</content>
</div>
</tab>
<div title="About" icon="icon-info" class="tab-content">
<tab title="About" icon="icon-info" class="tab-content">
<header class="bar bar-header bar-success">
<h1 class="title">About</h1>
</header>
<content has-header="true" has-tabs="true">
<h1>About Us</h1>
</content>
</div>
</tab>
<div title="Settings" icon="icon-gear" class="tab-content">
<tab title="Settings" icon="icon-gear" class="tab-content">
<header class="bar bar-header bar-dark">
<h1 class="title">Settings</h1>
</header>
<content has-header="true" has-tabs="true">
<h1>Settings</h1>
</content>
</div>
</tab-controller>
</tab>
</tabs>
</menu>
</side-menus>
<script src="../../../../dist/ionic.js"></script>
<script src="../src/directive/ionicContent.js"></script>
<script src="../src/directive/ionicSideMenu.js"></script>
<script src="../src/directive/ionicTabBar.js"></script>
</side-menu>
<script src="../../../../dist/js/ionic.js"></script>
<script src="../../../../dist/js/ionic-angular.js"></script>
<script>
angular.module('sideMenuTest', ['ionic.ui.content', 'ionic.ui.sideMenu', 'ionic.ui.tabs'])
angular.module('sideMenuTest', ['ionic']);
/*
var Controller = function(opts) {