Skip to content

Commit e87bcf4

Browse files
committed
Small clean up of the code and preparation for BETA release
1 parent 7146537 commit e87bcf4

File tree

6 files changed

+10
-43
lines changed

6 files changed

+10
-43
lines changed

README.md

+10-8
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,20 @@ Below you see an example of a print_r of a variable `$output` :
8080
[output] => Your output will appear here....
8181
[js_files] => Array
8282
(
83-
[763b4d272e158bdb8ed5a12a1824c94f494954bd] => http://grocery_crud/public/grocery_crud/themes/datatables/js/jquery-1.6.2.min.js
84-
[0b677f3fc6fb25b4baf39eb144222116c5b60254] => http://grocery_crud/public/grocery_crud/themes/flexigrid/js/cookies.js
85-
[ec3ae62b8d5838972e858fe54447bd4bd8d79f88] => http://grocery_crud/public/grocery_crud/themes/flexigrid/js/flexigrid.js
86-
[2c0ff56d0cbc6f80a5ef9c770d478f0e00c3170d] => http://grocery_crud/public/grocery_crud/themes/flexigrid/js/jquery.form.js
87-
[474495ff1e895eab81fb8afba4db9b06c15b19af] => http://grocery_crud/public/grocery_crud/themes/flexigrid/js/jquery.numeric.js
83+
[32fd432b4478200b5aacd62b65d5bdc269337910] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/js/jquery-1.11.1.min.js
84+
[d04ba7f0d55dda1d4ba9b6532414c653c58b0318] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/js/common/list.js
85+
[2d2b031fb606852768dc4c9a3c457545558cc924] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/themes/flexigrid/js/cookies.js
86+
[6629a324ade6d489aff77292cb02e31d9188a6bb] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/themes/flexigrid/js/flexigrid.js
87+
[5238a822ff2c6cced38a61590ac6debcc847bc0b] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/js/jquery_plugins/jquery.form.min.js
88+
[41101518af3f8fb416f60152aa019d963ae9293b] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/js/jquery_plugins/jquery.numeric.min.js
89+
[8823261dedf8eda49cfa2a7a528b5182350a90ae] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/themes/flexigrid/js/jquery.printElement.min.js
90+
[2ea588263ae884c476a96f40dc6cedd5316bbd57] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/js/jquery_plugins/ui/jquery-ui-1.10.3.custom.min.js
8891
)
89-
9092
[css_files] => Array
9193
(
92-
[732b03aa54d124f062757b71e5560acdc5632ba6] => http://grocery_crud/public/grocery_crud/themes/flexigrid/css/flexigrid.css
94+
[f1731e27afe02ab899b16daf8ae4a5ac8ac05d4e] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/themes/flexigrid/css/flexigrid.css
95+
[3e3f44ffabdcdd9017fa9db5262ce0465dde1322] => http://localhost/grocery-crud-codeigniter-4/public/assets/grocery_crud/css/ui/simple/jquery-ui-1.10.1.custom.min.css
9396
)
94-
9597
)
9698

9799
The view at `app/Views/example.php` is a simple Codeigniter view file and includes the below code:

app/Libraries/GroceryCrud.php

-4
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,6 @@ protected function showList($ajax = false, $state_info = null)
15061506

15071507
$data->total_results = $this->get_total_results();
15081508

1509-
$data->dialog_forms = $this->config->dialog_forms;
15101509
$data->columns = $this->get_columns();
15111510

15121511
$data->success_message = $this->get_success_message_at_list($state_info);
@@ -1560,8 +1559,6 @@ protected function showList($ajax = false, $state_info = null)
15601559

15611560
if(!$ajax)
15621561
{
1563-
$this->_add_js_vars(array('dialog_forms' => $this->config->dialog_forms));
1564-
15651562
$data->list_view = $this->_theme_view('list.php',$data,true);
15661563
$this->_theme_view('list_template.php',$data);
15671564
}
@@ -4401,7 +4398,6 @@ protected function _initialize_variables()
44014398
$this->config->default_text_editor = $config->default_text_editor;
44024399
$this->config->text_editor_type = $config->text_editor_type;
44034400
$this->config->character_limiter = $config->character_limiter;
4404-
$this->config->dialog_forms = false;
44054401
$this->config->paging_options = $config->paging_options;
44064402
$this->config->default_theme = $config->default_theme;
44074403
$this->config->environment = $config->environment;

public/assets/grocery_crud/js/common/lazyload-min.js

-7
This file was deleted.

public/assets/grocery_crud/js/common/list.js

-12
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ var fnOpenEditForm = function(this_element){
6060

6161
var add_edit_button_listener = function () {
6262

63-
//If dialog AJAX forms is turned on from grocery CRUD config
64-
if (dialog_forms) {
65-
66-
$('.edit_button,.add_button').unbind('click');
67-
$('.edit_button,.add_button').click(function(){
68-
69-
fnOpenEditForm($(this));
70-
71-
return false;
72-
});
73-
74-
}
7563
}
7664

7765
var load_css_file = function(css_file) {

public/assets/grocery_crud/themes/datatables/views/list_template.php

-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
$this->set_css($this->default_theme_path.'/datatables/extras/TableTools/media/css/TableTools.css');
88
$this->set_js_lib($this->default_javascript_path.'/'.\App\Libraries\GroceryCrud::JQUERY);
99

10-
if ($dialog_forms) {
11-
$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
12-
$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
13-
$this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
14-
}
15-
1610
$this->set_js_lib($this->default_javascript_path.'/common/list.js');
1711

1812
$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/ui/'.\App\Libraries\GroceryCrud::JQUERY_UI_JS);

public/assets/grocery_crud/themes/flexigrid/views/list_template.php

-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
$this->set_css($this->default_theme_path.'/flexigrid/css/flexigrid.css');
33
$this->set_js_lib($this->default_javascript_path.'/' . \App\Libraries\GroceryCrud::JQUERY);
44

5-
if ($dialog_forms) {
6-
$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
7-
$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
8-
$this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
9-
}
10-
115
$this->set_js_lib($this->default_javascript_path.'/common/list.js');
126

137
$this->set_js($this->default_theme_path.'/flexigrid/js/cookies.js');

0 commit comments

Comments
 (0)