(js/css) Update generated files

This commit is contained in:
InverseBot
2016-02-08 12:54:12 -05:00
parent 1d2763af3c
commit ace7e0771f
14 changed files with 398 additions and 385 deletions
+36 -24
View File
@@ -1,6 +1,6 @@
/**
* State-based routing for AngularJS
* @version v0.2.17
* @version v0.2.18
* @link http://angular-ui.github.com/
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
@@ -523,7 +523,7 @@ function $Resolve( $q, $injector) {
* propagated immediately. Once the `$resolve` promise has been rejected, no
* further invocables will be called.
*
* Cyclic dependencies between invocables are not permitted and will caues `$resolve`
* Cyclic dependencies between invocables are not permitted and will cause `$resolve`
* to throw an error. As a special case, an injectable can depend on a parameter
* with the same name as the injectable, which will be fulfilled from the `parent`
* injectable of the same name. This allows inherited values to be decorated.
@@ -1270,7 +1270,7 @@ function $UrlMatcherFactory() {
function valFromString(val) { return val != null ? val.toString().replace(/~2F/g, "/").replace(/~~/g, "~") : val; }
var $types = {}, enqueue = true, typeQueue = [], injector, defaultTypes = {
string: {
"string": {
encode: valToString,
decode: valFromString,
// TODO: in 1.0, make string .is() return false if value is undefined/null by default.
@@ -1278,19 +1278,19 @@ function $UrlMatcherFactory() {
is: function(val) { return val == null || !isDefined(val) || typeof val === "string"; },
pattern: /[^/]*/
},
int: {
"int": {
encode: valToString,
decode: function(val) { return parseInt(val, 10); },
is: function(val) { return isDefined(val) && this.decode(val.toString()) === val; },
pattern: /\d+/
},
bool: {
"bool": {
encode: function(val) { return val ? 1 : 0; },
decode: function(val) { return parseInt(val, 10) !== 0; },
is: function(val) { return val === true || val === false; },
pattern: /0|1/
},
date: {
"date": {
encode: function (val) {
if (!this.is(val))
return undefined;
@@ -1309,14 +1309,14 @@ function $UrlMatcherFactory() {
pattern: /[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,
capture: /([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/
},
json: {
"json": {
encode: angular.toJson,
decode: angular.fromJson,
is: angular.isObject,
equals: angular.equals,
pattern: /[^/]*/
},
any: { // does not encode/decode
"any": { // does not encode/decode
encode: angular.identity,
decode: angular.identity,
equals: angular.equals,
@@ -2058,12 +2058,6 @@ function $UrlRouterProvider( $locationProvider, $urlMatcherFactory) {
return listener;
}
rules.sort(function(ruleA, ruleB) {
var aLength = ruleA.prefix ? ruleA.prefix.length : 0;
var bLength = ruleB.prefix ? ruleB.prefix.length : 0;
return bLength - aLength;
});
if (!interceptDeferred) listen();
return {
@@ -2266,7 +2260,8 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
// Derive parameters for this state and ensure they're a super-set of parent's parameters
params: function(state) {
return state.parent && state.parent.params ? extend(state.parent.params.$$new(), state.ownParams) : new $$UMFP.ParamSet();
var ownParams = pick(state.ownParams, state.ownParams.$$keys());
return state.parent && state.parent.params ? extend(state.parent.params.$$new(), ownParams) : new $$UMFP.ParamSet();
},
// If there is no explicit multi-view configuration, make one up so we don't have
@@ -3758,6 +3753,8 @@ function $ViewScrollProvider() {
angular.module('ui.router.state').provider('$uiViewScroll', $ViewScrollProvider);
var ngMajorVer = angular.version.major;
var ngMinorVer = angular.version.minor;
/**
* @ngdoc directive
* @name ui.router.state.directive:ui-view
@@ -3782,6 +3779,9 @@ angular.module('ui.router.state').provider('$uiViewScroll', $ViewScrollProvider)
* service, {@link ui.router.state.$uiViewScroll}. This custom service let's you
* scroll ui-view elements into view when they are populated during a state activation.
*
* @param {string=} noanimation If truthy, the non-animated renderer will be selected (no animations
* will be applied to the ui-view)
*
* *Note: To revert back to old [`$anchorScroll`](http://docs.angularjs.org/api/ng.$anchorScroll)
* functionality, call `$uiViewScrollProvider.useAnchorScroll()`.*
*
@@ -3893,24 +3893,35 @@ function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate)
// Returns a set of DOM manipulation functions based on which Angular version
// it should use
function getRenderer(attrs, scope) {
var statics = function() {
return {
enter: function (element, target, cb) { target.after(element); cb(); },
leave: function (element, cb) { element.remove(); cb(); }
};
var statics = {
enter: function (element, target, cb) { target.after(element); cb(); },
leave: function (element, cb) { element.remove(); cb(); }
};
if (!!attrs.noanimation) return statics;
function animEnabled(element) {
if (ngMajorVer === 1 && ngMinorVer >= 4) return !!$animate.enabled(element);
if (ngMajorVer === 1 && ngMinorVer >= 2) return !!$animate.enabled();
return (!!$animator);
}
// ng 1.2+
if ($animate) {
return {
enter: function(element, target, cb) {
if (angular.version.minor > 2) {
if (!animEnabled(element)) {
statics.enter(element, target, cb);
} else if (angular.version.minor > 2) {
$animate.enter(element, null, target).then(cb);
} else {
$animate.enter(element, null, target, cb);
}
},
leave: function(element, cb) {
if (angular.version.minor > 2) {
if (!animEnabled(element)) {
statics.leave(element, cb);
} else if (angular.version.minor > 2) {
$animate.leave(element).then(cb);
} else {
$animate.leave(element, cb);
@@ -3919,6 +3930,7 @@ function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate)
};
}
// ng 1.1.5
if ($animator) {
var animate = $animator && $animator(scope, attrs);
@@ -3928,7 +3940,7 @@ function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate)
};
}
return statics();
return statics;
}
var directive = {
@@ -4273,7 +4285,7 @@ function $StateRefDynamicDirective($state, $timeout) {
def.state = group[0]; def.params = group[1]; def.options = group[2];
def.href = $state.href(def.state, def.params, def.options);
if (active) active.$$addStateInfo(ref.state, def.params);
if (active) active.$$addStateInfo(def.state, def.params);
if (def.href) attrs.$set(type.attr, def.href);
}