Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2015-05-10 05:00:51 +0300
committerdiosmosis <benaka@piwik.pro>2015-05-13 08:23:42 +0300
commit982275422bc76992e9498ce4c9fd4499dae840c9 (patch)
tree5c6aa5fe2d168a680b69139186baadbf553d2be5 /plugins/CoreHome/javascripts/broadcast.js
parenta53ae704fecf5fb8c991b8f52275c7327429515f (diff)
Remove jquery.history plugin, make sure broadcast starts a digest cycle after modifying (through the history service), hide error in anchorLinkFix code if hash is not valid element selector, and use .path to push new history items.
Diffstat (limited to 'plugins/CoreHome/javascripts/broadcast.js')
-rw-r--r--plugins/CoreHome/javascripts/broadcast.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js
index 5ada120a6b..41e83ecdbf 100644
--- a/plugins/CoreHome/javascripts/broadcast.js
+++ b/plugins/CoreHome/javascripts/broadcast.js
@@ -222,8 +222,9 @@ var broadcast = {
else {
// Let history know about this new Hash and load it.
broadcast.forceReload = true;
- angular.element(document).injector().invoke(function (historyService) {
+ angular.element(document).injector().invoke(function (historyService, $rootScope) {
historyService.load(currentHashStr);
+ $rootScope.$apply();
});
}
},
@@ -380,8 +381,9 @@ var broadcast = {
}
broadcast.forceReload = false;
- angular.element(document).injector().invoke(function (historyService) {
+ angular.element(document).injector().invoke(function (historyService, $rootScope) {
historyService.load(newHash);
+ $rootScope.$apply();
});
},