unwrap(FormData) fails

googlearchive · Aug 5, 2014 · c4da637 · c4da637
1 parent cdb189f
commit c4da637
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/wrappers.js b/src/wrappers.js
@@ -282,13 +282,15 @@ window.ShadowDOMPolyfill = {};
   var OriginalCanvasRenderingContext2D = window.CanvasRenderingContext2D;
   var OriginalWebGLRenderingContext = window.WebGLRenderingContext;
   var OriginalSVGElementInstance = window.SVGElementInstance;
-
+  var OriginalFormData = window.FormData;
+
   function isWrapper(object) {
     return object instanceof wrappers.EventTarget ||
            object instanceof wrappers.Event ||
            object instanceof wrappers.Range ||
            object instanceof wrappers.DOMImplementation ||
            object instanceof wrappers.CanvasRenderingContext2D ||
+           object instanceof wrappers.FormData ||
            wrappers.WebGLRenderingContext &&
                object instanceof wrappers.WebGLRenderingContext;
   }
@@ -301,6 +303,7 @@ window.ShadowDOMPolyfill = {};
            object instanceof OriginalRange ||
            object instanceof OriginalDOMImplementation ||
            object instanceof OriginalCanvasRenderingContext2D ||
+           object instanceof OriginalFormData ||
            OriginalWebGLRenderingContext &&
                object instanceof OriginalWebGLRenderingContext ||
            OriginalSVGElementInstance &&

diff --git a/src/wrappers/FormData.js b/src/wrappers/FormData.js
@@ -13,7 +13,10 @@
   var OriginalFormData = window.FormData;
 
   function FormData(formElement) {
-    this.impl = new OriginalFormData(formElement && unwrap(formElement));
+    if (formElement instanceof OriginalFormData)
+      this.impl = formElement;
+    else
+      this.impl = new OriginalFormData(formElement && unwrap(formElement));
   }
 
   registerWrapper(OriginalFormData, FormData, new OriginalFormData());

diff --git a/test/js/FormData.js b/test/js/FormData.js
@@ -6,6 +6,9 @@
 
 suite('FormData', function() {
 
+  var wrap = ShadowDOMPolyfill.wrap;
+  var unwrap = ShadowDOMPolyfill.unwrap;
+
   test('instanceof', function() {
     var fd = new FormData();
     assert.instanceOf(fd, FormData);
@@ -17,4 +20,11 @@ suite('FormData', function() {
     assert.instanceOf(fd, FormData);
   });
 
+  test('wrap/unwrap', function() {
+    var fd = new FormData();
+    var unwrapped = unwrap(fd);
+    var wrapped = wrap(unwrapped);
+    assert.equal(fd.impl, wrapped.impl);
+  });
+
 });