projects
/
web.mtrack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f6c21a0
)
MTrackWeb/templates/images/mtrack.js/mtrack2.core.js
author
Alan Knowles
<alan@roojs.com>
Fri, 16 Dec 2011 08:32:22 +0000
(16:32 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 16 Dec 2011 08:32:22 +0000
(16:32 +0800)
MTrackWeb/templates/images/mtrack.js/mtrack2.core.js
patch
|
blob
|
history
diff --git
a/MTrackWeb/templates/images/mtrack.js/mtrack2.core.js
b/MTrackWeb/templates/images/mtrack.js/mtrack2.core.js
index
3b803c4
..
fdd8627
100644
(file)
--- a/
MTrackWeb/templates/images/mtrack.js/mtrack2.core.js
+++ b/
MTrackWeb/templates/images/mtrack.js/mtrack2.core.js
@@
-339,7
+339,6
@@
Roo.onReady(function() {
MTrack.currentURL = href;
var pgn = MTrack.ajaxLoad(href);
- ..MTrack.blockActivate = true;
MTrack.blockActivate = false;
@@
-391,7
+390,11
@@
MTrack.register('.dateinput', 'each', function(e) {
MTrack.register('a.browse-link', 'on', 'click', function(event)
{
event.preventDefault();
-
+
+ if (!MTrackWeb.loaded) {
+ return;
+ }
+
var href= this.dom.getAttribute('href').substring(baseURL.length);
try {
window.history.pushState( { url: href }, "Browse : " + href , this.dom.href );