refs #3813 fixed bug with ugly spaces in sitesearch datatable. proble…

…m was the datatable manager that didn't work with diffrent types of datatables on one page
matomo-org · Apr 5, 2013 · 0047ff1 · 0047ff1
1 parent d646c5f
commit 0047ff1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/plugins/CoreHome/templates/datatable.tpl b/plugins/CoreHome/templates/datatable.tpl
@@ -1,4 +1,4 @@
-<div class="dataTable" data-report="{$properties.uniqueId}" data-params="{$javascriptVariablesToSet|@json_encode|escape:'html'}">
+<div class="dataTable" data-table-type="dataTable" data-report="{$properties.uniqueId}" data-params="{$javascriptVariablesToSet|@json_encode|escape:'html'}">
     <div class="reportDocumentation">
         {if !empty($reportDocumentation)}<p>{$reportDocumentation}</p>{/if}
         {if isset($properties.metadata.archived_date)}<span class='helpDate'>{$properties.metadata.archived_date}</span>{/if}

diff --git a/plugins/CoreHome/templates/datatable_actions.tpl b/plugins/CoreHome/templates/datatable_actions.tpl
@@ -1,4 +1,4 @@
-<div class="dataTable" data-report="{$properties.uniqueId}" data-params="{$javascriptVariablesToSet|@json_encode|escape:'html'}">
+<div class="dataTable" data-table-type="actionDataTable" data-report="{$properties.uniqueId}" data-params="{$javascriptVariablesToSet|@json_encode|escape:'html'}">
     <div class="reportDocumentation">
         {if !empty($reportDocumentation)}<p>{$reportDocumentation}</p>{/if}
         {if isset($properties.metadata.archived_date)}<span class='helpDate'>{$properties.metadata.archived_date}</span>{/if}
@@ -47,7 +47,7 @@
             {if $properties.show_footer}
                 {include file="CoreHome/templates/datatable_footer.tpl"}
             {/if}
-            {include file="CoreHome/templates/datatable_actions_js.tpl"}
+            {include file="CoreHome/templates/datatable_js.tpl"}
         {/if}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_actions_js.tpl b/plugins/CoreHome/templates/datatable_actions_js.tpl
diff --git a/plugins/CoreHome/templates/datatable_js.tpl b/plugins/CoreHome/templates/datatable_js.tpl
@@ -1,7 +1,6 @@
-{if !isset($dataTableClassName)}{assign var=dataTableClassName value=dataTable}{/if}
 <script type="text/javascript" defer="defer">
     $(document).ready(function () {literal}{{/literal}
-        piwik.DataTableManager.initNewDataTables({$dataTableClassName});
+        piwik.DataTableManager.initNewDataTables();
         {literal}
     }{/literal});
 </script>
diff --git a/plugins/CoreHome/templates/datatable_manager.js b/plugins/CoreHome/templates/datatable_manager.js
@@ -42,17 +42,19 @@
         /**
          * Initializes all uninitialized datatable elements. Uninitialized
          * datatable elements do not have an ID set.
-         *
-         * @param {Function} The DataTable's JS class.
          */
-        initNewDataTables: function (klass) {
+        initNewDataTables: function () {
             var self = this;
 
             // find each datatable that hasn't been initialized (has no id attribute),
             // and initialize it
             $('div.dataTable').each(function () {
                 if (!$(this).attr('id')) {
                     var params = JSON.parse($(this).attr('data-params') || '{}');
+                    var tableType = $(this).attr('data-table-type');
+                    if (!tableType) {
+                        tableType = 'dataTable';
+                    }
 
                     // convert values in params that are arrays to comma separated string lists
                     for (var key in params) {
@@ -61,7 +63,7 @@
                         }
                     }
 
-                    self.initSingleDataTable(this, klass, params);
+                    self.initSingleDataTable(this, window[tableType], params);
                 }
             });
         },