[imp] reduce uneeded calls for mootools. Fixes #4888

miss that

UT

UT

UT again

UT One more time

Introduce new function formvalidator

-Deprecate formvalidation and introduce formvalidator
-Copy the layouts standard and confirm to isis and load jQuery instead of mootools

add a deprecated msg to the log

CS

Changes

UT

Author: dgrammatiko

administrator/components/com_users/views/mail/tmpl/default.php

@@ -27,6 +27,7 @@
 $script .= "\t\t".'}'."\n";
 $script .= "\t\t".'}'."\n";
 
+JHtml::_('behavior.core');
 JHtml::_('formbehavior.chosen', 'select');
 
 JFactory::getDocument()->addScriptDeclaration($script);

layouts/joomla/toolbar/batch.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('behavior.core');
+
 $title = $displayData['title'];
 $message = JText::_('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
 ?>

layouts/joomla/toolbar/confirm.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('behavior.core');
+
 $doTask = $displayData['doTask'];
 $class  = $displayData['class'];
 $text   = $displayData['text'];

layouts/joomla/toolbar/help.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('behavior.core');
+
 $doTask = $displayData['doTask'];
 $text   = $displayData['text'];
 

layouts/joomla/toolbar/popup.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('behavior.core');
+
 $doTask = $displayData['doTask'];
 $class  = $displayData['class'];
 $text   = $displayData['text'];

layouts/joomla/toolbar/slider.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('behavior.core');
+
 $doTask  = $displayData['doTask'];
 $class   = $displayData['class'];
 $text    = $displayData['text'];

layouts/joomla/toolbar/standard.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('behavior.core');
+
 $doTask   = $displayData['doTask'];
 $class    = $displayData['class'];
 $text     = $displayData['text'];

layouts/joomla/toolbar/versions.php

@@ -8,6 +8,9 @@
  */
 
 defined('_JEXEC') or die;
+
+JHtml::_('behavior.framework');
+
 ?>
 <a rel="{handler: 'iframe', size: {x: <?php echo $displayData['height']; ?>, y: <?php echo $displayData['width']; ?>}}"
 	href="index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id=<?php echo (int) $displayData['itemId']; ?>&amp;type_id=<?php echo $displayData['typeId']; ?>&amp;type_alias=<?php echo $displayData['typeAlias']; ?>&amp;<?php echo JSession::getFormToken(); ?>=1"

libraries/cms/html/behavior.php

@@ -136,9 +136,13 @@ public static function caption($selector = 'img.caption')
 	 * @return  void
 	 *
 	 * @since   1.5
+	 *
+	 * @Deprecated 3.4 Use formvalidator instead
 	 */
 	public static function formvalidation()
 	{
+		JLog::add('The use of formvalidation is deprecated use formvalidator instead.', JLog::WARNING, 'deprecated');
+
 		// Only load once
 		if (isset(static::$loaded[__METHOD__]))
 		{
@@ -148,8 +152,32 @@ public static function formvalidation()
 		// Include MooTools framework
 		static::framework();
 
-		// Include jQuery Framework
-		JHtml::_('jquery.framework');
+		// Load the new jQuery code
+		static::formvalidator();
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for form validation.
+	 *
+	 * To enable form validation the form tag must have class="form-validate".
+	 * Each field that needs to be validated needs to have class="validate".
+	 * Additional handlers can be added to the handler for username, password,
+	 * numeric and email. To use these add class="validate-email" and so on.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public static function formvalidator()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Include core
+		static::core();
 
 		// Add validate.js language strings
 		JText::script('JLIB_FORM_FIELD_INVALID');
@@ -209,10 +237,10 @@ public static function combobox()
 		{
 			return;
 		}
-		// Include MooTools framework
-		static::framework();
+		// Include core
+		static::core();
 
-		JHtml::_('script', 'system/combobox.js', true, true);
+		JHtml::_('script', 'system/combobox.js', false, true);
 		static::$loaded[__METHOD__] = true;
 	}
 
@@ -400,14 +428,14 @@ public static function multiselect($id = 'adminForm')
 		}
 
 		// Include jQuery
-		JHtml::_('jquery.framework');
+		static::core();
 
-		JHtml::_('script', 'system/multiselect.js', true, true);
+		JHtml::_('script', 'system/multiselect.js', false, true);
 
 		// Attach multiselect to document
 		JFactory::getDocument()->addScriptDeclaration(
-			"window.addEvent('domready', function() {
-				new Joomla.JMultiSelect('" . $id . "');
+			"jQuery(document).ready(function() {
+				Joomla.JMultiSelect('" . $id . "');
 			});"
 		);
 
@@ -649,9 +677,9 @@ public static function highlighter(array $terms, $start = 'highlighter-start', $
 		}
 
 		// Include jQuery
-		JHtml::_('jquery.framework');
+		static::core();
 
-		JHtml::_('script', 'system/highlighter.js', true, true);
+		JHtml::_('script', 'system/highlighter.js', false, true);
 
 		$terms = str_replace('"', '\"', $terms);
 
@@ -695,11 +723,8 @@ public static function noframes()
 			return;
 		}
 
-		// Include MooTools framework
-		static::framework();
-
 		// Include jQuery
-		JHtml::_('jquery.framework');
+		static::core();
 
 		$js = "jQuery(function () {if (top == self) {document.documentElement.style.display = 'block'; }" .
 			" else {top.location = self.location; }});";

libraries/cms/toolbar/button/confirm.php

@@ -87,7 +87,6 @@ public function fetchId($type = 'Confirm', $msg = '', $name = '', $text = '', $t
 	 */
 	protected function _getCommand($msg, $name, $task, $list)
 	{
-		JHtml::_('behavior.framework');
 		$message = JText::_('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
 		$message = addslashes($message);