Merge branch 'master' of github.com:piwik/piwik

matomo-org · Mar 5, 2014 · bb0377a · bb0377a
2 parents 4bb969c + 28781af
commit bb0377a
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 16 deletions.
diff --git a/plugins/Actions/javascripts/actionsDataTable.js b/plugins/Actions/javascripts/actionsDataTable.js
@@ -242,14 +242,16 @@
                         }
                     }
                 });
-                
+
                 var table = $(domElem);
                 if (!table.hasClass('dataTable')) {
                     table = table.closest('.dataTable');
                 }
                 if (stripingNeeded) {
                     self.addOddAndEvenClasses(table);
                 }
+
+                self.$element.trigger('piwik:actionsSubTableToggled');
             }
 
             // toggle the +/- image
@@ -278,6 +280,9 @@
             $('.datatableRelatedReports', content).replaceWith(oldReportsElem);
 
             dataTableSel.replaceWith(content);
+
+            content.trigger('piwik:dataTableLoaded');
+
             piwikHelper.lazyScrollTo(content[0], 400);
 
             return content;
@@ -311,6 +316,8 @@
             // we execute the bindDataTableEvent function for the new DIV
             self.bindEventsAndApplyStyle($('#' + self.workingDivId), response);
 
+            self.$element.trigger('piwik:actionsSubDataTableLoaded');
+
             //bind back the click event (disabled to avoid double-click problem)
             self.disabledRowDom.click(
                 function () {

diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
@@ -252,6 +252,8 @@ $.extend(DataTable.prototype, UIControl.prototype, {
             dataTableSel.replaceWith(content);
         }
 
+        content.trigger('piwik:dataTableLoaded');
+
         piwikHelper.lazyScrollTo(content[0], 400);
 
         return content;

diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
@@ -204,12 +204,11 @@ public function addMenus()
             $login = Piwik::getCurrentUserLogin();
 
             $dashboards = $this->getAllDashboards($login);
-            if (count($dashboards) > 1) {
-                $pos = 0;
-                foreach ($dashboards AS $dashboard) {
-                    MenuMain::getInstance()->add('Dashboard_Dashboard', $dashboard['name'], array('module' => 'Dashboard', 'action' => 'embeddedIndex', 'idDashboard' => $dashboard['iddashboard']), true, $pos);
-                    $pos++;
-                }
+
+            $pos = 0;
+            foreach ($dashboards as $dashboard) {
+                MenuMain::getInstance()->add('Dashboard_Dashboard', $dashboard['name'], array('module' => 'Dashboard', 'action' => 'embeddedIndex', 'idDashboard' => $dashboard['iddashboard']), true, $pos);
+                $pos++;
             }
         }
     }

diff --git a/plugins/Dashboard/javascripts/dashboard.js b/plugins/Dashboard/javascripts/dashboard.js
@@ -194,7 +194,7 @@ function copyDashboardToUser() {
             }
         };
 
-        $('body')[0].addEventListener('mouseup', this.onBodyMouseUp);
+        $('body').on('mouseup', this.onBodyMouseUp);
 
         // setup widgetPreview
         this.$element.widgetPreview({
@@ -222,7 +222,7 @@ function copyDashboardToUser() {
         _destroy: function () {
             UIControl.prototype._destroy.call(this);
 
-            $('body')[0].removeEventListener('mouseup', this.onBodyMouseUp);
+            $('body').off('mouseup', null, this.onBodyMouseUp);
         }
     });
 

diff --git a/plugins/Dashboard/javascripts/dashboardObject.js b/plugins/Dashboard/javascripts/dashboardObject.js
@@ -490,7 +490,6 @@
      * @param {string}  [action]  action to perform (defaults to saveLayout)
      */
     function saveLayout(action) {
-
         var columns = [];
 
         var columnNumber = 0;

diff --git a/plugins/Dashboard/javascripts/dashboardWidget.js b/plugins/Dashboard/javascripts/dashboardWidget.js
@@ -36,7 +36,8 @@
             onRemove: null,
             onRefresh: null,
             onMaximise: null,
-            onMinimise: null
+            onMinimise: null,
+            autoMaximiseVisualizations: ['tableAllColumns', 'tableGoals']
         },
 
         /**
@@ -144,7 +145,9 @@
          * @param {object} parameters
          */
         setParameters: function (parameters) {
-            if (!this.isMaximised && (parameters.viewDataTable == 'tableAllColumns' || parameters.viewDataTable == 'tableGoals')) {
+            if (!this.isMaximised
+                && this.options.autoMaximiseVisualizations.indexOf(parameters.viewDataTable) !== -1
+            ) {
                 this.maximise();
             }
             for (var name in parameters) {

diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -1072,7 +1072,7 @@ $(document).ready(function() {
 
                     var idx = null;
                     for (idx in self.props.availableSegments) {
-                        if (self.props.availableSegments[idx].definition == params.definition) {
+                        if (self.props.availableSegments[idx].idsegment == params.idSegment) {
                             break;
                         }
                     }
@@ -1170,7 +1170,7 @@ $(document).ready(function() {
             }
         };
 
-        $('body')[0].addEventListener('mouseup', this.onMouseUp);
+        $('body').on('mouseup', this.onMouseUp);
     };
 
     /**
@@ -1194,7 +1194,7 @@ $(document).ready(function() {
         _destroy: function () {
             UIControl.prototype._destroy.call(this);
 
-            $('body')[0].removeEventListener('mouseup', this.onMouseUp);
+            $('body').off('mouseup', null, this.onMouseUp);
         }
     });
 

diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig
@@ -63,4 +63,7 @@
     <div id='iframeDivToExport' style='display:none;'></div>
 </div>
 </div>
+
+{% include "@Dashboard/_widgetFactoryTemplate.twig" %}
+
 {% endblock %}
diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
@@ -51,7 +51,7 @@ public function testGet()
             'SEO'                          => 2,
             'Example Widgets'              => 4,
             'DevicesDetection_DevicesDetection' => 7,
-            'Insights_Category' => 1
+            'Insights_WidgetCategory' => 2
         );
 
         // number of main categories