remove inline submitbutton

joomla · Mar 18, 2017 · ed100f7 · ed100f7
1 parent 7651358
commit ed100f7
Show file tree

Hide file tree

Showing 29 changed files with 38 additions and 284 deletions.
diff --git a/administrator/components/com_admin/views/profile/tmpl/edit.php b/administrator/components/com_admin/views/profile/tmpl/edit.php
@@ -14,16 +14,6 @@
 
 JHtml::_('behavior.formvalidator');
 
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "profile.cancel" || document.formvalidator.isValid(document.getElementById("profile-form")))
-		{
-			Joomla.submitform(task, document.getElementById("profile-form"));
-		}
-	};
-');
-
 // Get the form fieldsets.
 $fieldsets = $this->form->getFieldsets();
 ?>

diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php
@@ -16,13 +16,6 @@
 JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
 
 JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "banner.cancel" || document.formvalidator.isValid(document.getElementById("banner-form")))
-		{
-			Joomla.submitform(task, document.getElementById("banner-form"));
-		}
-	};
 	jQuery(document).ready(function ($){
 		$("#jform_type").on("change", function (a, params) {
 

diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php
@@ -11,16 +11,6 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 JHtml::_('behavior.formvalidator');
-
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "client.cancel" || document.formvalidator.isValid(document.getElementById("client-form")))
-		{
-			Joomla.submitform(task, document.getElementById("client-form"));
-		}
-	};
-');
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" class="form-validate">

diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php
@@ -24,24 +24,6 @@
 // Are associations implemented for this extension?
 $extensionassoc = array_key_exists('item_associations', $this->form->getFieldsets());
 
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "category.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
-		{
-			jQuery("#permissions-sliders select").attr("disabled", "disabled");
-			' . $this->form->getField('description')->save() . '
-			Joomla.submitform(task, document.getElementById("item-form"));
-
-			// @deprecated 4.0  The following js is not needed since 3.7.0.
-			if (task !== "category.apply")
-			{
-				window.parent.jQuery("#categoryEdit' . $this->item->id . 'Modal").modal("hide");
-			}
-		}
-	};
-');
-
 // Fieldsets to not automatically render by /layouts/joomla/edit/params.php
 $this->ignore_fieldsets = array('jmetadata', 'item_associations');
 

diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php
@@ -22,20 +22,9 @@
 JText::script('WARNING');
 JText::script('NOTICE');
 JText::script('MESSAGE');
-
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task === "config.cancel.application" || document.formvalidator.isValid(document.getElementById("application-form")))
-		{
-			jQuery("#permissions-sliders select").attr("disabled", "disabled");
-			Joomla.submitform(task, document.getElementById("application-form"));
-		}
-	};
-');
 ?>
 
-<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate" data-cancel-task="config.cancel.component">
 	<div class="row">
 		<!-- Begin Sidebar -->
 		<div id="sidebar" class="col-md-2">

diff --git a/administrator/components/com_config/view/component/tmpl/default.php b/administrator/components/com_config/view/component/tmpl/default.php
@@ -27,23 +27,14 @@
 
 JFactory::getDocument()->addScriptDeclaration(
 	'
-	Joomla.submitbutton = function(task)
-	{
-		if (task === "config.cancel.component" || document.formvalidator.isValid(document.getElementById("component-form")))
-		{
-			jQuery("#permissions-sliders select").attr("disabled", "disabled");
-			Joomla.submitform(task, document.getElementById("component-form"));
-		}
-	};
-
 	// Select first tab
 	jQuery(document).ready(function() {
 		jQuery("#configTabs a:first").tab("show");
 	});'
 );
 ?>
 
-<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off">
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off" data-cancel-task="config.cancel.component">
 	<div class="row">
 
 		<?php // Begin Sidebar ?>

diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php
@@ -21,23 +21,6 @@
 
 $assoc = JLanguageAssociations::isEnabled();
 
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "contact.cancel" || document.formvalidator.isValid(document.getElementById("contact-form")))
-		{
-			' . $this->form->getField('misc')->save() . '
-			Joomla.submitform(task, document.getElementById("contact-form"));
-
-			// @deprecated 4.0  The following js is not needed since 3.7.0.
-			if (task !== "contact.apply")
-			{
-				window.parent.jQuery("#contactEdit' . $this->item->id . 'Modal").modal("hide");
-			}
-		}
-	};
-');
-
 // Fieldsets to not automatically render by /layouts/joomla/edit/params.php
 $this->ignore_fieldsets = array('details', 'item_associations', 'jmetadata');
 

diff --git a/administrator/components/com_content/views/article/tmpl/edit.php b/administrator/components/com_content/views/article/tmpl/edit.php
@@ -32,24 +32,6 @@
 
 $assoc = JLanguageAssociations::isEnabled();
 
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "article.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
-		{
-			jQuery("#permissions-sliders select").attr("disabled", "disabled");
-			' . $this->form->getField('articletext')->save() . '
-			Joomla.submitform(task, document.getElementById("item-form"));
-
-			// @deprecated 4.0  The following js is not needed since __DEPLOY_VERSION__.
-			if (task !== "article.apply")
-			{
-				window.parent.jQuery("#articleEdit' . (int) $this->item->id . 'Modal").modal("hide");
-			}
-		}
-	};
-');
-
 // In case of modal
 $isModal = $input->get('layout') == 'modal' ? true : false;
 $layout  = $isModal ? 'modal' : 'edit';

diff --git a/administrator/components/com_fields/views/field/tmpl/edit.php b/administrator/components/com_fields/views/field/tmpl/edit.php
@@ -20,13 +20,6 @@
 $input = $app->input;
 
 JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "field.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
-		{
-			Joomla.submitform(task, document.getElementById("item-form"));
-		}
-	};
 	jQuery(document).ready(function() {
 		jQuery("#jform_title").data("dp-old-value", jQuery("#jform_title").val());
 		jQuery("#jform_title").change(function(data, handler) {

diff --git a/administrator/components/com_fields/views/field/tmpl/modal.php b/administrator/components/com_fields/views/field/tmpl/modal.php
@@ -23,8 +23,6 @@
 	{
 		if (task == 'field.cancel' || document.formvalidator.isValid(document.getElementById('item-form')))
 		{
-			" . $this->form->getField('description')->save() . "
-
 			if (window.opener && (task == 'field.save' || task == 'field.cancel'))
 			{
 				window.opener.document.closeEditWindow = self;

diff --git a/administrator/components/com_fields/views/group/tmpl/edit.php b/administrator/components/com_fields/views/group/tmpl/edit.php
@@ -18,16 +18,6 @@
 
 $app = JFactory::getApplication();
 $input = $app->input;
-
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "group.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
-		{
-			Joomla.submitform(task, document.getElementById("item-form"));
-		}
-	};
-');
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_fields&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">

diff --git a/administrator/components/com_finder/views/filter/tmpl/edit.php b/administrator/components/com_finder/views/filter/tmpl/edit.php
@@ -14,14 +14,6 @@
 
 
 JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "filter.cancel" || document.formvalidator.isValid(document.getElementById("adminForm")))
-		{
-			Joomla.submitform(task, document.getElementById("adminForm"));
-		}
-	};
-
 	jQuery(document).ready(function($) {
 		$("#rightbtn").on("click", function() {
 			if($(this).text() == "' . JText::_('COM_FINDER_FILTER_SHOW_ALL') . '") {

diff --git a/administrator/components/com_languages/views/language/tmpl/edit.php b/administrator/components/com_languages/views/language/tmpl/edit.php
@@ -16,14 +16,6 @@
 
 JFactory::getDocument()->addScriptDeclaration(
 	'
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "language.cancel" || document.formvalidator.isValid(document.getElementById("language-form")))
-		{
-			Joomla.submitform(task, document.getElementById("language-form"));
-		}
-	};
-
 	jQuery(document).ready(function() {
 		jQuery("#jform_image").on("change", function() {
 			var flag = this.value;

diff --git a/administrator/components/com_languages/views/override/tmpl/edit.php b/administrator/components/com_languages/views/override/tmpl/edit.php
@@ -38,13 +38,6 @@
 			$(this).removeClass("invalid");
 		});
 	});
-
-	Joomla.submitbutton = function(task) {
-		if (task == "override.cancel" || document.formvalidator.isValid(document.getElementById("override-form")))
-		{
-			Joomla.submitform(task, document.getElementById("override-form"));
-		}
-	};
 ');
 ?>
 

diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.php b/administrator/components/com_menus/views/menu/tmpl/edit.php
@@ -17,17 +17,6 @@
 JHtml::_('behavior.tabstate');
 
 JText::script('ERROR');
-
-JFactory::getDocument()->addScriptDeclaration("
-		Joomla.submitbutton = function(task)
-		{
-			var form = document.getElementById('item-form');
-			if (task == 'menu.cancel' || document.formvalidator.isValid(form))
-			{
-				Joomla.submitform(task, form);
-			}
-		};
-");
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_menus&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form">
 

diff --git a/administrator/components/com_messages/views/config/tmpl/default.php b/administrator/components/com_messages/views/config/tmpl/default.php
@@ -15,18 +15,6 @@
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.keepalive');
 JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
-
-JFactory::getDocument()->addScriptDeclaration(
-	"
-		Joomla.submitbutton = function(task)
-		{
-			if (task == 'config.cancel' || document.formvalidator.isValid(document.getElementById('config-form')))
-			{
-				Joomla.submitform(task, document.getElementById('config-form'));
-			}
-		};
-	"
-);
 ?>
 <div class="container-popup">
 	<form action="<?php echo JRoute::_('index.php?option=com_messages&view=config'); ?>" method="post" name="adminForm" id="message-form">

diff --git a/administrator/components/com_messages/views/message/tmpl/edit.php b/administrator/components/com_messages/views/message/tmpl/edit.php
@@ -14,16 +14,6 @@
 
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.keepalive');
-
-JFactory::getDocument()->addScriptDeclaration("
-		Joomla.submitbutton = function(task)
-		{
-			if (task == 'message.cancel' || document.formvalidator.isValid(document.getElementById('message-form')))
-			{
-				Joomla.submitform(task, document.getElementById('message-form'));
-			}
-		};
-");
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="message-form">
 	<fieldset class="adminform">

diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -33,16 +33,8 @@
 	Joomla.submitbutton = function(task) {
 			if (task == 'module.cancel' || document.formvalidator.isValid(document.getElementById('module-form')))
 			{
-";
-if ($hasContent)
-{
-	$script .= $this->form->getField($hasContentFieldName)->save();
-}
-$script .= "
 			Joomla.submitform(task, document.getElementById('module-form'));
 
-				jQuery('#permissions-sliders select').attr('disabled', 'disabled');
-
 				if (self != top)
 				{
 					if (parent.viewLevels)

diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
@@ -21,21 +21,6 @@
 
 $assoc = JLanguageAssociations::isEnabled();
 
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.submitbutton = function(task)
-	{
-		if (task == "newsfeed.cancel" || document.formvalidator.isValid(document.getElementById("newsfeed-form"))) {
-			Joomla.submitform(task, document.getElementById("newsfeed-form"));
-
-			// @deprecated 4.0  The following js is not needed since 3.7.0.
-			if (task !== "newsfeed.apply")
-			{
-				window.parent.jQuery("#newsfeedEdit' . $this->item->id . 'Modal").modal("hide");
-			}
-		}
-	};
-');
-
 // Fieldsets to not automatically render by /layouts/joomla/edit/params.php
 $this->ignore_fieldsets = array('images', 'jbasic', 'jmetadata', 'item_associations');
 

diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -16,15 +16,6 @@
 JHtml::_('bootstrap.tooltip');
 
 $this->fieldsets = $this->form->getFieldsets('params');
-
-JFactory::getDocument()->addScriptDeclaration("
-	Joomla.submitbutton = function(task)
-	{
-		if (task == 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) {
-			Joomla.submitform(task, document.getElementById('style-form'));
-		}
-	};
-");
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_plugins&layout=edit&extension_id=' . (int) $this->item->extension_id); ?>" method="post" name="adminForm" id="style-form" class="form-validate">

diff --git a/administrator/components/com_redirect/views/link/tmpl/edit.php b/administrator/components/com_redirect/views/link/tmpl/edit.php
@@ -14,17 +14,6 @@
 
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.keepalive');
-
-
-JFactory::getDocument()->addScriptDeclaration("
-	Joomla.submitbutton = function(task)
-	{
-		if (task == 'link.cancel' || document.formvalidator.isValid(document.getElementById('link-form')))
-		{
-			Joomla.submitform(task, document.getElementById('link-form'));
-		}
-	};
-");
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_redirect&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="link-form">

diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php
@@ -13,16 +13,6 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.tabstate');
 
-JFactory::getDocument()->addScriptDeclaration("
-	Joomla.submitbutton = function(task)
-	{
-		if (task == 'tag.cancel' || document.formvalidator.isValid(document.getElementById('item-form'))) {
-			" . $this->form->getField('description')->save() . "
-			Joomla.submitform(task, document.getElementById('item-form'));
-		}
-	};
-");
-
 // Fieldsets to not automatically render by /layouts/joomla/edit/params.php
 $this->ignore_fieldsets = array('jmetadata');
 ?>