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:
authorsgiehl <stefangiehl@gmail.com>2012-02-16 03:08:48 +0400
committersgiehl <stefangiehl@gmail.com>2012-02-16 03:08:48 +0400
commitb96a6d9526cff4b98838d6580aed73682864f086 (patch)
tree43c4436fe3edec2c4a13f2b973ed4dfa2cc866de /libs/jquery
parentd240360709ba23e35465fca7c740c9299cf62474 (diff)
fixes #2922 needed to patch the new history plugin as the reload was prevented there. Only tested that changes in newer browsers which supports the hashchange event (see http://help.dottoro.com/ljgggdjt.php for supported browsers)
git-svn-id: http://dev.piwik.org/svn/trunk@5853 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'libs/jquery')
-rw-r--r--libs/jquery/jquery.history.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/jquery/jquery.history.js b/libs/jquery/jquery.history.js
index c95debc17f..305118bef8 100644
--- a/libs/jquery/jquery.history.js
+++ b/libs/jquery/jquery.history.js
@@ -109,8 +109,8 @@
if(hash != self._appState) {
locationWrapper.put(hash);
self._appState = hash;
- self.callback(hash);
}
+ self.callback(hash);
}
};
@@ -144,8 +144,8 @@
locationWrapper.put(hash);
iframeWrapper.put(hash);
self._appState = hash;
- self.callback(hash);
}
+ self.callback(hash);
}
};
@@ -158,7 +158,11 @@
self.callback(locationWrapper.get());
},
load: function(hash) {
- locationWrapper.put(hash);
+ if(locationWrapper.get() == hash) {
+ self.callback(locationWrapper.get());
+ } else {
+ locationWrapper.put(hash);
+ }
}
};