Work on js

Author: arrilot

src/Factories/JavascriptFactory.php

@@ -71,80 +71,84 @@ public function getContainerId()
     }
 
     /**
-     * Produce javascript data object for ajax call.
+     * Determine what to use - jquery or native js.
      *
-     * @return string
+     * @return bool
      */
-    protected function produceJavascriptData()
+    protected function useJquery()
     {
-        $id = WidgetId::get();
-        $name = $this->widgetFactory->widgetName;
-        $params = serialize($this->widgetFactory->widgetFullParams);
-        $token = $this->widgetFactory->app->csrf_token();
-
-        if ($this->useJquery()) {
-            return json_encode([
-                'id'     => $id,
-                'name'   => $name,
-                'params' => $params,
-                '_token' => $token,
-            ]);
-        }
+        return !$this->widgetFactory->app->config('laravel-widgets.disable_jquery', false);
+    }
 
-        return
-            "'id=' + encodeURIComponent('{$id}')".
-            "'&name=' + encodeURIComponent('{$name}')".
-            "'&params=' + encodeURIComponent('{$params}')".
-            "'&_token=' + encodeURIComponent('{$token}')";
+    /**
+     * Construct ajax call for loaders.
+     *
+     * @return string
+     */
+    protected function constructAjaxCall()
+    {
+        $data = [
+            'id'     => WidgetId::get(),
+            'name'   => $this->widgetFactory->widgetName,
+            'params' => serialize($this->widgetFactory->widgetFullParams),
+            '_token' => $this->widgetFactory->app->csrf_token(),
+        ];
+
+        return $this->useJquery()
+            ? $this->constructJqueryAjaxCall($data)
+            : $this->constructNativeJsAjaxCall($data);
     }
 
     /**
-     * Determine what to use - jquery or native js.
+     * Construct ajax call with jquery.
      *
-     * @return bool
+     * @param array $data
+     *
+     * @return string
      */
-    protected function useJquery()
+    protected function constructJqueryAjaxCall(array $data)
     {
-        return !$this->widgetFactory->app->config('laravel-widgets.disable_jquery', false);
+        $id = WidgetId::get();
+
+        $jsData = json_encode($data);
+
+        return
+            "var widgetTimer{$id} = setInterval(function() {".
+                'if (window.$) {'.
+                    "$('#{$this->getContainerId()}').load('".$this->ajaxLink."', {$jsData});".
+                    "clearInterval(widgetTimer{$id});".
+                '}'.
+            '}, 100);';
     }
 
     /**
-     * Construct ajax call for loaders.
+     * Construct ajax call without jquery.
+     *
+     * @param array $data
      *
      * @return string
      */
-    protected function constructAjaxCall()
+    protected function constructNativeJsAjaxCall(array $data)
     {
-        $ajaxLink = $this->ajaxLink;
-        $containerId = $this->getContainerId();
-        $data = $this->produceJavascriptData();
-
-        if ($this->useJquery()) {
-            $id = WidgetId::get();
-
-            return
-                "var widgetTimer{$id} = setInterval(function() {".
-                    'if (window.$) {'.
-                        "$('#{$containerId}').load('".$ajaxLink."', {$data});".
-                        "clearInterval(widgetTimer{$id});".
-                    '}'.
-                '}, 100);';
-        }
+        $jsData = "'id=' + encodeURIComponent('{$data['id']}')".
+                "'&name=' + encodeURIComponent('{$data['name']}')".
+                "'&params=' + encodeURIComponent('{$data['params']}')".
+                "'&_token=' + encodeURIComponent('{$data['token']})";
 
         return
             'var xhr = new XMLHttpRequest();'.
-            'var params = '.$data.';'.
-            'var container = document.getElementById("'.$containerId.'");'.
-            'xhr.open("POST", "'.$ajaxLink.'", true);'.
+            'var params = '.$jsData.';'.
+            'var container = document.getElementById("'.$this->getContainerId().'");'.
+            'xhr.open("POST", "'.$this->ajaxLink.'", true);'.
             'xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");'.
             'xhr.send(params);'.
             'xhr.onreadystatechange = function() {'.
                 'if(xhr.readyState == 4 && xhr.status == 200) {'.
-                    'var data = xhr.responseText;'.
-                    'container.innerHTML = data;'.
-                    'var scripts = container.getElementsByTagName("script");'.
-                    'for(var i=0; i < scripts.length; i++) {'.
-                        'if (window.execScript) {'.
+                'var data = xhr.responseText;'.
+                'container.innerHTML = data;'.
+                'var scripts = container.getElementsByTagName("script");'.
+                'for(var i=0; i < scripts.length; i++) {'.
+                    'if (window.execScript) {'.
                             'window.execScript(scripts[i].text);'.
                         '} else {'.
                             'window["eval"].call(window, scripts[i].text);'.