onEnter: function(MyService, $stateParams) {
@@ -31842,7 +31985,11 @@
*
* Callback function for when a state is exited. Good way to
* trigger an action or dispatch an event, such as opening a dialog.
+<<<<<<< HEAD
* If minifying your scripts, make sure to explicitly annotate this function,
+=======
+ * If minifying your scripts, make sure to explictly annotate this function,
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
* because it won't be automatically annotated by your build tools.
*
* onExit: function(MyService, $stateParams) {
@@ -32173,8 +32320,12 @@
*
* @param {object=} params A map of the parameters that will be sent to the state,
* will populate $stateParams. Any parameters that are not specified will be inherited from currently
+<<<<<<< HEAD
* defined parameters. Only parameters specified in the state definition can be overridden, new
* parameters will be ignored. This allows, for example, going to a sibling state that shares parameters
+=======
+ * defined parameters. This allows, for example, going to a sibling state that shares parameters
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
* specified in a parent state. Parameter inheritance only works between common ancestor states, I.e.
* transitioning to a sibling will get you the parameters for all parents, transitioning to a child
* will get you all current parameters, etc.
@@ -32186,10 +32337,16 @@
* - **`relative`** - {object=$state.$current}, When transitioning with relative path (e.g '^'),
* defines which state to be relative from.
* - **`notify`** - {boolean=true}, If `true` will broadcast $stateChangeStart and $stateChangeSuccess events.
+<<<<<<< HEAD
* - **`reload`** (v0.2.5) - {boolean=false|string|object}, If `true` will force transition even if no state or params
* have changed. It will reload the resolves and views of the current state and parent states.
* If `reload` is a string (or state object), the state object is fetched (by name, or object reference); and \
* the transition reloads the resolves and views for that matched state, and all its children states.
+=======
+ * - **`reload`** (v0.2.5) - {boolean=false}, If `true` will force transition even if the state or params
+ * have not changed, aka a reload of the same state. It differs from reloadOnSearch because you'd
+ * use this when you want to force a reload when *everything* is the same, including search params.
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
*
* @returns {promise} A promise representing the state of the new transition.
*
@@ -32327,7 +32484,10 @@
if (hash) toParams['#'] = hash;
$state.params = toParams;
copy($state.params, $stateParams);
+<<<<<<< HEAD
copy(filterByKeys(to.params.$$keys(), $stateParams), to.locals.globals.$stateParams);
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
if (options.location && to.navigable && to.navigable.url) {
$urlRouter.push(to.navigable.url, toParams, {
$$avoidResync: true, replace: options.location === 'replace'
@@ -32340,10 +32500,14 @@
// Filter parameters before we pass them to event handlers etc.
toParams = filterByKeys(to.params.$$keys(), toParams || {});
+<<<<<<< HEAD
// Re-add the saved hash before we start returning things or broadcasting $stateChangeStart
if (hash) toParams['#'] = hash;
+=======
+
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
// Broadcast start event and cancel the transition if requested
if (options.notify) {
/**
@@ -32373,10 +32537,16 @@
* })
*
*/
+<<<<<<< HEAD
if ($rootScope.$broadcast('$stateChangeStart', to.self, toParams, from.self, fromParams, options).defaultPrevented) {
$rootScope.$broadcast('$stateChangeCancel', to.self, toParams, from.self, fromParams);
//Don't update and resync url if there's been a new transition started. see issue #2238, #600
if ($state.transition == null) $urlRouter.update();
+=======
+ if ($rootScope.$broadcast('$stateChangeStart', to.self, toParams, from.self, fromParams).defaultPrevented) {
+ $rootScope.$broadcast('$stateChangeCancel', to.self, toParams, from.self, fromParams);
+ $urlRouter.update();
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
return TransitionPrevented;
}
}
@@ -32422,6 +32592,12 @@
}
}
+<<<<<<< HEAD
+=======
+ // Re-add the saved hash before we start returning things
+ if (hash) toParams['#'] = hash;
+
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
// Run it again, to catch any transitions in callbacks
if ($state.transition !== transition) return TransitionSuperseded;
@@ -32755,7 +32931,11 @@
}
angular.module('ui.router.state')
+<<<<<<< HEAD
.factory('$stateParams', function () { return {}; })
+=======
+ .value('$stateParams', {})
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
.provider('$state', $StateProvider);
@@ -32796,6 +32976,35 @@
if (options.view) {
result = $templateFactory.fromConfig(options.view, options.params, options.locals);
}
+<<<<<<< HEAD
+=======
+ if (result && options.notify) {
+ /**
+ * @ngdoc event
+ * @name ui.router.state.$state#$viewContentLoading
+ * @eventOf ui.router.state.$view
+ * @eventType broadcast on root scope
+ * @description
+ *
+ * Fired once the view **begins loading**, *before* the DOM is rendered.
+ *
+ * @param {Object} event Event object.
+ * @param {Object} viewConfig The view config properties (template, controller, etc).
+ *
+ * @example
+ *
+ *
+ * $scope.$on('$viewContentLoading',
+ * function(event, viewConfig){
+ * // Access to all the view config properties.
+ * // and one special property 'targetView'
+ * // viewConfig.targetView
+ * });
+ *
+ */
+ $rootScope.$broadcast('$viewContentLoading', options);
+ }
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
return result;
}
};
@@ -32857,8 +33066,11 @@
angular.module('ui.router.state').provider('$uiViewScroll', $ViewScrollProvider);
+<<<<<<< HEAD
var ngMajorVer = angular.version.major;
var ngMinorVer = angular.version.minor;
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
/**
* @ngdoc directive
* @name ui.router.state.directive:ui-view
@@ -32883,9 +33095,12 @@
* 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.
*
+<<<<<<< HEAD
* @param {string=} noanimation If truthy, the non-animated renderer will be selected (no animations
* will be applied to the ui-view)
*
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
* *Note: To revert back to old [`$anchorScroll`](http://docs.angularjs.org/api/ng.$anchorScroll)
* functionality, call `$uiViewScrollProvider.useAnchorScroll()`.*
*
@@ -32997,6 +33212,7 @@
// Returns a set of DOM manipulation functions based on which Angular version
// it should use
function getRenderer(attrs, scope) {
+<<<<<<< HEAD
var statics = {
enter: function (element, target, cb) { target.after(element); cb(); },
leave: function (element, cb) { element.remove(); cb(); }
@@ -33030,11 +33246,32 @@
} else {
$animate.leave(element, cb);
}
+=======
+ var statics = function() {
+ return {
+ enter: function (element, target, cb) { target.after(element); cb(); },
+ leave: function (element, cb) { element.remove(); cb(); }
+ };
+ };
+
+ if ($animate) {
+ return {
+ enter: function(element, target, cb) {
+ var promise = $animate.enter(element, null, target, cb);
+ if (promise && promise.then) promise.then(cb);
+ },
+ leave: function(element, cb) {
+ var promise = $animate.leave(element, cb);
+ if (promise && promise.then) promise.then(cb);
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
}
};
}
+<<<<<<< HEAD
// ng 1.1.5
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
if ($animator) {
var animate = $animator && $animator(scope, attrs);
@@ -33044,7 +33281,11 @@
};
}
+<<<<<<< HEAD
return statics;
+=======
+ return statics();
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
}
var directive = {
@@ -33062,10 +33303,17 @@
scope.$on('$stateChangeSuccess', function() {
updateView(false);
});
+<<<<<<< HEAD
+=======
+ scope.$on('$viewContentLoading', function() {
+ updateView(false);
+ });
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
updateView(true);
function cleanupLastView() {
+<<<<<<< HEAD
var _previousEl = previousEl;
var _currentScope = currentScope;
@@ -33081,15 +33329,29 @@
if (_currentScope) {
_currentScope.$destroy();
}
+=======
+ if (previousEl) {
+ previousEl.remove();
+ previousEl = null;
+ }
+
+ if (currentScope) {
+ currentScope.$destroy();
+ currentScope = null;
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
}
if (currentEl) {
renderer.leave(currentEl, function() {
+<<<<<<< HEAD
cleanOld();
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
previousEl = null;
});
previousEl = currentEl;
+<<<<<<< HEAD
} else {
cleanOld();
previousEl = null;
@@ -33097,6 +33359,10 @@
currentEl = null;
currentScope = null;
+=======
+ currentEl = null;
+ }
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
}
function updateView(firstTime) {
@@ -33104,6 +33370,7 @@
name = getUiViewName(scope, attrs, $element, $interpolate),
previousLocals = name && $state.$current && $state.$current.locals[name];
+<<<<<<< HEAD
if (!firstTime && previousLocals === latestLocals || scope._willBeDestroyed) return; // nothing to do
newScope = scope.$new();
latestLocals = $state.$current.locals[name];
@@ -33122,6 +33389,12 @@
*/
newScope.$emit('$viewContentLoading', name);
+=======
+ if (!firstTime && previousLocals === latestLocals) return; // nothing to do
+ newScope = scope.$new();
+ latestLocals = $state.$current.locals[name];
+
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
var clone = $transclude(newScope, function(clone) {
renderer.enter(clone, $element, function onUiViewEnter() {
if(currentScope) {
@@ -33142,6 +33415,7 @@
* @name ui.router.state.directive:ui-view#$viewContentLoaded
* @eventOf ui.router.state.directive:ui-view
* @eventType emits on ui-view directive scope
+<<<<<<< HEAD
* @description
* Fired once the view is **loaded**, *after* the DOM is rendered.
*
@@ -33149,6 +33423,14 @@
* @param {string} viewName Name of the view.
*/
currentScope.$emit('$viewContentLoaded', name);
+=======
+ * @description *
+ * Fired once the view is **loaded**, *after* the DOM is rendered.
+ *
+ * @param {Object} event Event object.
+ */
+ currentScope.$emit('$viewContentLoaded');
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
currentScope.$eval(onloadExp);
}
};
@@ -33225,6 +33507,7 @@
}
}
+<<<<<<< HEAD
function getTypeInfo(el) {
// SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
var isSvg = Object.prototype.toString.call(el.prop('href')) === '[object SVGAnimatedString]';
@@ -33262,6 +33545,8 @@
return { relative: stateContext(el) || $state.$current, inherit: true };
}
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
/**
* @ngdoc directive
* @name ui.router.state.directive:ui-sref
@@ -33272,6 +33557,7 @@
* @restrict A
*
* @description
+<<<<<<< HEAD
* A directive that binds a link (`` tag) to a state. If the state has an associated
* URL, the directive will automatically generate & update the `href` attribute via
* the {@link ui.router.state.$state#methods_href $state.href()} method. Clicking
@@ -33283,6 +33569,19 @@
* You can also use relative state paths within ui-sref, just like the relative
* paths passed to `$state.go()`. You just need to be aware that the path is relative
* to the state that the link lives in, in other words the state that loaded the
+=======
+ * A directive that binds a link (`` tag) to a state. If the state has an associated
+ * URL, the directive will automatically generate & update the `href` attribute via
+ * the {@link ui.router.state.$state#methods_href $state.href()} method. Clicking
+ * the link will trigger a state transition with optional parameters.
+ *
+ * Also middle-clicking, right-clicking, and ctrl-clicking on the link will be
+ * handled natively by the browser.
+ *
+ * You can also use relative state paths within ui-sref, just like the relative
+ * paths passed to `$state.go()`. You just need to be aware that the path is relative
+ * to the state that the link lives in, in other words the state that loaded the
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
* template containing the link.
*
* You can specify options to pass to {@link ui.router.state.$state#go $state.go()}
@@ -33290,22 +33589,38 @@
* and `reload`.
*
* @example
+<<<<<<< HEAD
* Here's an example of how you'd use ui-sref and how it would compile. If you have the
* following template:
*
* Home | About | Next page
*
+=======
+ * Here's an example of how you'd use ui-sref and how it would compile. If you have the
+ * following template:
+ *
+ * Home | About | Next page
+ *
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
*
*
+<<<<<<< HEAD
*
* Then the compiled html would be (assuming Html5Mode is off and current state is contacts):
*