Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1a8d3ed

Browse files
committed
Merge branch '4.0'
* 4.0: Bump v4.33.0 🚀 Make LaravelDataTables javascript namespace configurable. (yajra#145) Bump v4.32.0 🚀 Add function argument to override the default options from php scripts. Add LaravelDataTables table variable.
2 parentsef4035d +fefbf5b commit1a8d3ed

File tree

6 files changed

+27
-12
lines changed

6 files changed

+27
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88

99
##CHANGELOG
1010

11+
###v4.33.0 - 10-30-2020
12+
13+
- Make LaravelDataTables javascript namespace configurable.[#145], credits to@om3rcitak
14+
15+
###v4.32.0 - 10-10-2020
16+
17+
- Add function argument to override the default options from php scripts.[#144]
18+
1119
###v4.31.0 - 10-09-2020
1220

1321
- Add button customize option value.[#142], credits to@gredimano
@@ -690,6 +698,7 @@ To `created_at` with title `Created At`
690698
[#133]:https://github.com/yajra/laravel-datatables-html/pull/133
691699
[#142]:https://github.com/yajra/laravel-datatables-html/pull/142
692700
[#143]:https://github.com/yajra/laravel-datatables-html/pull/143
701+
[#144]:https://github.com/yajra/laravel-datatables-html/pull/144
693702

694703
[#134]:https://github.com/yajra/laravel-datatables-html/issues/134
695704
[#3]:https://github.com/yajra/laravel-datatables-html/issues/3

‎src/resources/config/config.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<?php
22

33
return [
4+
/*
5+
* DataTables JavaScript global namespace.
6+
*/
7+
8+
'namespace' =>'LaravelDataTables',
9+
410
/*
511
* Default table attributes when generating the table.
612
*/
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
$(function(){
2-
window.LaravelDataTables= window.LaravelDataTables || {};
2+
window.{{config('datatables-html.namespace','LaravelDataTables')}}= window.{{config('datatables-html.namespace','LaravelDataTables')}} || {};
33
$.ajaxSetup({headers: {'X-CSRF-TOKEN': '{{csrf_token()}}'}});
44
@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()!!});
66
{!!$editor->scripts!!}
77
@foreach((array)$editor->eventsas$event)
88
{{$editor->instance}}.on('{!!$event['event']!!}',{!!$event['script']!!});
99
@endforeach
1010
@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);
1212
});
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
window.dtx = window.dtx || {};
2-
window.dtx["%1$s"] = function() {
3-
window.LaravelDataTables= window.LaravelDataTables || {};
2+
window.dtx["%1$s"] = function(opts) {
3+
window.{{config('datatables-html.namespace','LaravelDataTables')}}= window.{{config('datatables-html.namespace','LaravelDataTables')}} || {};
44
@if(isset($editors))
55
@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()!!});
77
{!!$editor->scripts!!}
88
@foreach((array)$editor->eventsas$event)
99
{{$editor->instance}}.on('{!!$event['event']!!}',{!!$event['script']!!});
1010
@endforeach
1111
@endforeach
1212
@endif
13-
return$("#%1$s").DataTable(%2$s);
13+
returnwindow.{{config('datatables-html.namespace','LaravelDataTables')}}["%1$s"] = $("#%1$s").DataTable($.extend(%2$s, opts));
1414
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff 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 = [];
44
@foreach($editorsas$editor)
5-
window.LaravelDataTables.editors["{{$editor->instance}}"] ={!!$editor->toJson()!!}
5+
window.{{config('datatables-html.namespace','LaravelDataTables')}}.editors["{{$editor->instance}}"] ={!!$editor->toJson()!!}
66
@endforeach
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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);});

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp