Clean-up redundant JavaScript load if it is not required.

Kaabi · May 12, 2017 · 58495ef · 58495ef
1 parent e2c0f5e
commit 58495ef
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/application/libraries/Grocery_CRUD.php b/application/libraries/Grocery_CRUD.php
@@ -1572,6 +1572,7 @@ protected function showList($ajax = false, $state_info = null)
 
 		$data->total_results = $this->get_total_results();
 
+        $data->dialog_forms = $this->config->dialog_forms;
 		$data->columns 				= $this->get_columns();
 
 		$data->success_message		= $this->get_success_message_at_list($state_info);

diff --git a/assets/grocery_crud/themes/datatables/views/list_template.php b/assets/grocery_crud/themes/datatables/views/list_template.php
@@ -7,13 +7,13 @@
 	$this->set_css($this->default_theme_path.'/datatables/extras/TableTools/media/css/TableTools.css');
 	$this->set_js_lib($this->default_javascript_path.'/'.grocery_CRUD::JQUERY);
 
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
-	$this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
+    if ($dialog_forms) {
+        $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
+        $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
+        $this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
+    }
 
-	if (!$this->is_IE7()) {
-		$this->set_js_lib($this->default_javascript_path.'/common/list.js');
-	}
+    $this->set_js_lib($this->default_javascript_path.'/common/list.js');
 
 	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/ui/'.grocery_CRUD::JQUERY_UI_JS);
 	$this->set_js_lib($this->default_theme_path.'/datatables/js/jquery.dataTables.min.js');

diff --git a/assets/grocery_crud/themes/flexigrid/views/list_template.php b/assets/grocery_crud/themes/flexigrid/views/list_template.php
@@ -2,13 +2,13 @@
 	$this->set_css($this->default_theme_path.'/flexigrid/css/flexigrid.css');
 	$this->set_js_lib($this->default_javascript_path.'/'.grocery_CRUD::JQUERY);
 
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
-	$this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
+	if ($dialog_forms) {
+        $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
+        $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
+        $this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
+    }
 
-	if (!$this->is_IE7()) {
-		$this->set_js_lib($this->default_javascript_path.'/common/list.js');
-	}
+    $this->set_js_lib($this->default_javascript_path.'/common/list.js');
 
 	$this->set_js($this->default_theme_path.'/flexigrid/js/cookies.js');
 	$this->set_js($this->default_theme_path.'/flexigrid/js/flexigrid.js');

diff --git a/change_log.txt b/change_log.txt
@@ -1,3 +1,5 @@
+v 1.5.9
+    - Clean-up redundant JavaScript load if it is not required.
 v 1.5.8
     - #382: Adding custom error message for set_rules()
     - Two new lang strings for the multiple delete confirmation