From 2209bd5a0c3f9bcd52b93653875eaadc52945ed4 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 28 Feb 2014 23:48:20 -0700 Subject: [PATCH] chore(bower): back to angular-ui-router SHA, I'll explain on GH for this commit --- bower.json | 2 +- public/js/app.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 41fcf5371d..a6df84695a 100644 --- a/bower.json +++ b/bower.json @@ -23,7 +23,7 @@ "angular-ui-utils": "~0.1.0", "angular-ui-select2": "git://github.com/angular-ui/ui-select2.git", "angular-bootstrap": "~0.10.0", - "angular-ui-router": "~0.2.8", + "angular-ui-router": "git://github.com/HabitRPG/ui-router.git#habitrpg", "angular-loading-bar": "~0.3.0", "angular-bindonce": "~0.2.1", "bootstrap": "~3.1.0", diff --git a/public/js/app.js b/public/js/app.js index 2e560d2502..faee34ecfa 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -5,6 +5,10 @@ window.habitrpg = angular.module('habitrpg', 'authServices', 'notificationServices', 'guideServices', 'authCtrl', 'ui.bootstrap', 'ui.keypress', 'ui.router', 'chieffancypants.loadingBar', 'At', 'pasvaz.bindonce', 'infinite-scroll', 'ui.select2']) + // @see https://github.com/angular-ui/ui-router/issues/110 and https://github.com/HabitRPG/habitrpg/issues/1705 + // temporary hack until they have a better solution + .value('$anchorScroll', angular.noop) + .constant("API_URL", "") .constant("STORAGE_USER_ID", 'habitrpg-user') .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings')