javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 06:57:02 +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
dist/css/ionic.css vendored
View File

@ -2844,7 +2844,7 @@ a.subdued‎ {
background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%); background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%);
border-color: #dddddd; border-color: #dddddd;
color: #333333; color: #333333;
position: fixed; position: absolute;
bottom: 0; bottom: 0;
z-index: 5; z-index: 5;
width: 100%; width: 100%;

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

@ -1223,7 +1223,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
transclude: true, transclude: true,
controller: 'TabsCtrl', controller: 'TabsCtrl',
//templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html', //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) { compile: function(element, attr, transclude, tabsCtrl) {
return function($scope, $element, $attr) { return function($scope, $element, $attr) {
$scope.$watch('activeAnimation', function(value) { $scope.$watch('activeAnimation', function(value) {

79
dist/js/ionic.js vendored
View File

@ -2716,11 +2716,10 @@ window.ionic = {
* You see it all over iOS apps, where it offers a set of options * You see it all over iOS apps, where it offers a set of options
* triggered after an action. * triggered after an action.
*/ */
ionic.views.ActionSheet = function(opts) { ionic.views.ActionSheet = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
}; },
ionic.views.ActionSheet.prototype = {
show: function() { show: function() {
// Force a reflow so the animation will actually run // Force a reflow so the animation will actually run
this.el.offsetWidth; this.el.offsetWidth;
@ -2732,20 +2731,19 @@ window.ionic = {
this.el.offsetWidth; this.el.offsetWidth;
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
}; });
})(ionic); })(ionic);
; ;
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.Checkbox = function(opts) { ionic.views.Checkbox = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this.checkbox = opts.checkbox; this.checkbox = opts.checkbox;
this.handle = opts.handle; this.handle = opts.handle;
}; },
ionic.views.Checkbox.prototype = {
tap: function(e) { tap: function(e) {
this.val( !this.checkbox.checked ); this.val( !this.checkbox.checked );
@ -2757,21 +2755,19 @@ window.ionic = {
} }
return this.checkbox.checked; return this.checkbox.checked;
} }
});
};
})(ionic); })(ionic);
; ;
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.HeaderBar = function(opts) { ionic.views.HeaderBar = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this._titleEl = this.el.querySelector('.title'); this._titleEl = this.el.querySelector('.title');
}; },
ionic.views.HeaderBar.prototype = {
resizeTitle: function() { resizeTitle: function() {
var e, j, i, var e, j, i,
title, title,
@ -2787,7 +2783,7 @@ window.ionic = {
titleWidth = title.offsetWidth; titleWidth = title.offsetWidth;
} }
}; });
})(ionic); })(ionic);
; ;
@ -3281,7 +3277,8 @@ window.ionic = {
* You see it all over iOS apps, where it offers a set of options * You see it all over iOS apps, where it offers a set of options
* triggered after an action. * triggered after an action.
*/ */
ionic.views.Loading = function(opts) { ionic.views.Loading = ionic.views.View.inherit({
initialize: function(opts) {
var _this = this; var _this = this;
this.el = opts.el; this.el = opts.el;
@ -3289,9 +3286,7 @@ window.ionic = {
this.maxWidth = opts.maxWidth || 200; this.maxWidth = opts.maxWidth || 200;
this._loadingBox = this.el.querySelector('.loading'); this._loadingBox = this.el.querySelector('.loading');
}; },
ionic.views.Loading.prototype = {
show: function() { show: function() {
var _this = this; var _this = this;
@ -3314,7 +3309,7 @@ window.ionic = {
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
}; });
})(ionic); })(ionic);
; ;
@ -3338,7 +3333,8 @@ window.ionic = {
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.NavBar = function(opts) { ionic.views.NavBar = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this._titleEl = this.el.querySelector('.title'); this._titleEl = this.el.querySelector('.title');
@ -3346,9 +3342,7 @@ window.ionic = {
if(opts.hidden) { if(opts.hidden) {
this.hide(); this.hide();
} }
}; },
ionic.views.NavBar.prototype = {
hide: function() { hide: function() {
this.el.classList.add('hidden'); this.el.classList.add('hidden');
}, },
@ -3386,7 +3380,7 @@ window.ionic = {
this._currentBackButton.parentNode.removeChild(this._currentBackButton); this._currentBackButton.parentNode.removeChild(this._currentBackButton);
} }
} }
}; });
})(ionic); })(ionic);
; ;
@ -3398,13 +3392,13 @@ window.ionic = {
* You see it all over iOS apps, where it offers a set of options * You see it all over iOS apps, where it offers a set of options
* triggered after an action. * triggered after an action.
*/ */
ionic.views.Popup = function(opts) { ionic.views.Popup = ionic.views.View.inherit({
initialize: function(opts) {
var _this = this; var _this = this;
this.el = opts.el; this.el = opts.el;
}; },
ionic.views.Popup.prototype = {
setTitle: function(title) { setTitle: function(title) {
var titleEl = el.querySelector('.popup-title'); var titleEl = el.querySelector('.popup-title');
if(titleEl) { if(titleEl) {
@ -3425,20 +3419,20 @@ window.ionic = {
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
}; });
})(ionic); })(ionic);
; ;
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.SideMenu = function(opts) { ionic.views.SideMenu = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this.width = opts.width; this.width = opts.width;
this.isEnabled = opts.isEnabled || true; this.isEnabled = opts.isEnabled || true;
}; },
ionic.views.SideMenu.prototype = {
getFullWidth: function() { getFullWidth: function() {
return this.width; return this.width;
}, },
@ -3451,7 +3445,7 @@ window.ionic = {
pushDown: function() { pushDown: function() {
this.el.style.zIndex = -1; this.el.style.zIndex = -1;
} }
}; });
})(ionic); })(ionic);
; ;
@ -3787,12 +3781,12 @@ window.ionic = {
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.TabBarItem = function(el) { ionic.views.TabBarItem = ionic.views.View.inherit({
initialize: function(el) {
this.el = el; this.el = el;
this._buildItem(); this._buildItem();
}; },
ionic.views.TabBarItem.prototype = {
// Factory for creating an item from a given javascript object // Factory for creating an item from a given javascript object
create: function(itemData) { create: function(itemData) {
var item = document.createElement('a'); var item = document.createElement('a');
@ -3858,17 +3852,16 @@ ionic.views.TabBarItem.prototype = {
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
} }
}; });
ionic.views.TabBar = function(opts) { ionic.views.TabBar = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this.items = []; this.items = [];
this._buildItems(); this._buildItems();
}; },
ionic.views.TabBar.prototype = {
// get all the items for the TabBar // get all the items for the TabBar
getItems: function() { getItems: function() {
return this.items; return this.items;
@ -3982,7 +3975,7 @@ ionic.views.TabBar.prototype = {
} }
this.items.length = 0; this.items.length = 0;
} }
}; });
})(window.ionic); })(window.ionic);
; ;

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

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

9
js/views/actionSheetView.js
View File

@ -6,11 +6,10 @@
* You see it all over iOS apps, where it offers a set of options * You see it all over iOS apps, where it offers a set of options
* triggered after an action. * triggered after an action.
*/ */
ionic.views.ActionSheet = function(opts) { ionic.views.ActionSheet = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
}; },
ionic.views.ActionSheet.prototype = {
show: function() { show: function() {
// Force a reflow so the animation will actually run // Force a reflow so the animation will actually run
this.el.offsetWidth; this.el.offsetWidth;
@ -22,6 +21,6 @@
this.el.offsetWidth; this.el.offsetWidth;
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
}; });
})(ionic); })(ionic);

10
js/views/checkboxView.js
View File

@ -1,13 +1,12 @@
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.Checkbox = function(opts) { ionic.views.Checkbox = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this.checkbox = opts.checkbox; this.checkbox = opts.checkbox;
this.handle = opts.handle; this.handle = opts.handle;
}; },
ionic.views.Checkbox.prototype = {
tap: function(e) { tap: function(e) {
this.val( !this.checkbox.checked ); this.val( !this.checkbox.checked );
@ -19,7 +18,6 @@
} }
return this.checkbox.checked; return this.checkbox.checked;
} }
});
};
})(ionic); })(ionic);

9
js/views/headerBarView.js
View File

@ -1,13 +1,12 @@
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.HeaderBar = function(opts) { ionic.views.HeaderBar = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this._titleEl = this.el.querySelector('.title'); this._titleEl = this.el.querySelector('.title');
}; },
ionic.views.HeaderBar.prototype = {
resizeTitle: function() { resizeTitle: function() {
var e, j, i, var e, j, i,
title, title,
@ -23,6 +22,6 @@
titleWidth = title.offsetWidth; titleWidth = title.offsetWidth;
} }
}; });
})(ionic); })(ionic);

9
js/views/loadingView.js
View File

@ -6,7 +6,8 @@
* You see it all over iOS apps, where it offers a set of options * You see it all over iOS apps, where it offers a set of options
* triggered after an action. * triggered after an action.
*/ */
ionic.views.Loading = function(opts) { ionic.views.Loading = ionic.views.View.inherit({
initialize: function(opts) {
var _this = this; var _this = this;
this.el = opts.el; this.el = opts.el;
@ -14,9 +15,7 @@
this.maxWidth = opts.maxWidth || 200; this.maxWidth = opts.maxWidth || 200;
this._loadingBox = this.el.querySelector('.loading'); this._loadingBox = this.el.querySelector('.loading');
}; },
ionic.views.Loading.prototype = {
show: function() { show: function() {
var _this = this; var _this = this;
@ -39,6 +38,6 @@
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
}; });
})(ionic); })(ionic);

9
js/views/navBarView.js
View File

@ -1,7 +1,8 @@
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.NavBar = function(opts) { ionic.views.NavBar = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this._titleEl = this.el.querySelector('.title'); this._titleEl = this.el.querySelector('.title');
@ -9,9 +10,7 @@
if(opts.hidden) { if(opts.hidden) {
this.hide(); this.hide();
} }
}; },
ionic.views.NavBar.prototype = {
hide: function() { hide: function() {
this.el.classList.add('hidden'); this.el.classList.add('hidden');
}, },
@ -49,6 +48,6 @@
this._currentBackButton.parentNode.removeChild(this._currentBackButton); this._currentBackButton.parentNode.removeChild(this._currentBackButton);
} }
} }
}; });
})(ionic); })(ionic);

8
js/views/popupView.js
View File

@ -6,13 +6,13 @@
* You see it all over iOS apps, where it offers a set of options * You see it all over iOS apps, where it offers a set of options
* triggered after an action. * triggered after an action.
*/ */
ionic.views.Popup = function(opts) { ionic.views.Popup = ionic.views.View.inherit({
initialize: function(opts) {
var _this = this; var _this = this;
this.el = opts.el; this.el = opts.el;
}; },
ionic.views.Popup.prototype = {
setTitle: function(title) { setTitle: function(title) {
var titleEl = el.querySelector('.popup-title'); var titleEl = el.querySelector('.popup-title');
if(titleEl) { if(titleEl) {
@ -33,6 +33,6 @@
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
}; });
})(ionic); })(ionic);

8
js/views/sideMenuView.js
View File

@ -1,13 +1,13 @@
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.SideMenu = function(opts) { ionic.views.SideMenu = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this.width = opts.width; this.width = opts.width;
this.isEnabled = opts.isEnabled || true; this.isEnabled = opts.isEnabled || true;
}; },
ionic.views.SideMenu.prototype = {
getFullWidth: function() { getFullWidth: function() {
return this.width; return this.width;
}, },
@ -20,6 +20,6 @@
pushDown: function() { pushDown: function() {
this.el.style.zIndex = -1; this.el.style.zIndex = -1;
} }
}; });
})(ionic); })(ionic);

17
js/views/tabBarView.js
View File

@ -1,12 +1,12 @@
(function(ionic) { (function(ionic) {
'use strict'; 'use strict';
ionic.views.TabBarItem = function(el) { ionic.views.TabBarItem = ionic.views.View.inherit({
initialize: function(el) {
this.el = el; this.el = el;
this._buildItem(); this._buildItem();
}; },
ionic.views.TabBarItem.prototype = {
// Factory for creating an item from a given javascript object // Factory for creating an item from a given javascript object
create: function(itemData) { create: function(itemData) {
var item = document.createElement('a'); var item = document.createElement('a');
@ -72,17 +72,16 @@ ionic.views.TabBarItem.prototype = {
this.el.classList.remove('active'); this.el.classList.remove('active');
} }
} }
}; });
ionic.views.TabBar = function(opts) { ionic.views.TabBar = ionic.views.View.inherit({
initialize: function(opts) {
this.el = opts.el; this.el = opts.el;
this.items = []; this.items = [];
this._buildItems(); this._buildItems();
}; },
ionic.views.TabBar.prototype = {
// get all the items for the TabBar // get all the items for the TabBar
getItems: function() { getItems: function() {
return this.items; return this.items;
@ -196,6 +195,6 @@ ionic.views.TabBar.prototype = {
} }
this.items.length = 0; this.items.length = 0;
} }
}; });
})(window.ionic); })(window.ionic);

2
scss/_tabs.scss
View File

@ -10,7 +10,7 @@
@include flex-direction(horizontal); @include flex-direction(horizontal);
@include tab-style($tabs-default-bg, $tabs-default-border-color, $gray-dark); @include tab-style($tabs-default-bg, $tabs-default-border-color, $gray-dark);
position: fixed; position: absolute;
bottom: 0; bottom: 0;
z-index: 5; z-index: 5;
width: 100%; width: 100%;