Refs #4116, move initElements code to utility function in UIControl.

matomo-org · Sep 12, 2013 · 9479953 · 9479953
1 parent ac285a1
commit 9479953
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/plugins/CoreHome/javascripts/uiControl.js b/plugins/CoreHome/javascripts/uiControl.js
@@ -56,6 +56,15 @@
         }
     };
 
+    UIControl.initElements = function (klass, selector) {
+        $(selector).each(function () {
+            if (!$(this).attr('data-inited')) {
+                var control = new klass(this);
+                $(this).attr('data-inited', 1);
+            }
+        });
+    };
+
     UIControl.prototype = {
 
         /**

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
@@ -153,7 +153,8 @@ public function getLastVisitsForVisitor($visitorId, $idSite, $filter_limit = 10,
      * @param bool $doNotFetchActions
      * @return DataTable
      */
-    public function getLastVisitsDetails($idSite, $period, $date, $segment = false, $filter_limit = false, $filter_offset = false, $minTimestamp = false, $flat = false, $doNotFetchActions = false)
+    public function getLastVisitsDetails($idSite, $period = false, $date = false, $segment = false, $filter_limit = false,
+                                         $filter_offset = false, $minTimestamp = false, $flat = false, $doNotFetchActions = false)
     {
         if (empty($filter_limit)) {
             $filter_limit = 10;

diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js
@@ -31,14 +31,7 @@
      * if the element has not already been initialized.
      */
     VisitorProfileControl.initElements = function () {
-        $('.visitor-profile').each(function () {
-            if (!$(this).attr('data-inited')) {
-                var control = new VisitorProfileControl(this);
-
-                $(this).data('uiControlObject', control);
-                $(this).attr('data-inited', 1);
-            }
-        });
+        UIControl.initElements(this, '.visitor-profile');
     };
 
     /**

diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js
@@ -19,14 +19,7 @@
     };
 
     RealtimeMap.initElements = function () {
-        $('.RealTimeMap').each(function () {
-            if (!$(this).attr('data-inited')) {
-                var control = new RealtimeMap(this);
-
-                $(this).data('uiControlObject', control);
-                $(this).attr('data-inited', 1);
-            }
-        });
+        UIControl.initElements(this, '.RealTimeMap');
     };
 
     $.extend(RealtimeMap.prototype, UIControl.prototype, {

diff --git a/plugins/UserCountryMap/templates/realtimeMap.twig b/plugins/UserCountryMap/templates/realtimeMap.twig
@@ -21,4 +21,4 @@
     </div>
 
 </div>
-<script type="text/javascript">UserCountryMap.RealtimeMap.initElements();</script>
+<script type="text/javascript">UserCountryMap.RealtimeMap.initElements();</script>