Update JavaScript to use data attribute

Close: #601 #605 #666
DavyJonesLocker · Jan 30, 2017 · 2b50c10 · 2b50c10
1 parent aefe962
commit 2b50c10
Show file tree

Hide file tree

Showing 17 changed files with 889 additions and 928 deletions.
diff --git a/coffeescript/rails.validations.coffee b/coffeescript/rails.validations.coffee
diff --git a/test/javascript/public/test/callbacks/elementAfter.js b/test/javascript/public/test/callbacks/elementAfter.js
@@ -1,17 +1,19 @@
 QUnit.module('Element Validate After Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {"user[name]":{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/callbacks/elementBefore.js b/test/javascript/public/test/callbacks/elementBefore.js
@@ -1,17 +1,19 @@
 QUnit.module('Element Validate Before Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      },
       validators: {"user[name]":{"{presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/callbacks/elementFail.js b/test/javascript/public/test/callbacks/elementFail.js
@@ -1,17 +1,19 @@
 QUnit.module('Element Validate Fail Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {"user[name]":{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/callbacks/elementPass.js b/test/javascript/public/test/callbacks/elementPass.js
@@ -1,17 +1,19 @@
 QUnit.module('Element Validate Pass Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {"user[name]":{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/callbacks/formAfter.js b/test/javascript/public/test/callbacks/formAfter.js
@@ -1,17 +1,19 @@
 QUnit.module('Form Validate After Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {"user[name]":{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/callbacks/formBefore.js b/test/javascript/public/test/callbacks/formBefore.js
@@ -1,17 +1,19 @@
 QUnit.module('Form Validate Before Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {"user[name]":{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/callbacks/formFail.js b/test/javascript/public/test/callbacks/formFail.js
@@ -1,17 +1,19 @@
 QUnit.module('Form Validate Fail Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {"user[name]":{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/callbacks/formPass.js b/test/javascript/public/test/callbacks/formPass.js
@@ -1,17 +1,19 @@
 QUnit.module('Form Validate Pass Callback', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {"user[name]":{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<span id="result" />'))
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/disableValidators.js b/test/javascript/public/test/disableValidators.js
diff --git a/test/javascript/public/test/form_builders/validateForm.js b/test/javascript/public/test/form_builders/validateForm.js
@@ -1,16 +1,18 @@
 QUnit.module('Validate Form', {
   beforeEach: function() {
-    ClientSideValidations.forms['new_user'] = {
-      type: 'ActionView::Helpers::FormBuilder',
-      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
-      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    dataCsv = {
+      html_settings: {
+        type: 'ActionView::Helpers::FormBuilder',
+        input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+        label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>'
+      },
       validators: {'user[name]':{"presence":[{"message": "must be present"}]}}
     }
 
     $('#qunit-fixture')
       .append($('<form />', {
         action: '/users',
-        'data-validate': true,
+        'data-client-side-validations': JSON.stringify(dataCsv),
         method: 'post',
         id: 'new_user'
       }))

diff --git a/test/javascript/public/test/utilities.js b/test/javascript/public/test/utilities.js