Commit1130963

authored

Make LaravelDataTables javascript namespace configurable. (yajra#145)

* made LaravelDataTables const to variable* add namespace variable to datatables-html config file* add default value to config functions

1 parent6affef4 commit1130963Copy full SHA for 1130963

File tree

+17

-11

lines changed

+17

-11

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,12 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`return [`
	`4`	`+/*`
	`5`	`+ * DataTables JavaScript global namespace.`
	`6`	`+ */`
	`7`	`+`
	`8`	`+'namespace' =>'LaravelDataTables',`
	`9`	`+`
`4`	`10`	`/*`
`5`	`11`	`* Default table attributes when generating the table.`
`6`	`12`	`*/`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`$(function(){`
`2`		`- window.LaravelDataTables= window.LaravelDataTables \|\| {};`
	`2`	`+ window.{{config('datatables-html.namespace','LaravelDataTables')}}= window.{{config('datatables-html.namespace','LaravelDataTables')}} \|\| {};`
`3`	`3`	`$.ajaxSetup({headers: {'X-CSRF-TOKEN': '{{csrf_token()}}'}});`
`4`	`4`	`@foreach($editorsas$editor)`
`5`		`- var{{$editor->instance}} = window.LaravelDataTables["%1$s-{{$editor->instance}}"] = new $.fn.dataTable.Editor({!!$editor->toJson()!!});`
	`5`	`+ var{{$editor->instance}} = window.{{config('datatables-html.namespace','LaravelDataTables')}}["%1$s-{{$editor->instance}}"] = new $.fn.dataTable.Editor({!!$editor->toJson()!!});`
`6`	`6`	`{!!$editor->scripts!!}`
`7`	`7`	`@foreach((array)$editor->eventsas$event)`
`8`	`8`	`{{$editor->instance}}.on('{!!$event['event']!!}',{!!$event['script']!!});`
`9`	`9`	`@endforeach`
`10`	`10`	`@endforeach`
`11`		`- window.LaravelDataTables["%1$s"] = $("#%1$s").DataTable(%2$s);`
	`11`	`+ window.{{config('datatables-html.namespace','LaravelDataTables')}}["%1$s"] = $("#%1$s").DataTable(%2$s);`
`12`	`12`	`});`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`window.dtx = window.dtx \|\| {};`
`2`	`2`	`window.dtx["%1$s"] = function(opts) {`
`3`		`- window.LaravelDataTables= window.LaravelDataTables \|\| {};`
	`3`	`+ window.{{config('datatables-html.namespace','LaravelDataTables')}}= window.{{config('datatables-html.namespace','LaravelDataTables')}} \|\| {};`
`4`	`4`	`@if(isset($editors))`
`5`	`5`	`@foreach($editorsas$editor)`
`6`		`- var{{$editor->instance}} = window.LaravelDataTables["%1$s-{{$editor->instance}}"] = new $.fn.dataTable.Editor({!!$editor->toJson()!!});`
	`6`	`+ var{{$editor->instance}} = window.{{config('datatables-html.namespace','LaravelDataTables')}}["%1$s-{{$editor->instance}}"] = new $.fn.dataTable.Editor({!!$editor->toJson()!!});`
`7`	`7`	`{!!$editor->scripts!!}`
`8`	`8`	`@foreach((array)$editor->eventsas$event)`
`9`	`9`	`{{$editor->instance}}.on('{!!$event['event']!!}',{!!$event['script']!!});`
`10`	`10`	`@endforeach`
`11`	`11`	`@endforeach`
`12`	`12`	`@endif`
`13`		`- return window.LaravelDataTables["%1$s"] = $("#%1$s").DataTable($.extend(%2$s, opts));`
	`13`	`+ return window.{{config('datatables-html.namespace','LaravelDataTables')}}["%1$s"] = $("#%1$s").DataTable($.extend(%2$s, opts));`
`14`	`14`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-window.LaravelDataTables= window.LaravelDataTables \|\| {};`
`2`		`-window.LaravelDataTables.options = %2$s`
`3`		`-window.LaravelDataTables.editors = [];`
	`1`	`+window.{{config('datatables-html.namespace','LaravelDataTables')}}= window.{{config('datatables-html.namespace','LaravelDataTables')}} \|\| {};`
	`2`	`+window.{{config('datatables-html.namespace','LaravelDataTables')}}.options = %2$s`
	`3`	`+window.{{config('datatables-html.namespace','LaravelDataTables')}}.editors = [];`
`4`	`4`	`@foreach($editorsas$editor)`
`5`		`-window.LaravelDataTables.editors["{{$editor->instance}}"] ={!!$editor->toJson()!!}`
	`5`	`+window.{{config('datatables-html.namespace','LaravelDataTables')}}.editors["{{$editor->instance}}"] ={!!$editor->toJson()!!}`
`6`	`6`	`@endforeach`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-$(function(){window.LaravelDataTables=window.LaravelDataTables\|\|{};window.LaravelDataTables["%1$s"]=$("#%1$s").DataTable(%2$s);});`
	`1`	`+$(function(){window.{{config('datatables-html.namespace','LaravelDataTables')}}=window.{{config('datatables-html.namespace','LaravelDataTables')}}\|\|{};window.{{config('datatables-html.namespace','LaravelDataTables')}}["%1$s"]=$("#%1$s").DataTable(%2$s);});`

Comments

(0)