Merge pull request #158 from yajra/fix-fetching-of-editor-table-id

Fix fetching of editor table id.

Author: yajra

src/Html/Builder.php

@@ -78,6 +78,10 @@ public function __construct(Repository $config, Factory $view, HtmlBuilder $html
         $this->html = $html;
         $this->collection = new Collection;
         $this->tableAttributes = $this->config->get('datatables-html.table', []);
+        $this->attributes = [
+            'serverSide' => true,
+            'processing' => true,
+        ];
     }
 
     /**
@@ -118,7 +122,17 @@ public function generateScripts()
      */
     public function generateJson()
     {
-        $args = array_merge(
+        return $this->parameterize($this->getOptions());
+    }
+
+    /**
+     * Get DataTable options array.
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return array_merge(
             $this->attributes, [
                 'ajax' => $this->ajax,
                 'columns' => $this->collection->map(function (Column $column) {
@@ -129,8 +143,6 @@ public function generateJson()
                 })->toArray(),
             ]
         );
-
-        return $this->parameterize($args);
     }
 
     /**

src/Html/Editor/Editor.php

@@ -264,10 +264,6 @@ public function toJson($options = 0)
         $replacements = [];
 
         foreach (Arr::dot($parameters) as $key => $value) {
-            if ($key === 'table') {
-                Arr::set($parameters, $key, '#' . $value);
-            }
-
             if ($this->isCallbackFunction($value, $key)) {
                 $values[] = trim($value);
                 Arr::set($parameters, $key, '%' . $key . '%');

src/Html/HasEditor.php

@@ -68,7 +68,7 @@ protected function newEditor($fields)
         }
 
         if (! $editor->table) {
-            $editor->table($this->getTableAttribute('id'));
+            $editor->table('#' . $this->getTableAttribute('id'));
         }
 
         if (! $editor->ajax) {
@@ -77,4 +77,12 @@ protected function newEditor($fields)
 
         return $editor;
     }
+
+    /**
+     * @return array|null
+     */
+    public function getEditors()
+    {
+        return $this->editors;
+    }
 }