From 6af210e3410be3b59b9d9305d37f4f964af67e96 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Fri, 21 Feb 2014 02:29:48 +0100
Subject: [PATCH] refs #2174 workaround for a bug in Webkit which does not
apply the styles / render in this case. only if one manually adds a class
afterwards and removes it again
---
plugins/CoreAdminHome/templates/trackingCodeGenerator.twig | 2 ++
.../CoreHome/javascripts/siteselector/siteselector-directive.js | 1 -
plugins/CoreHome/templates/_siteSelectHeader.twig | 2 +-
.../multisites-dashboard/multisites-dashboard-model.js | 2 +-
plugins/UsersManager/templates/index.twig | 1 +
plugins/UsersManager/templates/userSettings.twig | 1 +
6 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index bd64bf8f70..fe8c04997a 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -28,6 +28,7 @@
<label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
<div piwik-siteselector
+ class="sites_autocomplete"
siteid="{{ idSite }}"
sitename="{{ defaultReportSiteName }}"
show-all-sites-item="false"
@@ -200,6 +201,7 @@
{# website #}
<label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
<div piwik-siteselector
+ class="sites_autocomplete"
siteid="{{ idSite }}"
sitename="{{ defaultReportSiteName }}"
id="image-tracker-website"
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
index cac0a87eac..fb4e73c3b3 100644
--- a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
+++ b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
@@ -30,7 +30,6 @@ angular.module('piwikApp').directive('piwikSiteselector', function($document, pi
templateUrl: 'plugins/CoreHome/javascripts/siteselector/siteselector.html',
controller: 'SiteSelectorController',
compile: function (element, attrs) {
- element.addClass('sites_autocomplete');
for (var index in defaults) {
if (!attrs[index]) { attrs[index] = defaults[index]; }
diff --git a/plugins/CoreHome/templates/_siteSelectHeader.twig b/plugins/CoreHome/templates/_siteSelectHeader.twig
index d150978d5d..547f2e4129 100644
--- a/plugins/CoreHome/templates/_siteSelectHeader.twig
+++ b/plugins/CoreHome/templates/_siteSelectHeader.twig
@@ -1,5 +1,5 @@
<div class="top_bar_sites_selector {% if currentModule == 'CoreHome' %}sites_selector_in_dashboard{% endif %}">
<label>{{ 'General_Website'|translate }}</label>
- <div piwik-siteselector></div>
+ <div piwik-siteselector class="sites_autocomplete"></div>
</div>
\ No newline at end of file
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
index 571d6a8983..2f1ed63378 100644
--- a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
+++ b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
@@ -166,7 +166,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
if (!lastDate) {
return;
}
-
+
model.lastVisitsDate = lastDate;
return piwikApi.fetch({
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 928165ded9..833245161e 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -14,6 +14,7 @@
{% endset %}
<div piwik-siteselector
+ class="sites_autocomplete"
siteid="{{ idSiteSelected }}"
sitename="{{ defaultReportSiteName }}"
all-sites-text="{{ applyAllSitesText|raw }}"
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 6fc0baf03e..d98de49b94 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -45,6 +45,7 @@
{% endif %}
<div piwik-siteselector
+ class="sites_autocomplete"
siteid="{{ defaultReportIdSite }}"
sitename="{{ defaultReportSiteName }}"
switch-site-on-select="false"
--
GitLab