Skip to content
Extraits de code Groupes Projets
Valider f6d5fe0a rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Use CSS to show/hide dashboard buttons instead of JavaScript.

parent e437c822
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
maximise: function () { maximise: function () {
this.isMaximised = true; this.isMaximised = true;
$('.button#close, .button#maximise', this.element).hide();
this.element.before('<div id="' + this.uniqueId + '-placeholder" class="widgetPlaceholder widget"> </div>'); this.element.before('<div id="' + this.uniqueId + '-placeholder" class="widgetPlaceholder widget"> </div>');
$('#' + this.uniqueId + '-placeholder').height(this.element.height()); $('#' + this.uniqueId + '-placeholder').height(this.element.height());
$('#' + this.uniqueId + '-placeholder').width(this.element.width() - 16); $('#' + this.uniqueId + '-placeholder').width(this.element.width() - 16);
...@@ -108,7 +107,6 @@ ...@@ -108,7 +107,6 @@
autoOpen: true, autoOpen: true,
close: function (event, ui) { close: function (event, ui) {
self.isMaximised = false; self.isMaximised = false;
$('.button#minimise, .button#refresh', $(this)).hide();
$('body').off('.dashboardWidget'); $('body').off('.dashboardWidget');
$(this).dialog("destroy"); $(this).dialog("destroy");
$('#' + self.uniqueId + '-placeholder').replaceWith(this); $('#' + self.uniqueId + '-placeholder').replaceWith(this);
...@@ -184,7 +182,9 @@ ...@@ -184,7 +182,9 @@
}, },
/** /**
* TODO * Get widget parameters
*
* @param {object} parameters
*/ */
getParameters: function () { getParameters: function () {
return this.widgetParameters; return this.widgetParameters;
...@@ -213,22 +213,17 @@ ...@@ -213,22 +213,17 @@
if (!self.isMaximised) { if (!self.isMaximised) {
$(this).addClass('widgetHover'); $(this).addClass('widgetHover');
$('.widgetTop', this).addClass('widgetTopHover'); $('.widgetTop', this).addClass('widgetTopHover');
$('.button#close, .button#maximise', this).show();
if (!$('.widgetContent', this).hasClass('hidden')) {
$('.button#minimise, .button#refresh', this).show();
}
} }
}) })
.on('mouseleave.dashboardWidget', function () { .on('mouseleave.dashboardWidget', function () {
if (!self.isMaximised) { if (!self.isMaximised) {
$(this).removeClass('widgetHover'); $(this).removeClass('widgetHover');
$('.widgetTop', this).removeClass('widgetTopHover'); $('.widgetTop', this).removeClass('widgetTopHover');
$('.button#close, .button#maximise, .button#minimise, .button#refresh', this).hide();
} }
}); });
if (this.options.isHidden) { if (this.options.isHidden) {
$('.widgetContent', widgetElement).toggleClass('hidden'); $('.widgetContent', widgetElement).toggleClass('hidden').closest('.widget').toggleClass('hiddenContent');
} }
$('.button#close', widgetElement) $('.button#close', widgetElement)
...@@ -244,9 +239,8 @@ ...@@ -244,9 +239,8 @@
if ($('.widgetContent', $(this).parents('.widget')).hasClass('hidden')) { if ($('.widgetContent', $(this).parents('.widget')).hasClass('hidden')) {
self.isMaximised = false; self.isMaximised = false;
self.options.isHidden = false; self.options.isHidden = false;
$('.widgetContent', $(this).parents('.widget')).removeClass('hidden'); $(this).closest('.widget').removeClass('hiddenContent').find('.widgetContent').removeClass('hidden');
$('.button#minimise, .button#refresh', $(this).parents('.widget')).show(); $(this).closest('.widget').find('div.piwik-graph').trigger('resizeGraph');
$(this).parents('.widget').find('div.piwik-graph').trigger('resizeGraph');
self.options.onChange(); self.options.onChange();
$('.widgetContent', widgetElement).trigger('widget:minimise'); $('.widgetContent', widgetElement).trigger('widget:minimise');
} else { } else {
...@@ -257,8 +251,7 @@ ...@@ -257,8 +251,7 @@
$('.button#minimise', widgetElement) $('.button#minimise', widgetElement)
.on('click.dashboardWidget', function (ev) { .on('click.dashboardWidget', function (ev) {
if (!self.isMaximised) { if (!self.isMaximised) {
$('.widgetContent', $(this).parents('.widget')).addClass('hidden'); $('.widgetContent', $(this).closest('.widget').addClass('hiddenContent')).addClass('hidden');
$('.button#minimise, .button#refresh', $(this).parents('.widget')).hide();
self.options.isHidden = true; self.options.isHidden = true;
self.options.onChange(); self.options.onChange();
} else { } else {
......
...@@ -144,7 +144,6 @@ ...@@ -144,7 +144,6 @@
#close.button, #maximise.button, #minimise.button, #refresh.button { #close.button, #maximise.button, #minimise.button, #refresh.button {
float: right; float: right;
display: none;
margin: 6px 6px 0 0; margin: 6px 6px 0 0;
} }
...@@ -522,3 +521,23 @@ div.widgetpreview-preview { ...@@ -522,3 +521,23 @@ div.widgetpreview-preview {
} }
} }
.widgetTop .button {
display:none;
}
.widgetTop.widgetTopHover .button {
display:block;
}
.widget.hiddenContent .widgetTop.widgetTopHover {
.button#minimise,.button#refresh {
display:none;
}
}
.ui-dialog .widget {
.button#close,.button#maximise {
display:none;
}
}
\ No newline at end of file
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter