(js/css) Update generated files
parent
3d36a6dd23
commit
a45d8c68f8
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* State-based routing for AngularJS
|
||||
* @version v0.3.1
|
||||
* @version v0.3.2
|
||||
* @link http://angular-ui.github.com/
|
||||
* @license MIT License, http://www.opensource.org/licenses/MIT
|
||||
*/
|
||||
|
@ -222,6 +222,11 @@ function map(collection, callback) {
|
|||
return result;
|
||||
}
|
||||
|
||||
// issue #2676 #2889
|
||||
function silenceUncaughtInPromise (promise) {
|
||||
return promise.then(undefined, function() {}) && promise;
|
||||
}
|
||||
|
||||
/**
|
||||
* @ngdoc overview
|
||||
* @name ui.router.util
|
||||
|
@ -1266,8 +1271,8 @@ function $UrlMatcherFactory() {
|
|||
// If the slashes are simply URLEncoded, the browser can choose to pre-decode them,
|
||||
// and bidirectional encoding/decoding fails.
|
||||
// Tilde was chosen because it's not a RFC 3986 section 2.2 Reserved Character
|
||||
function valToString(val) { return val != null ? val.toString().replace(/~/g, "~~").replace(/\//g, "~2F") : val; }
|
||||
function valFromString(val) { return val != null ? val.toString().replace(/~2F/g, "/").replace(/~~/g, "~") : val; }
|
||||
function valToString(val) { return val != null ? val.toString().replace(/(~|\/)/g, function (m) { return {'~':'~~', '/':'~2F'}[m]; }) : val; }
|
||||
function valFromString(val) { return val != null ? val.toString().replace(/(~~|~2F)/g, function (m) { return {'~~':'~', '~2F':'/'}[m]; }) : val; }
|
||||
|
||||
var $types = {}, enqueue = true, typeQueue = [], injector, defaultTypes = {
|
||||
"string": {
|
||||
|
@ -2901,10 +2906,12 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
|
|||
$get.$inject = ['$rootScope', '$q', '$view', '$injector', '$resolve', '$stateParams', '$urlRouter', '$location', '$urlMatcherFactory'];
|
||||
function $get( $rootScope, $q, $view, $injector, $resolve, $stateParams, $urlRouter, $location, $urlMatcherFactory) {
|
||||
|
||||
var TransitionSuperseded = $q.reject(new Error('transition superseded'));
|
||||
var TransitionPrevented = $q.reject(new Error('transition prevented'));
|
||||
var TransitionAborted = $q.reject(new Error('transition aborted'));
|
||||
var TransitionFailed = $q.reject(new Error('transition failed'));
|
||||
var TransitionSupersededError = new Error('transition superseded');
|
||||
|
||||
var TransitionSuperseded = silenceUncaughtInPromise($q.reject(TransitionSupersededError));
|
||||
var TransitionPrevented = silenceUncaughtInPromise($q.reject(new Error('transition prevented')));
|
||||
var TransitionAborted = silenceUncaughtInPromise($q.reject(new Error('transition aborted')));
|
||||
var TransitionFailed = silenceUncaughtInPromise($q.reject(new Error('transition failed')));
|
||||
|
||||
// Handles the case where a state which is the target of a transition is not found, and the user
|
||||
// can optionally retry or defer the transition
|
||||
|
@ -2960,7 +2967,10 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
|
|||
var retryTransition = $state.transition = $q.when(evt.retry);
|
||||
|
||||
retryTransition.then(function() {
|
||||
if (retryTransition !== $state.transition) return TransitionSuperseded;
|
||||
if (retryTransition !== $state.transition) {
|
||||
$rootScope.$broadcast('$stateChangeCancel', redirect.to, redirect.toParams, state, params);
|
||||
return TransitionSuperseded;
|
||||
}
|
||||
redirect.options.$retry = true;
|
||||
return $state.transitionTo(redirect.to, redirect.toParams, redirect.options);
|
||||
}, function() {
|
||||
|
@ -3299,7 +3309,10 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
|
|||
var transition = $state.transition = resolved.then(function () {
|
||||
var l, entering, exiting;
|
||||
|
||||
if ($state.transition !== transition) return TransitionSuperseded;
|
||||
if ($state.transition !== transition) {
|
||||
$rootScope.$broadcast('$stateChangeCancel', to.self, toParams, from.self, fromParams);
|
||||
return TransitionSuperseded;
|
||||
}
|
||||
|
||||
// Exit 'from' states not kept
|
||||
for (l = fromPath.length - 1; l >= keep; l--) {
|
||||
|
@ -3320,7 +3333,10 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
|
|||
}
|
||||
|
||||
// Run it again, to catch any transitions in callbacks
|
||||
if ($state.transition !== transition) return TransitionSuperseded;
|
||||
if ($state.transition !== transition) {
|
||||
$rootScope.$broadcast('$stateChangeCancel', to.self, toParams, from.self, fromParams);
|
||||
return TransitionSuperseded;
|
||||
}
|
||||
|
||||
// Update globals in $state
|
||||
$state.$current = to;
|
||||
|
@ -3356,7 +3372,14 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
|
|||
|
||||
return $state.current;
|
||||
}).then(null, function (error) {
|
||||
if ($state.transition !== transition) return TransitionSuperseded;
|
||||
// propagate TransitionSuperseded error without emitting $stateChangeCancel
|
||||
// as it was already emitted in the success handler above
|
||||
if (error === TransitionSupersededError) return TransitionSuperseded;
|
||||
|
||||
if ($state.transition !== transition) {
|
||||
$rootScope.$broadcast('$stateChangeCancel', to.self, toParams, from.self, fromParams);
|
||||
return TransitionSuperseded;
|
||||
}
|
||||
|
||||
$state.transition = null;
|
||||
/**
|
||||
|
@ -3380,7 +3403,7 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
|
|||
evt = $rootScope.$broadcast('$stateChangeError', to.self, toParams, from.self, fromParams, error);
|
||||
|
||||
if (!evt.defaultPrevented) {
|
||||
$urlRouter.update();
|
||||
$urlRouter.update();
|
||||
}
|
||||
|
||||
return $q.reject(error);
|
||||
|
@ -3495,7 +3518,17 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
|
|||
var state = findState(stateOrName, options.relative);
|
||||
if (!isDefined(state)) { return undefined; }
|
||||
if (!isDefined($state.$current.includes[state.name])) { return false; }
|
||||
return params ? equalForKeys(state.params.$$values(params), $stateParams, objectKeys(params)) : true;
|
||||
if (!params) { return true; }
|
||||
|
||||
var keys = objectKeys(params);
|
||||
for (var i = 0; i < keys.length; i++) {
|
||||
var key = keys[i], paramDef = state.params[key];
|
||||
if (paramDef && !paramDef.type.equals($stateParams[key], params[key])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
|
||||
|
@ -4268,9 +4301,9 @@ function $StateRefDirective($state, $timeout) {
|
|||
|
||||
if (!type.clickable) return;
|
||||
hookFn = clickHook(element, $state, $timeout, type, function() { return def; });
|
||||
element.bind("click", hookFn);
|
||||
element[element.on ? 'on' : 'bind']("click", hookFn);
|
||||
scope.$on('$destroy', function() {
|
||||
element.unbind("click", hookFn);
|
||||
element[element.off ? 'off' : 'unbind']("click", hookFn);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
@ -4320,9 +4353,9 @@ function $StateRefDynamicDirective($state, $timeout) {
|
|||
|
||||
if (!type.clickable) return;
|
||||
hookFn = clickHook(element, $state, $timeout, type, function() { return def; });
|
||||
element.bind("click", hookFn);
|
||||
element[element.on ? 'on' : 'bind']("click", hookFn);
|
||||
scope.$on('$destroy', function() {
|
||||
element.unbind("click", hookFn);
|
||||
element[element.off ? 'off' : 'unbind']("click", hookFn);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue