diff --git a/package.json b/package.json index ae96d2828671688df73eb8d1b6066d1b4748f9c9..e8e7aaf3a2e64b2216de2e7f58583d55eae25806 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "angular-cookie": "git://github.com/ivpusic/angular-cookie#v4.0.6", "angular-cookies": "1.2.28", "angular-gridster": "0.11.7", - "angular-http-auth": "git://github.com/tamlyn/angular-http-auth#1eb4a08d08b400956c0848f84d8fcaa9ad1357a2", + "angular-http-auth": "1.2.1", "angular-readable-time": "git://github.com/wildlyinaccurate/angular-readable-time#0.1.1", "angular-resource": "1.2.28", "angular-route": "1.2.28", diff --git a/resources/frontend_client/app/app.js b/resources/frontend_client/app/app.js index af4052a2692a5d04c3ccfc698d389334693d4928..301eec80081fd40d6b28436cb6152a0ec86fd918 100644 --- a/resources/frontend_client/app/app.js +++ b/resources/frontend_client/app/app.js @@ -39,9 +39,9 @@ Corvus.config(['$routeProvider', '$locationProvider', function($routeProvider, $ template: '', controller: 'Homepage', resolve: { - appState: function(AppState) { + appState: ["AppState", function(AppState) { return AppState.init(); - } + }] } }); @@ -68,7 +68,7 @@ Corvus.config(['$routeProvider', '$locationProvider', function($routeProvider, $ }); }]); -Corvus.run(function(AppState, editableOptions, editableThemes) { +Corvus.run(["AppState", "editableOptions", "editableThemes", function(AppState, editableOptions, editableThemes) { // initialize app state AppState.init(); @@ -78,14 +78,14 @@ Corvus.run(function(AppState, editableOptions, editableThemes) { // overwrite submit button template editableThemes['default'].submitTpl = '<button class="Button Button--primary" type="submit">Save</button>'; editableThemes['default'].cancelTpl = '<button class="Button" ng-click="$form.$cancel()">cancel</button>'; -}); +}]); if (document.location.hostname != "localhost") { // Only set up logging in production - Corvus.config(function(AngularyticsProvider) { + Corvus.config(["AngularyticsProvider", function(AngularyticsProvider) { AngularyticsProvider.setEventHandlers(['Console', 'GoogleUniversal']); - }).run(function(Angularytics) { + }]).run(["Angularytics", function(Angularytics) { Angularytics.init(); - }); + }]); }