mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-07 15:07:13 +08:00
Fixed most tests, started moving to Backbone VC for #62
This commit is contained in:
Max Lynch
191
dist/js/ionic.js
vendored
191
dist/js/ionic.js
vendored
@ -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);
|
||||
|
||||
Reference in New Issue
Block a user