amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-29 09:00:31 +00:00
Code Issues Projects Releases Wiki Activity

(js/css) Update generated files

Browse Source
This commit is contained in:
InverseBot
2016-06-04 01:13:42 -04:00
parent 9dcc25abc5
commit e7114277fd
10 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/vendor/angular-ui-router.js
Vendored
+13 -12
View File
@@ -1,6 +1,6 @@
/**
* State-based routing for AngularJS
* @version v0.3.0
* @version v0.3.1
* @link http://angular-ui.github.com/
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
@@ -3355,7 +3355,7 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
$urlRouter.update(true);
return $state.current;
}, function (error) {
}).then(null, function (error) {
if ($state.transition !== transition) return TransitionSuperseded;
$state.transition = null;
@@ -3986,7 +3986,7 @@ function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate,
}
if (currentEl) {
var $uiViewData = currentEl.data('$uiView');
var $uiViewData = currentEl.data('$uiViewAnim');
renderer.leave(currentEl, function() {
$uiViewData.$$animLeave.resolve();
previousEl = null;
@@ -3999,7 +3999,7 @@ function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate,
function updateView(firstTime) {
var newScope,
name = getUiViewName(scope, attrs, inherited, $interpolate),
name = getUiViewName(scope, attrs, $element, $interpolate),
previousLocals = name && $state.$current && $state.$current.locals[name];
if (!firstTime && previousLocals === latestLocals) return; // nothing to do
@@ -4022,14 +4022,14 @@ function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate,
var clone = $transclude(newScope, function(clone) {
var animEnter = $q.defer(), animLeave = $q.defer();
var viewData = {
name: name,
var viewAnimData = {
$animEnter: animEnter.promise,
$animLeave: animLeave.promise,
$$animLeave: animLeave
};
renderer.enter(clone.data('$uiView', viewData), $element, function onUiViewEnter() {
clone.data('$uiViewAnim', viewAnimData);
renderer.enter(clone, $element, function onUiViewEnter() {
animEnter.resolve();
if(currentScope) {
currentScope.$emit('$viewContentAnimationEnded');
@@ -4074,14 +4074,14 @@ function $ViewDirectiveFill ( $compile, $controller, $state, $interpolate
var initial = tElement.html();
return function (scope, $element, attrs) {
var current = $state.$current,
$uiViewData = $element.data('$uiView'),
locals = current && current.locals[$uiViewData.name];
name = getUiViewName(scope, attrs, $element, $interpolate),
locals = current && current.locals[name];
if (! locals) {
return;
}
extend($uiViewData, { state: locals.$$state });
$element.data('$uiView', { name: name, state: locals.$$state });
$element.html(locals.$template ? locals.$template : initial);
var resolveData = angular.extend({}, locals);
@@ -4112,9 +4112,10 @@ function $ViewDirectiveFill ( $compile, $controller, $state, $interpolate
* Shared ui-view code for both directives:
* Given scope, element, and its attributes, return the view's name
*/
function getUiViewName(scope, attrs, inherited, $interpolate) {
function getUiViewName(scope, attrs, element, $interpolate) {
var name = $interpolate(attrs.uiView || attrs.name || '')(scope);
return name.indexOf('@') >= 0 ? name : (name + '@' + (inherited ? inherited.state.name : ''));
var uiViewCreatedBy = element.inheritedData('$uiView');
return name.indexOf('@') >= 0 ? name : (name + '@' + (uiViewCreatedBy ? uiViewCreatedBy.state.name : ''));
}
angular.module('ui.router.state').directive('uiView', $ViewDirective);