Improve special character handling in formDataUtils

Correctly parse plus signs, spaces etc.
codevise · Dec 28, 2016 · bbb4a18 · bbb4a18
1 parent 3ab9bc3
commit bbb4a18
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/app/assets/javascripts/pageflow/editor/utils/form_data_utils.js b/app/assets/javascripts/pageflow/editor/utils/form_data_utils.js
@@ -7,9 +7,11 @@ pageflow.formDataUtils = {
   },
 
   fromObject: function(object) {
-    return _(decodeURIComponent($.param(object)).split('&')).reduce(function(result, param) {
+    var queryString = $.param(object).replace(/\+/g, '%20');
+
+    return _(queryString.split('&')).reduce(function(result, param) {
       var pair = param.split('=');
-      result[pair[0]] = pair[1];
+      result[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
 
       return result;
     }, {});

diff --git a/spec/javascripts/utils/form_data_utils_spec.js b/spec/javascripts/utils/form_data_utils_spec.js
@@ -17,6 +17,20 @@ describe('formDataUtils', function() {
         'some[deeply][nested]': 'data'
       });
     });
+
+    it('handles spaces, +, = and & signs correctly', function() {
+      var object = {
+        some: {
+          value: '1 + 1 = 2 & a',
+        }
+      };
+
+      var result = pageflow.formDataUtils.fromObject(object);
+
+      expect(result).to.eql({
+        'some[value]': '1 + 1 = 2 & a',
+      });
+    });
   });
 
   describe('fromModel', function() {