Merge pull request #8766 from piwik/widget_maximise_footer_bug

Fixes #734, fix broken footer toggling when widgets are/were maximized by forcing footer to be expanded when widgets are maximized.
matomo-org · Sep 17, 2015 · e742c85 · e742c85
2 parents cb813d7 + 2e9d1d8
commit e742c85
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less
@@ -27,10 +27,6 @@
   margin-bottom: -5px;
 }
 
-.ui-dialog .evolution-annotations > span {
-  top: 25px;
-}
-
 body > .widget .evolution-annotations > span {
   top: -25px;
 }

diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
@@ -781,9 +781,6 @@ $.extend(DataTable.prototype, UIControl.prototype, {
                         ;
 
                     var annotationsCss = {left: 6}; // padding-left of .jqplot-graph element (in _dataTableViz_jqplotGraph.tpl)
-                    if (self.isWithinDialog(domElem)) {
-                        annotationsCss['top'] = -datatableFeatures.height() - annotationAxisHeight + noteSize / 2;
-                    }
 
                     // set position of evolution annotation icons
                     annotations.css(annotationsCss);
@@ -1422,19 +1419,23 @@ $.extend(DataTable.prototype, UIControl.prototype, {
     },
 
     handleExpandFooter: function (domElem) {
-        if (this.isWithinDialog(domElem)) {
-            return;
-        }
-
         var footerIcons = $('.dataTableFooterIcons', domElem);
 
         if (!footerIcons.length) {
             return;
         }
 
+        if (this.isWithinDialog(domElem)) {
+            $('.dataTableFeatures', domElem).addClass('expanded');
+        }
+
         var self = this;
         function toggleFooter(event)
         {
+            if (self.isWithinDialog(domElem)) {
+                return;
+            }
+
             var icons = $('.dataTableFooterIcons', domElem);
             $('.dataTableFeatures', domElem).toggleClass('expanded');
 

diff --git a/plugins/Dashboard/javascripts/dashboardWidget.js b/plugins/Dashboard/javascripts/dashboardWidget.js
@@ -295,6 +295,8 @@
 
             var width = Math.floor($('body').width() * 0.7);
 
+            var isFooterExpanded = $('.dataTableFeatures', this.element).hasClass('expanded');
+
             var self = this;
             this.element.dialog({
                 title: '',
@@ -305,6 +307,9 @@
                 autoOpen: true,
                 close: function (event, ui) {
                     self.isMaximised = false;
+                    if (!isFooterExpanded) {
+                        $('.dataTableFeatures', self.element).removeClass('expanded');
+                    }
                     $('body').off('.dashboardWidget');
                     $(this).dialog("destroy");
                     $('#' + self.uniqueId + '-placeholder').replaceWith(this);
@@ -315,6 +320,7 @@
                 }
             });
             this.element.find('div.piwik-graph').trigger('resizeGraph');
+            $('.dataTableFeatures', this.element).addClass('expanded');
 
             var currentWidget = this.element;
             $('body').on('click.dashboardWidget', function (ev) {