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 <stefan@piwik.org>2013-09-06 01:05:43 +0400
committersgiehl <stefan@piwik.org>2013-09-06 01:05:43 +0400
commit821c6601b4f7c363abc93a1b576476fcc5668954 (patch)
tree0bbb102a71e816f3f2ab5f290ed6cff03b5a98d0 /plugins/CoreHome
parent3c11c23f3e8dc1c088a07b941d719229d6e58197 (diff)
fixed some js errors, namespaces & coding style
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r--plugins/CoreHome/javascripts/autocomplete.js9
-rw-r--r--plugins/CoreHome/javascripts/color_manager.js4
-rw-r--r--plugins/CoreHome/javascripts/dataTable.js3
3 files changed, 7 insertions, 9 deletions
diff --git a/plugins/CoreHome/javascripts/autocomplete.js b/plugins/CoreHome/javascripts/autocomplete.js
index a6beb65a31..113c14ff8f 100644
--- a/plugins/CoreHome/javascripts/autocomplete.js
+++ b/plugins/CoreHome/javascripts/autocomplete.js
@@ -33,10 +33,9 @@ $(function () {
function getUrlForWebsiteId(idSite) {
var idSiteParam = 'idSite=' + idSite;
var newParameters = 'segment=&' + idSiteParam;
- var hash = broadcast.isHashExists() ? broadcast.getHashFromUrl() : "",
- linkUrl = piwikHelper.getCurrentQueryStringWithParametersModified(newParameters)
+ var hash = broadcast.isHashExists() ? broadcast.getHashFromUrl() : "";
+ return piwikHelper.getCurrentQueryStringWithParametersModified(newParameters)
+ '#' + piwikHelper.getQueryStringWithParametersModified(hash.substring(1), newParameters);
- return linkUrl;
}
$('.sites_autocomplete').each(function () {
@@ -159,8 +158,8 @@ $(function () {
$(this).click(function (e) {
var idsite = $(this).attr('data-siteid'),
name = $(this).text(),
- mainLinkElem = $(".custom_select_main_link > span", selector)
- oldName = mainLinkElem.text();
+ mainLinkElem = $(".custom_select_main_link > span", selector);
+ oldName = mainLinkElem.text();
mainLinkElem
.attr('data-siteid', idsite)
diff --git a/plugins/CoreHome/javascripts/color_manager.js b/plugins/CoreHome/javascripts/color_manager.js
index ebc1866650..599486d19a 100644
--- a/plugins/CoreHome/javascripts/color_manager.js
+++ b/plugins/CoreHome/javascripts/color_manager.js
@@ -120,13 +120,13 @@
return [
parseInt(hexColor[0], 16),
parseInt(hexColor[1], 16),
- parseInt(hexColor[2], 16),
+ parseInt(hexColor[2], 16)
];
} else {
return [
parseInt(hexColor.substring(0,2), 16),
parseInt(hexColor.substring(2,4), 16),
- parseInt(hexColor.substring(4,6), 16),
+ parseInt(hexColor.substring(4,6), 16)
];
}
},
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index e37848b73e..f8c43b95f2 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -717,8 +717,7 @@ dataTable.prototype =
// we only reset the limit filter, in case switch to table view from cloud view where limit is custom set to 30
// this value is stored in config file General->datatable_default_limit but this is more an edge case so ok to set it to 10
- var viewDataTable = $(this).attr('format');
- self.param.viewDataTable = viewDataTable;
+ self.param.viewDataTable = $(this).attr('format');
//self.resetAllFilters();