Refs #4100, #4041, #4077, add minimal UI module inclusion/creation function and use for SeriesPicker. Also includes a documentation correction for SeriesPicker.

2 files changed, 10 insertions, 7 deletions

diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js
index 90a51ad2a5..3c0f08bff9 100644
--- a/plugins/CoreVisualizations/javascripts/jqplot.js
+++ b/plugins/CoreVisualizations/javascripts/jqplot.js
@@ -1036,11 +1036,13 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
 //  SERIES PICKER
 // ------------------------------------------------------------
 
-(function ($) {
+(function ($, require) {
     $.jqplot.preInitHooks.push(function (target, data, options) {
+        var SeriesPicker = require('piwik/DataTableVisualizations/Widgets').SeriesPicker;
+
         // add plugin as an attribute to the plot
         var dataTable = $('#' + target).closest('.dataTable').data('dataTableInstance');
-        var seriesPicker = new piwik.SeriesPicker(dataTable);
+        var seriesPicker = new SeriesPicker(dataTable);
 
         // handle placeSeriesPicker event
         var plot = this;
@@ -1060,7 +1062,7 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
     $.jqplot.postDrawHooks.push(function () {
         this.plugins.seriesPicker.init();
     });
-})(jQuery);
+})(jQuery, require);
 
 // ------------------------------------------------------------
 //  PIE CHART LEGEND PLUGIN FOR JQPLOT
diff --git a/plugins/CoreVisualizations/javascripts/seriesPicker.js b/plugins/CoreVisualizations/javascripts/seriesPicker.js
index 90c57e73bf..569b8aa9a4 100644
--- a/plugins/CoreVisualizations/javascripts/seriesPicker.js
+++ b/plugins/CoreVisualizations/javascripts/seriesPicker.js
@@ -1,14 +1,14 @@
 /**
  * Piwik - Web Analytics
  *
- * Adapter for jqplot
+ * Series Picker widget addition for DataTable visualizations.
  *
  * @link http://www.jqplot.com
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-(function ($, doc) {
+(function ($, doc, require) {
 
     /**
      * This class creates and manages the Series Picker for certain DataTable visualizations.
@@ -335,6 +335,7 @@
         },
     };
 
-    piwik.SeriesPicker = SeriesPicker;
+    var exports = require('piwik/DataTableVisualizations/Widgets');
+    exports.SeriesPicker = SeriesPicker;
 
-})(jQuery, document);
\ No newline at end of file
+})(jQuery, document, require);
\ No newline at end of file