From c25346d172fccadebcbf88abb3b7cf5153ab5efd Mon Sep 17 00:00:00 2001 From: Scott Dillender Date: Thu, 5 Feb 2015 13:06:36 -0600 Subject: [PATCH] fix(extras): restore ie8 compatibility due to reserved words --- src/dsr.js | 8 ++++---- src/previous.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dsr.js b/src/dsr.js index b230d58..eb150a0 100644 --- a/src/dsr.js +++ b/src/dsr.js @@ -53,8 +53,8 @@ angular.module('ct.ui.router.extras.dsr').service("$deepStateRedirect", [ '$root dsrCfg = angular.extend(dsrCfg, declaration); } - if (angular.isString(dsrCfg.default)) { - dsrCfg.default = { state: dsrCfg.default }; + if (angular.isString(dsrCfg['default'])) { + dsrCfg['default'] = { state: dsrCfg['default'] }; } if (!dsrCfg.fn) { @@ -104,11 +104,11 @@ angular.module('ct.ui.router.extras.dsr').service("$deepStateRedirect", [ '$root $rootScope.$on("$stateChangeStart", function (event, toState, toParams, fromState, fromParams) { var cfg = getConfig(toState); - if (ignoreDsr || (computeDeepStateStatus(toState) !== REDIRECT) && !cfg.default) return; + if (ignoreDsr || (computeDeepStateStatus(toState) !== REDIRECT) && !cfg['default']) return; // We're changing directly to one of the redirect (tab) states. // Get the DSR key for this state by calculating the DSRParams option var key = getParamsString(toParams, cfg.params); - var redirect = lastSubstate[toState.name][key] || cfg.default; + var redirect = lastSubstate[toState.name][key] || cfg['default']; if (!redirect) return; // we have a last substate recorded diff --git a/src/previous.js b/src/previous.js index 5d9aafd..bfc1f44 100644 --- a/src/previous.js +++ b/src/previous.js @@ -13,7 +13,7 @@ angular.module('ct.ui.router.extras.previous', [ 'ct.ui.router.extras.core', 'ct previous = $transition$.from; } - $transition$.promise.then(commit).catch(revert); + $transition$.promise.then(commit)['catch'](revert); function commit() { lastPrevious = null; } function revert() { previous = lastPrevious; } });