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

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

Browse Source 
Conflicts:
	dist/css/ionic-scoped.css
This commit is contained in:
Max Lynch
2013-10-21 21:01:14 -05:00
parent d331c657c0 fddff7c100
commit 95280cd629
15 changed files with 166 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/js/ionic.js vendored
View File

@ -3746,10 +3746,6 @@ ionic.controllers.TabBarController.prototype = {
return this.selectedController;
},
getSelectedIndex: function() {
return this.selectedIndex;
},
// Add a tab
addController: function(controller) {
this.controllers.push(controller);