Transform com_finder to ES6 and remove inline script [ Part1 ] (jooml…

…a#90) * com_finder es6 1 * make simple
Digital-Peak · Mar 10, 2018 · bbcc06b · bbcc06b
1 parent a823fc7
commit bbcc06b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 18 deletions.
diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
@@ -9,30 +9,15 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+
 $user      = JFactory::getUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
 JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
-
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(pressbutton)
-	{
-		if (pressbutton == "filters.delete")
-		{
-			if (confirm(Joomla.JText._("COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT")))
-			{
-				Joomla.submitform(pressbutton);
-			}
-			else
-			{
-				return false;
-			}
-		}
-		Joomla.submitform(pressbutton);
-	};
-');
+HTMLHelper::_('script', 'com_finder/filters.js', ['relative' => true, 'version' => 'auto']);
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">

diff --git a/media/com_finder/js/filters.es6.js b/media/com_finder/js/filters.es6.js
@@ -0,0 +1,20 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+Joomla = window.Joomla || {};
+
+(() => {
+  'use strict';
+
+  document.addEventListener('DOMContentLoaded', () => {
+    Joomla.submitbutton = (pressbutton) => {
+      if (pressbutton === 'filters.delete' && !window.confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'))) {
+        return false;
+      }
+      Joomla.submitform(pressbutton);
+      return true;
+    };
+  });
+})();
diff --git a/media/com_finder/js/filters.js b/media/com_finder/js/filters.js
@@ -0,0 +1,25 @@
+/**
+* PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
+* OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.
+**/
+
+/**
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+Joomla = window.Joomla || {};
+
+(function () {
+  'use strict';
+
+  document.addEventListener('DOMContentLoaded', function () {
+    Joomla.submitbutton = function (pressbutton) {
+      if (pressbutton === 'filters.delete' && !window.confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'))) {
+        return false;
+      }
+      Joomla.submitform(pressbutton);
+      return true;
+    };
+  });
+})();