Merge from master

3 files changed, 22 insertions, 15 deletions

diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index 1f326563b8..c49fa226d3 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -8,24 +8,30 @@
  * @category Piwik_Plugins
  * @package Piwik_Widgetize
  */
+use Piwik\API\Request;
+use Piwik\Common;
+use Piwik\Controller;
+use Piwik\FrontController;
+use Piwik\View;
+use Piwik\WidgetsList;
 
 /**
  *
  * @package Piwik_Widgetize
  */
-class Piwik_Widgetize_Controller extends Piwik_Controller
+class Piwik_Widgetize_Controller extends Controller
 {
     public function index()
     {
-        $view = new Piwik_View('@Widgetize/index');
-        $view->availableWidgets = Piwik_Common::json_encode(Piwik_GetWidgetsList());
+        $view = new View('@Widgetize/index');
+        $view->availableWidgets = Common::json_encode(WidgetsList::get());
         $this->setGeneralVariablesView($view);
         echo $view->render();
     }
 
     public function testJsInclude1()
     {
-        $view = new Piwik_View('@Widgetize/testJsInclude1');
+        $view = new View('@Widgetize/testJsInclude1');
         $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original';
         echo $view->render();
@@ -33,7 +39,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
 
     public function testJsInclude2()
     {
-        $view = new Piwik_View('@Widgetize/testJsInclude2');
+        $view = new View('@Widgetize/testJsInclude2');
         $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0';
         $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
@@ -42,16 +48,16 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
 
     public function iframe()
     {
-        Piwik_API_Request::reloadAuthUsingTokenAuth();
+        Request::reloadAuthUsingTokenAuth();
         $this->init();
-        $controllerName = Piwik_Common::getRequestVar('moduleToWidgetize');
-        $actionName = Piwik_Common::getRequestVar('actionToWidgetize');
+        $controllerName = Common::getRequestVar('moduleToWidgetize');
+        $actionName = Common::getRequestVar('actionToWidgetize');
         $parameters = array($fetch = true);
-        $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
+        $outputDataTable = FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
         if ($controllerName == 'Dashboard' && $actionName == 'index') {
-            $view = new Piwik_View('@Widgetize/iframe_empty');
+            $view = new View('@Widgetize/iframe_empty');
         } else {
-            $view = new Piwik_View('@Widgetize/iframe');
+            $view = new View('@Widgetize/iframe');
         }
         $this->setGeneralVariablesView($view);
         $view->setXFrameOptions('allow');
diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php
index f959bf9743..27a002ccb9 100644
--- a/plugins/Widgetize/Widgetize.php
+++ b/plugins/Widgetize/Widgetize.php
@@ -9,12 +9,13 @@
  * @category Piwik_Plugins
  * @package Piwik_Widgetize
  */
+use Piwik\Plugin;
 
 /**
  *
  * @package Piwik_Widgetize
  */
-class Piwik_Widgetize extends Piwik_Plugin
+class Piwik_Widgetize extends Plugin
 {
     /**
      * @see Piwik_Plugin::getListHooksRegistered
diff --git a/plugins/Widgetize/javascripts/widgetize.js b/plugins/Widgetize/javascripts/widgetize.js
index fb65dc7d02..a50dd34630 100644
--- a/plugins/Widgetize/javascripts/widgetize.js
+++ b/plugins/Widgetize/javascripts/widgetize.js
@@ -10,7 +10,7 @@ function widgetize() {
 
     this.getInputFormWithHtml = function (inputId, htmlEmbed) {
         return '<input class="formEmbedCode" id="' + inputId + '" value="' + htmlEmbed.replace(/"/g, '&quot;') + '" onclick="javascript:document.getElementById(\'' + inputId + '\').focus();document.getElementById(\'' + inputId + '\').select();" readonly="true" type="text" />';
-    }
+    };
 
     this.getEmbedUrl = function (parameters, exportFormat) {
         var copyParameters = {};
@@ -31,11 +31,11 @@ function widgetize() {
             "&date=" + broadcast.getValueFromUrl('date') +
             "&disableLink=1&widget=1";
         return sourceUrl;
-    }
+    };
 
     this.htmlentities = function (s) {
         return s.replace(/[<>&]/g, function (m) { return "&" + m.charCodeAt(0) + ";"; });
-    }
+    };
 
     this.callbackAddExportButtonsUnderWidget = function (widgetUniqueId, loadedWidgetElement) {
         var widget = widgetsHelper.getWidgetObjectFromUniqueId(widgetUniqueId);