Merge pull request #513 from jmerrifield/do-not-unescape-view-options

Don't unescape view options
Reviewed by @saponifi3d

Author: jmerrifield

shared/base/view.js

@@ -464,16 +464,14 @@ BaseView.createChildView = function (ViewClass, options, $el, parentView, cb) {
 };
 
 BaseView.getViewOptions = function ($el) {
-  var parsed,
-    options = $el.data();
+  var options = $el.data();
 
   _.each(options, function(value, key) {
     if (_.isString(value)) {
-      parsed = _.unescape(value);
       try {
-        parsed = JSON.parse(parsed);
+        value = JSON.parse(value);
       } catch (err) {}
-      options[key] = parsed;
+      options[key] = value;
     }
   });
 

test/shared/base/view.test.js

@@ -787,4 +787,26 @@ describe('BaseView', function() {
       expect(newChildView).to.be.an.instanceOf(ViewClass);
     });
   });
+
+  describe('BaseView.getViewOptions', function() {
+    it('should not unescape escaped data', function() {
+      var fakeEl = {
+        data: _.constant({
+          normalOption: 'Normal data',
+          jsonOption: '{"json":"data"}',
+          escapedOption: 'I am <span>escaped</span>',
+          escapedJsonOption: '{"escapedData":"I am <span>escaped</span>"}'
+        })
+      }
+
+      var parsedOptions = BaseView.getViewOptions(fakeEl);
+
+      expect(parsedOptions).to.deep.equal({
+        normalOption: 'Normal data',
+        jsonOption: {json: 'data'},
+        escapedOption: 'I am <span>escaped</span>',
+        escapedJsonOption: {escapedData: 'I am <span>escaped</span>'}
+      });
+    });
+  });
 });