moved script/style to default.php

added strict mode to validate-users.js
joomla · Aug 10, 2016 · 6b3c046 · 6b3c046
1 parent 3461949
commit 6b3c046
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 56 deletions.
diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php
@@ -9,8 +9,15 @@
 
 defined('_JEXEC') or die;
 
+JText::script('COM_USERS_PROFILE_EMAIL2_MESSAGE');
+JText::script('COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE');
+
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+JHtml::_('jquery.framework');
+JHtml::_('script', 'com_users/validate-user.js', false, true);
+
+
 
 $ajaxUri = JRoute::_('index.php?option=com_users&task=registration.validate&format=json&' . JSession::getFormToken() . '=1');
 ?>

diff --git a/components/com_users/views/registration/view.html.php b/components/com_users/views/registration/view.html.php
@@ -42,9 +42,6 @@ public function display($tpl = null)
 		$this->state  = $this->get('State');
 		$this->params = $this->state->get('params');
 
-		JText::script('COM_USERS_PROFILE_EMAIL2_MESSAGE');
-		JText::script('COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE');
-		JHtml::_('script', 'com_users/validate-user.js', false, true);
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))

diff --git a/media/com_users/js/validate-user.js b/media/com_users/js/validate-user.js
@@ -1,64 +1,69 @@
-window.onload = function() {
-    var ajaxUrl = document.getElementById('ajax-validation').getAttribute('data-url');
+!(function($){
+    "use strict";
+    $(document).ready(function(){
+        var ajaxUrl = document.getElementById('ajax-validation').getAttribute('data-url');
 
-    // check if username is already in database
-    jQuery('#jform_username').change(function(){
-        var name = jQuery(this).val();
-        if(name.length){
-            jQuery.ajax({
-                type: 'POST',
-                url: ajaxUrl + '&username=' + name
-            }).done(function(data){
-                if(data.success){
+        // check if username is already in database
+        $('#jform_username').change(function(){
+            var name = $(this).val();
+            if(name.length){
+                $.ajax({
+                    type: 'POST',
+                    url: ajaxUrl + '&username=' + name
+                }).done(function(data){
+                    if(data.success){
+                        var message = {
+                            'error' : [data.message]
+                        };
+                        Joomla.renderMessages(message);
+                    }
+                });
+            }
+        });
+        // check if email is already in database
+        $('#jform_email1').change(function(){
+            var mail = $(this).val();
+            if(mail.length) {
+                $.ajax({
+                    type: 'POST',
+                    url:  ajaxUrl + '&email=' + mail
+                }).done(function (data) {
+                    if (data.success) {
+                        var message = {
+                            'error': [data.message]
+                        };
+                        Joomla.renderMessages(message);
+                    }
+                });
+            }
+        });
+        //check if emails are equal
+        $('#jform_email2').change(function(){
+            var mail1 = $('#jform_email1').val();
+            var mail2 = $('#jform_email2').val();
+            if(mail1.length && mail2.length){
+                if(mail1 != mail2){
                     var message = {
-                        'error' : [data.message]
+                        'error' : [ Joomla.JText._('COM_USERS_PROFILE_EMAIL2_MESSAGE') ]
                     };
                     Joomla.renderMessages(message);
                 }
-            });
-        }
-    });
-    // check if email is already in database
-    jQuery('#jform_email1').change(function(){
-        var mail = jQuery(this).val();
-        if(mail.length) {
-            jQuery.ajax({
-                type: 'POST',
-                url:  ajaxUrl + '&email=' + mail
-            }).done(function (data) {
-                if (data.success) {
+            }
+        });
+        //check if password are equal
+        $('#jform_password2').change(function(){
+            var pass1 = $('#jform_password1').val();
+            var pass2 = $('#jform_password2').val();
+            if(pass1.length && pass2.length){
+                if(pass1 != pass2){
                     var message = {
-                        'error': [data.message]
+                        'error' : [ Joomla.JText._('COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE')]
                     };
                     Joomla.renderMessages(message);
                 }
-            });
-        }
-    });
-    //check if emails are equal
-    jQuery('#jform_email2').change(function(){
-        var mail1 = jQuery('#jform_email1').val();
-        var mail2 = jQuery('#jform_email2').val();
-        if(mail1.length && mail2.length){
-            if(mail1 != mail2){
-                var message = {
-                    'error' : [ Joomla.JText._('COM_USERS_PROFILE_EMAIL2_MESSAGE') ]
-                };
-                Joomla.renderMessages(message);
             }
-        }
+        });
     });
-    //check if password are equal
-    jQuery('#jform_password2').change(function(){
-        var pass1 = jQuery('#jform_password1').val();
-        var pass2 = jQuery('#jform_password2').val();
-        if(pass1.length && pass2.length){
-            if(pass1 != pass2){
-                var message = {
-                    'error' : [ Joomla.JText._('COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE')]
-                };
-                Joomla.renderMessages(message);
-            }
-        }
-    });
-}
+})(jQuery);
+
+