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
path: root/js
diff options
context:
space:
mode:
authordiosmosis <benakamoorthi@fastmail.fm>2014-03-02 23:23:52 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-03-02 23:23:52 +0400
commit7345411d6a062b52d75a31d09db64cd1f4bb4063 (patch)
tree141e446a5031420888f45ccd7fc646cf5bc63ca3 /js
parentc21379323d472d0e7e59d9fde106856c03dd17cd (diff)
Fixing UI tests build:
- change idsite to idSite in Overlay URLs in piwik.js - don't init top controls if top controls container can't be found - add default parameter for $urls in SitesManager.setSiteAliasUrls so site alias URLs can be reset - fix bugs in UI tests database setup (including moving dashboard setup to UITestFixture class & keeping outside of setUp function so --persist-fixture-data will work in case the super user is deleted) - Add queryParamOverride testingEnvironment variable. - fix screenshot testing page renderer's method of waiting for CSS images - add margin bottom & left for widgetized controls for tests - add diagnostics to upload_artifacts.sh script
Diffstat (limited to 'js')
-rw-r--r--js/piwik.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/piwik.js b/js/piwik.js
index 406894b9b6..5fbee7b4ff 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -999,7 +999,7 @@ if (typeof Piwik !== 'object') {
// check whether we were redirected from the piwik overlay plugin
var referrerRegExp = new RegExp('index\\.php\\?module=Overlay&action=startOverlaySession'
- + '&idsite=([0-9]+)&period=([^&]+)&date=([^&]+)$');
+ + '&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)$');
var match = referrerRegExp.exec(documentAlias.referrer);