Merge branch 'feature/MSS-213' into develop

* feature/MSS-213: MSS-213 jquery selector fix. MSS-213 Include bootstrap in fix. MSS-213 Fix for ajax buttons triggering the single click protection.
cultuurnet · Nov 18, 2015 · 73c1f9a · 73c1f9a
2 parents f3a9f0a + 40915a3
commit 73c1f9a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc b/culturefeed_entry_ui/includes/culturefeed_entry_ui.pages.inc
@@ -2232,6 +2232,9 @@ function culturefeed_entry_ui_edit_tags_form($form, $form_state, $event) {
 
 
   $form['submit'] = array(
+    '#attributes' => array(
+      'class' => array('main-submit'),
+    ),
     '#type' => 'submit',
     '#value' => t('Submit'),
   );

diff --git a/culturefeed_entry_ui/js/culturefeed_entry_ui.js b/culturefeed_entry_ui/js/culturefeed_entry_ui.js
@@ -93,14 +93,17 @@ Drupal.Culturefeed_entry_ui = Drupal.Culturefeed_entry_ui || {};
 
     attach: function () {
 
-      $('.form-submit').click(function () {
+      var form = $('#culturefeed-entry-ui-event-form');
 
-        if ($(this).hasClass('form-submitted')) {
+      form.submit(function(event) {
+        $(this).data('submitted', true);
+      });
+
+      $('.main-submit, .btn-primary').click(function () {
+        if (form.data('submitted') === true) {
           $(this).attr('disabled', 'disabled');
           return false;
         }
-        $(this).addClass('form-submitted');
-
       });
 
     }