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 most tests, started moving to Backbone VC for #62

Browse Source
This commit is contained in:
Max Lynch
2013-10-29 13:03:14 -05:00
parent 4649b05ffd
commit a23522cb06
8 changed files with 129 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -37,7 +37,11 @@ module.exports = function(grunt) {
'js/views/toggleView.js',
// Controllers
'js/controllers/**/*.js'
'js/controllers/viewController.js',
'js/controllers/navController.js',
'js/controllers/sideMenuController.js',
'js/controllers/tabBarController.js'
],
dest: 'dist/js/<%= pkg.name %>.js'

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

@ -975,6 +975,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
require: '^tabs',
scope: {
title: '@',
icon: '@',
iconOn: '@',
iconOff: '@',
active: '=',
@ -991,6 +992,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
},
template:
'<a href="#" ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' +
'<i ng-class="{{icon}}" ng-if="icon"></i>' +
'<i class="{{iconOn}}" ng-if="active"></i>' +
'<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' +
'</a>'

191
dist/js/ionic.js vendored
View File

@ -4422,6 +4422,23 @@ ionic.views.TabBar.prototype = {
initialize: function() {}
});
})(window.ionic);
;
(function(ionic) {
'use strict';
ionic.controllers.ViewController = function(options) {
this.initialize.apply(this, arguments);
};
ionic.controllers.ViewController.inherit = ionic.inherit;
ionic.extend(ionic.controllers.ViewController.prototype, {
initialize: function() {},
// Destroy this view controller, including all child views
destroy: function() {
}
});
})(window.ionic);
;
(function(ionic) {
@ -4580,122 +4597,6 @@ ionic.controllers.NavController.prototype = {
};
})(window.ionic);
;
/**
* Adapted from Backbone.js
*/
(function(ionic) {
'use strict';
var optionalParam = /\((.*?)\)/g;
var namedParam = /(\(\?)?:\w+/g;
var splatParam = /\*\w+/g;
var escapeRegExp = /[\-{}\[\]+?.,\\\^$|#\s]/g;
// Cached regex for stripping a leading hash/slash and trailing space.
var routeStripper = /^[#\/]|\s+$/g;
// Cached regex for stripping leading and trailing slashes.
var rootStripper = /^\/+|\/+$/g;
// Cached regex for removing a trailing slash.
var trailingSlash = /\/$/;
ionic.controllers.RouteViewController = function(options) {
this.options = options;
this.root = this.options.root || '/';
this.root = ('/' + this.root + '/').replace(rootStripper, '/');
this.handlers = [];
this._bindEvents();
this.location = window.location;
this.history = window.history;
};
ionic.controllers.RouteViewController.prototype = {
when: function(route, callback) {
var _this = this;
route = this._routeToRegExp(route);
this.handlers.unshift({
route: route,
callback: function(fragment) {
var args = _this._extractParameters(route, fragment);
callback && callback.apply(_this, args);
}
});
},
// Convert a route string into a regular expression, suitable for matching
// against the current location hash.
_routeToRegExp: function(route) {
route = route.replace(escapeRegExp, '\\$&')
.replace(optionalParam, '(?:$1)?')
.replace(namedParam, function(match, optional){
return optional ? match : '([^\/]+)';
})
.replace(splatParam, '(.*?)');
return new RegExp('^' + route + '$');
},
// Given a route, and a URL fragment that it matches, return the array of
// extracted decoded parameters. Empty or unmatched parameters will be
// treated as `null` to normalize cross-browser behavior.
_extractParameters: function(route, fragment) {
var params = route.exec(fragment).slice(1);
var extracted = [];
for(var i = 0; i < params.length; i++) {
if(param) {
extracted.push(decodeURIComponent(param));
}
}
},
_bindEvents: function() {
var _this = this;
window.addEventListener('popstate', function(event) {
_this.checkUrl(event);
});
},
checkUrl: function(e) {
var current = this.getFragment();
if (current === this.fragment) return false;
this.loadUrl() || this.loadUrl(this.getHash());
},
getFragment: function(fragment, forcePushState) {
if (fragment == null) {
fragment = this.location.pathname;
var root = this.root.replace(this.trailingSlash, '');
if (!fragment.indexOf(root)) fragment = fragment.substr(root.length);
}
return fragment.replace(routeStripper, '');
},
getHash: function(window) {
var match = (window || this).location.href.match(/#(.*)$/);
return match ? match[1] : '';
},
// Attempt to load the current URL fragment. If a route succeeds with a
// match, returns `true`. If no defined routes matches the fragment,
// returns `false`.
loadUrl: function(fragmentOverride) {
var fragment = this.fragment = this.getFragment(fragmentOverride);
var matched = false;
for(var i = 0; i < this.handlers.length; i++) {
var h = this.handlers[i];
if (h.route.test(fragment)) {
h.callback(fragment);
matched = true;
}
}
return matched;
},
};
})(window.ionic);
;
(function(ionic) {
'use strict';
@ -4968,27 +4869,37 @@ ionic.controllers.NavController.prototype = {
(function(ionic) {
'use strict';
ionic.controllers.TabBarController = function(options) {
this.tabBar = options.tabBar;
/**
* The TabBarController handles a set of view controllers powered by a tab strip
* at the bottom (or possibly top) of a screen.
*
* The API here is somewhat modelled off of UITabController in the sense that the
* controllers actually define what the tab will look like (title, icon, etc.).
*
* Tabs shouldn't be interacted with through your own code. Instead, use the controller
* methods which will power the tab bar.
*/
ionic.controllers.TabBarController = ionic.controllers.ViewController.inherit({
initialize: function(options) {
this.tabBar = options.tabBar;
this._bindEvents();
this._bindEvents();
this.controllers = [];
this.controllers = [];
var controllers = options.controllers || [];
var controllers = options.controllers || [];
for(var i = 0; i < controllers.length; i++) {
this.addController(controllers[i]);
}
for(var i = 0; i < controllers.length; i++) {
this.addController(controllers[i]);
}
// Bind or set our tabWillChange callback
this.controllerWillChange = options.controllerWillChange || function(controller) {};
this.controllerChanged = options.controllerChanged || function(controller) {};
// Bind or set our tabWillChange callback
this.controllerWillChange = options.controllerWillChange || function(controller) {};
this.controllerChanged = options.controllerChanged || function(controller) {};
this.setSelectedController(0);
};
ionic.controllers.TabBarController.prototype = {
// Try to select the first controller if we have one
this.setSelectedController(0);
},
// Start listening for events on our tab bar
_bindEvents: function() {
var _this = this;
@ -5090,22 +5001,6 @@ ionic.controllers.TabBarController.prototype = {
this._clearSelected();
this.selectController(0);
},
};
});
})(window.ionic);
;
(function(ionic) {
'use strict';
ionic.ViewController = function(options) {
this.init();
};
ionic.ViewController.prototype = {
// Initialize this view controller
init: function() {
},
// Destroy this view controller, including all child views
destroy: function() {
}
};
})(window.ionic);

42
js/controllers/tabBarController.js
View File

@ -1,27 +1,37 @@
(function(ionic) {
'use strict';
ionic.controllers.TabBarController = function(options) {
this.tabBar = options.tabBar;
/**
* The TabBarController handles a set of view controllers powered by a tab strip
* at the bottom (or possibly top) of a screen.
*
* The API here is somewhat modelled off of UITabController in the sense that the
* controllers actually define what the tab will look like (title, icon, etc.).
*
* Tabs shouldn't be interacted with through your own code. Instead, use the controller
* methods which will power the tab bar.
*/
ionic.controllers.TabBarController = ionic.controllers.ViewController.inherit({
initialize: function(options) {
this.tabBar = options.tabBar;
this._bindEvents();
this._bindEvents();
this.controllers = [];
this.controllers = [];
var controllers = options.controllers || [];
var controllers = options.controllers || [];
for(var i = 0; i < controllers.length; i++) {
this.addController(controllers[i]);
}
for(var i = 0; i < controllers.length; i++) {
this.addController(controllers[i]);
}
// Bind or set our tabWillChange callback
this.controllerWillChange = options.controllerWillChange || function(controller) {};
this.controllerChanged = options.controllerChanged || function(controller) {};
// Bind or set our tabWillChange callback
this.controllerWillChange = options.controllerWillChange || function(controller) {};
this.controllerChanged = options.controllerChanged || function(controller) {};
this.setSelectedController(0);
};
ionic.controllers.TabBarController.prototype = {
// Try to select the first controller if we have one
this.setSelectedController(0);
},
// Start listening for events on our tab bar
_bindEvents: function() {
var _this = this;
@ -123,6 +133,6 @@ ionic.controllers.TabBarController.prototype = {
this._clearSelected();
this.selectController(0);
},
};
});
})(window.ionic);

15
js/controllers/viewController.js
View File

@ -1,15 +1,16 @@
(function(ionic) {
'use strict';
ionic.ViewController = function(options) {
this.init();
ionic.controllers.ViewController = function(options) {
this.initialize.apply(this, arguments);
};
ionic.ViewController.prototype = {
// Initialize this view controller
init: function() {
},
ionic.controllers.ViewController.inherit = ionic.inherit;
ionic.extend(ionic.controllers.ViewController.prototype, {
initialize: function() {},
// Destroy this view controller, including all child views
destroy: function() {
}
};
});
})(window.ionic);

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

@ -123,6 +123,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
require: '^tabs',
scope: {
title: '@',
icon: '@',
iconOn: '@',
iconOff: '@',
active: '=',
@ -139,6 +140,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
},
template:
'<a href="#" ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' +
'<i ng-class="{{icon}}" ng-if="icon"></i>' +
'<i class="{{iconOn}}" ng-if="active"></i>' +
'<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' +
'</a>'

49
js/ext/angular/test/directive/ionicTabBar.unit.js
View File

@ -10,7 +10,30 @@ describe('Tab Bar Controller', function() {
}));
it('Select item in controller works', function() {
// Verify no items selected
expect(ctrl.getSelectedControllerIndex()).toEqual(undefined);
// Try selecting beyond the bounds
ctrl.selectController(1);
expect(ctrl.getSelectedControllerIndex()).toEqual(undefined);
// Add a controller
ctrl.add({
title: 'Cats',
icon: 'icon-kitty-kat'
});
expect(ctrl.getSelectedControllerIndex()).toEqual(0);
ctrl.add({
title: 'Cats',
icon: 'icon-kitty-kat'
});
expect(ctrl.getSelectedControllerIndex()).toEqual(0);
ctrl.select(1);
expect(ctrl.getSelectedControllerIndex()).toEqual(1);
});
});
@ -27,7 +50,7 @@ describe('Tab Bar directive', function() {
it('Has section wrapper class', function() {
element = compile('<tab-bar></tab-bar>')(scope);
expect(element.hasClass('view-wrapper')).toBe(true);
expect(element.hasClass('tabs')).toBe(true);
});
});
@ -44,19 +67,28 @@ describe('Tabs directive', function() {
it('Has tab class', function() {
element = compile('<tabs></tabs>')(scope);
scope.$digest();
console.log(element);
expect(element.find('.tabs').hasClass('tabs')).toBe(true);
});
it('Has tab children', function() {
scope.tabs = [
element = compile('<tabs></tabs>')(scope);
scope = element.scope();
scope.controllers = [
{ text: 'Home', icon: 'icon-home' },
{ text: 'Fun', icon: 'icon-fun' },
{ text: 'Beer', icon: 'icon-beer' },
];
element = compile('<tabs></tabs>')(scope);
scope.$digest();
expect(element.find('li').length).toBe(3);
expect(element.find('a').length).toBe(3);
});
it('Has compiled children', function() {
element = compile('<tabs>' +
'<tab active="true" title="Item" icon="icon-default"></tab>' +
'<tab active="true" title="Item" icon="icon-default"></tab>' +
'</tabs>')(scope);
scope.$digest();
expect(element.find('a').length).toBe(2);
});
});
@ -70,16 +102,19 @@ describe('Tab Item directive', function() {
scope = $rootScope;
element = compile('<tabs>' +
'<tab active="true" text="Item" icon="icon-default"></tab>' +
'<tab title="Item" icon="icon-default"></tab>' +
'</tabs>')(scope);
scope.$digest();
}));
it('Default text works', function() {
expect(element.find('a').first().text()).toEqual('Item');
console.log(element);
expect(element.find('a').first().text().trim()).toEqual('Item');
});
it('Default icon works', function() {
console.log(element);
scope.$digest();
expect(element.find('i').hasClass('icon-default')).toEqual(true);
});

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

@ -74,7 +74,7 @@
</content>
</tab>
<tab title="About" icon-on="icon-ios7-clock" icon-off="icon-ios7-clock-outline">
<tab title="About" icon="icon-ios7-clock" icon-off="icon-ios7-clock-outline">
<header class="bar bar-header bar-secondary">
<h1 class="title">Deadlines</h1>
</header>