Merge pull request yajra#54 from lk77/3.0

yajra · web-flow · commit a39da1dccd9e · 2018-01-11T08:52:38.000+08:00
[3.0] Moving callback condition to config.
diff --git a/src/Html/Builder.php b/src/Html/Builder.php
@@ -161,7 +161,7 @@ public function parameterize($attributes = [])
      */
     protected function isCallbackFunction($value, $key)
     {
-        return Str::startsWith(trim($value), ['$', '$.', 'function']) || Str::contains($key, 'editor');
+        return Str::startsWith(trim($value), $this->config->get('datatables-html.callback', ['$', '$.', 'function'])) || Str::contains($key, 'editor');
     }
 
     /**
diff --git a/src/resources/config/config.php b/src/resources/config/config.php
@@ -8,4 +8,9 @@
         'class' => 'table',
         'id'    => 'dataTableBuilder',
     ],
+    /*
+     * Default condition to determine if a parameter is a callback or not
+     * Callbacks needs to start by those terms or they will be casted to string
+     */
+    'callback' => ['$', '$.', 'function'],
 ];

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function parameterize($attributes = [])`
`161`	`161`	`*/`
`162`	`162`	`protected function isCallbackFunction($value, $key)`
`163`	`163`	`{`
`164`		`- return Str::startsWith(trim($value), ['$', '$.', 'function']) \|\| Str::contains($key, 'editor');`
	`164`	`+ return Str::startsWith(trim($value), $this->config->get('datatables-html.callback', ['$', '$.', 'function'])) \|\| Str::contains($key, 'editor');`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`/**`