summaryrefslogtreecommitdiffstats
path: root/js/build/app.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-11-18 18:51:51 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2014-11-18 18:51:51 +0100
commitfd9be3ed07a150618247a026a165266c1363404b (patch)
tree029d6aab274438abade7874c0ffbb35697fa4ae4 /js/build/app.js
parente255ebbad8b6af3be1d5b7de164c17cd076d77d6 (diff)
test
Diffstat (limited to 'js/build/app.js')
-rw-r--r--js/build/app.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/build/app.js b/js/build/app.js
index 47151a24b..0b18debff 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -103,13 +103,14 @@ app.config(["$routeProvider", "$provide", "$httpProvider", function ($routeProvi
}]);
-app.run(["$rootScope", "$location", "$http", "$q", "$interval", "Loading", "ItemResource", "FeedResource", "FolderResource", "SettingsResource", "Publisher", "BASE_URL", "FEED_TYPE", "REFRESH_RATE", function ($rootScope, $location, $http, $q, $interval, Loading,
+app.run(["$rootScope", "$location", "$http", "$q", "$interval", "Loading", "ItemResource", "FeedResource", "FolderResource", "SettingsResource", "Publisher", "BASE_URL", "FEED_TYPE", "REFRESH_RATE", "$animate", function ($rootScope, $location, $http, $q, $interval, Loading,
ItemResource, FeedResource, FolderResource, SettingsResource,
- Publisher, BASE_URL, FEED_TYPE, REFRESH_RATE) {
+ Publisher, BASE_URL, FEED_TYPE, REFRESH_RATE, $animate) {
'use strict';
// show Loading screen
Loading.setLoading('global', true);
+ $animate.enable(false);
// listen to keys in returned queries to automatically distribute the
// incoming values to models
@@ -179,6 +180,7 @@ app.run(["$rootScope", "$location", "$http", "$q", "$interval", "Loading", "Item
]
)
.then(function () {
+ $animate.enable(true);
Loading.setLoading('global', false);
});