releaf-core 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0729e307c18711ce4f77879c011eeba4b383e0d1
-  data.tar.gz: eef36e2915a38c27d9456088d295a6c1472f4e5f
+  metadata.gz: 1fcd7c58a85b8dc627c79cf87eb23b6ac23ffd76
+  data.tar.gz: ae97a97f22f3f64facb61b0eaa77b96f5210f2c0
 SHA512:
-  metadata.gz: 1742cbb9ae99eaf6883f7258fdf09d5c16e4b86738cd18cc9003dba4aa5d96bba96dd2ef44bd7d49596fb9347f1e48541ea0cd8d196a8ad1a95ed78cf9e1f751
-  data.tar.gz: 3447fd842ef858b232a879ae648e1af8aef808e1acf689335e67c7e1abef2003501ec235eab3550c5d243ad10a2abfddf34c4c3314fabd926c4b3001f8c0d58b
+  metadata.gz: e97a051440a22cb2ced65bc7583cc817f3ffe41a8e88215cb09d835c9f9a8da67f6f0547762c7161c1042db0587bab53f94312600d242c62a62209fc3c49d59f
+  data.tar.gz: 7d6f1ec452391adbf6ef7fde0da1072a62b48e506d963a12ff41dd7f4cc1ca3a6d78178f35097901cf9d83e3dd0cb7125cc8775f899e7f91ff34ba2d55bda9f4

data/app/assets/javascripts/releaf/include/field.type_richtext.js

@@ -58,7 +58,7 @@ jQuery(function()
             type = 'default';
         }
 
-        if (typeof window.ckeditor_configuration[type] == 'undefined')
+        if (typeof window.ckeditor_configuration[type] === 'undefined')
         {
             return;
         }

data/app/assets/javascripts/releaf/include/remote_validator.js

@@ -10,7 +10,7 @@ var RemoteValidator = function( form )
     v.form = form;
     v.clicked_button = null;
 
-    v.form.on('click.rails', submit_elements_selector, function( event ) {
+    v.form.on('click', submit_elements_selector, function( event ) {
         var target = jQuery( event.target );
 
         // webkit sends inner button elements as event targets instead of the button
@@ -21,14 +21,15 @@ var RemoteValidator = function( form )
             target = closest_button;
         }
 
-        // register only submit buttons - buttons with type="submit" or without type attribute at all
+        // register only submit buttons - buttons with type="submit" or without type attribute at all.
         // direct target[0].type property is used because of inconsistent attr() method return values
         // between older and newer jQuery versions
         if (target.is( 'button' ) && target[0].type !== 'submit' )
         {
             return;
         }
-        v.clicked_button = target;
+
+        v.register_clicked_button( target );
     });
 
     v.form.on( 'ajax:before', function( event )
@@ -368,7 +369,7 @@ var RemoteValidator = function( form )
 
             case 'validation:error':   // validation error
 
-                v.clicked_button = null;
+                v.clear_clicked_button();
 
                 break;
 
@@ -381,27 +382,57 @@ var RemoteValidator = function( form )
     });
 };
 
-RemoteValidator.prototype.submit_form = function()
+RemoteValidator.prototype.register_clicked_button = function(button)
 {
     var v = this;
-
-    // add originally clicked submit button to form as a hidden field
-    if (v.clicked_button)
+    v.clicked_button = button;
+
+    // when sending form values with FormData, the clicked button value is not included in the data
+    // (except on Safari, and therefore also on PhantomJS - that's why the tests worked fine even without this).
+
+    // since releaf sometimes uses the clicked button value to modify the action on the server side,
+    // (e.g. for "Save and create another" feature), the value of the clicked button must be appended
+    // to the form as a hidden field before the validation / submission starts.
+
+    // longer description:
+    // the algorithm to construct the form data set for a form optionally in the context
+    // of a submitter is as follows:
+    // https://www.w3.org/TR/html5/forms.html#constructing-form-data-set
+    // https://xhr.spec.whatwg.org/#dom-formdata
+    // If not specified otherwise, submitter is null.
+    // when this algorithm is executed from the FormData constructor, no submitter is specified,
+    // so no buttons are included in the form data set automatically.
+
+    var form = button.closest('form');
+    var hidden_field = form.find('input.submit-button-value').first();
+    if (hidden_field.length < 1)
     {
-        var button = v.clicked_button.first();
-        var name = button.attr('name');
-        if (name)
-        {
-            var input = v.form.find('input[type="hidden"][name="' + name + '"]');
-            if (input.length < 1)
-            {
-                input = jQuery('<input />').attr('type', 'hidden').attr('name', button.attr('name'));
-                input.appendTo(v.form);
-            }
-            input.val(button.val());
-        }
+        hidden_field = jQuery('<input type="hidden" class="submit-button-value" />');
+        hidden_field.appendTo(form);
+    }
+    var name = button.attr('name');
+    if (name)
+    {
+        hidden_field.attr('name', name);
+        hidden_field.val(button.val());
+    }
+    else
+    {
+        // no need for the hidden field in case of nameless buttons
+        hidden_field.remove();
     }
-    v.form[0].submit();
+};
+
+RemoteValidator.prototype.clear_clicked_button = function()
+{
+    var v = this;
+    v.clicked_button = null;
+    v.form.find('input.submit-button-value').remove();
+};
+
+RemoteValidator.prototype.submit_form = function()
+{
+    this.form[0].submit();
 };
 
 jQuery(function(){

data/spec/features/richtext_spec.rb

@@ -6,6 +6,7 @@ feature "Richtext editing", js: true do
 
   scenario "Image toolbar available when controller support attachments" do
     visit new_admin_node_path(content_type: 'TextPage')
+    wait_for_all_richtexts
     fill_in_richtext 'Text', with: "some text"
     expect(page).to have_css("a.cke_button__image")
   end
@@ -13,6 +14,7 @@ feature "Richtext editing", js: true do
   scenario "Image toolbar unavailable when controller doesn't support attachments" do
     allow_any_instance_of(Admin::BooksController).to receive(:releaf_richtext_attachment_upload_url).and_return("")
     visit new_admin_book_path
+    wait_for_all_richtexts
     fill_in_richtext "Summary", with: "some text"
     expect(page).to_not have_css("a.cke_button__image")
   end
@@ -20,6 +22,7 @@ feature "Richtext editing", js: true do
   scenario "Test helper fills in correct value" do
     visit new_admin_node_path(content_type: 'TextPage')
     html = %Q[ <p class="xxx" id='yyy'> &quot;HTML&quot; 'content' </p> ]
+    wait_for_all_richtexts
     fill_in_richtext 'Text', with: html
     content = evaluate_script('CKEDITOR.instances["resource_content_attributes_text_html"].getData();')
     expect(content).to match_html html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -630,7 +630,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: core gem for releaf