Skip to content

Commit

Permalink
re-built and re-release 0.2.11
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Aug 30, 2014
1 parent 80d8fee commit ee292fd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions release/angular-ui-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -2826,7 +2826,7 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
* - **`lossy`** - {boolean=true} - If true, and if there is no url associated with the state provided in the
* first parameter, then the constructed href url will be built from the first navigable ancestor (aka
* ancestor with a valid url).
* - **`inherit`** - {boolean=false}, If `true` will inherit url parameters from current url.
* - **`inherit`** - {boolean=true}, If `true` will inherit url parameters from current url.
* - **`relative`** - {object=$state.$current}, When transitioning with relative path (e.g '^'),
* defines which state to be relative from.
* - **`absolute`** - {boolean=false}, If true will generate an absolute url, e.g. "http://www.example.com/fullurl".
Expand All @@ -2836,7 +2836,7 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
$state.href = function href(stateOrName, params, options) {
options = extend({
lossy: true,
inherit: false,
inherit: true,
absolute: false,
relative: $state.$current
}, options || {});
Expand Down Expand Up @@ -3263,11 +3263,12 @@ function $ViewDirective( $state, $injector, $uiViewScroll) {
}

function updateView(firstTime) {
var newScope = scope.$new(),
var newScope,
name = getUiViewName(attrs, $element.inheritedData('$uiView')),
previousLocals = name && $state.$current && $state.$current.locals[name];

if (!firstTime && previousLocals === latestLocals) return; // nothing to do
newScope = scope.$new();
latestLocals = $state.$current.locals[name];

var clone = $transclude(newScope, function(clone) {
Expand Down Expand Up @@ -3654,4 +3655,4 @@ function $IncludedByStateFilter($state) {
angular.module('ui.router.state')
.filter('isState', $IsStateFilter)
.filter('includedByState', $IncludedByStateFilter);
})(window, window.angular);
})(window, window.angular);
Loading

0 comments on commit ee292fd

Please sign in to comment.