diff --git a/plugins/Actions/javascripts/actionsDataTable.js b/plugins/Actions/javascripts/actionsDataTable.js index d48b8dc8e9e2a36371d8d27a32ba55f22a64bfd7..acaa7f489c8914366ac1def75bc91eeb0a25947a 100644 --- a/plugins/Actions/javascripts/actionsDataTable.js +++ b/plugins/Actions/javascripts/actionsDataTable.js @@ -278,6 +278,9 @@ $('.datatableRelatedReports', content).replaceWith(oldReportsElem); dataTableSel.replaceWith(content); + + content.trigger('piwik:dataTableLoaded'); + piwikHelper.lazyScrollTo(content[0], 400); return content; diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index b202199e71cf65fe0288e9d5a37273d9368f3304..2884d3169fc6479e06dd1832cc379d3cd80319d5 100644 --- 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 index 94fbbf6b86064e7807a0e5f6b5ce320a44d4f82b..4fe9d81f2b7198c3d241044988b559ca1e4d7e0b 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -204,12 +204,11 @@ class Dashboard extends \Piwik\Plugin $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 index d6d34269b8ae8dd7c8fc3f5b7ceba834a8129fff..5feff3c3287e93dac977463b84b1ae955cd7a924 100644 --- 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 index fec02213d5d29b0d7b5f684b3b025a5a88e9cbed..86af47f54faea1cdaf47affb6ac1c073aadd6ab1 100644 --- 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 index 33d073d95c9c111d3e35727ef02a20465829923e..ba067650263843489f9cfdd7d7c696dbff7ac9fe 100755 --- 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 index c7ee63aa57af562670964fa2a05d102a119837e8..69bd5c7ca04b034c258e520e8cdbc0a47e5b25e7 100644 --- 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); } });