diff options
| author | diosmosis <benaka.moorthi@gmail.com> | 2013-02-26 02:04:50 +0400 |
|---|---|---|
| committer | diosmosis <benaka.moorthi@gmail.com> | 2013-02-26 02:04:50 +0400 |
| commit | c6ac229c8e7d6cf032d50ae604f829933b11fd73 (patch) | |
| tree | b42d93231c2abe6ccd5e6175a43bd72ced0f77d2 /plugins/UsersManager | |
| parent | b3486f7d33f00f750e92ee94bda2ef6c4746ea83 (diff) | |
Refs #1845, switch to async JS in other places and apply fixes to tracking code admin page & other pages.
Notes:
* Fix bug in Installation page that displays JS where newlines were not displayed and text would not be selected on click.
* Modify piwik.js to make sure setTrackerUrl is called before _paq is processed.
* Move _paq modifications in tracker code to global scope outside every anonymous function.
* Fix bug in rewritten site selector widget where selecting the same site didn't fire an event (necessary for some uses).
* Fix bug where change of site resulted in delay before site name in labels changed.
* Fix bug where site name was double encoded in tracking code admin page.
* Rewrite piwik_tag.tpl to use async tracking code.
Diffstat (limited to 'plugins/UsersManager')
| -rw-r--r-- | plugins/UsersManager/templates/UsersManager.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js index c361d68a0b..505e400f44 100644 --- a/plugins/UsersManager/templates/UsersManager.js +++ b/plugins/UsersManager/templates/UsersManager.js @@ -244,11 +244,14 @@ $(document).ready( function() { // when a site is selected, reload the page w/o showing the ajax loading element $('#usersManagerSiteSelect').bind('piwik:siteSelected', function(e, site) { - switchSite( - site.id, - site.name, - false /* do not show main ajax loading animation */, - true /* do not go to all websites dash */ - ); + if (site.id != piwik.idSite) + { + switchSite( + site.id, + site.name, + false /* do not show main ajax loading animation */, + true /* do not go to all websites dash */ + ); + } }); }); |