Merge pull request waynehoover#87 from Hengjie/master

Fix IE9 issue with timestamp/unique_id
maletor · May 21, 2013 · c8b0df2 · c8b0df2
2 parents 9b31b75 + 3ecc124
commit c8b0df2
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/app/assets/javascripts/s3_direct_upload.js.coffee b/app/assets/javascripts/s3_direct_upload.js.coffee
@@ -99,9 +99,15 @@ $.fn.S3Uploader = (options) ->
           name: "content-type"
           value: fileType
 
+        key = $uploadForm.data("key").replace('{timestamp}', new Date().getTime()).replace('{unique_id}', @files[0].unique_id)
+
         # substitute upload timestamp and unique_id into key
-        key = data[1].value.replace('{timestamp}', new Date().getTime()).replace('{unique_id}', @files[0].unique_id)
         data[1].value = settings.path + key
+
+        # IE <= 9 doesn't have XHR2 hence it can't use formData
+        # replace 'key' field to submit form
+        unless 'FormData' of window
+          $uploadForm.find("input[name='key']").val(settings.path + key)
         data
 
   build_content_object = ($uploadForm, file, result) ->
@@ -111,7 +117,7 @@ $.fn.S3Uploader = (options) ->
       content.filepath = $('<a />').attr('href', content.url)[0].pathname
     else # IE <= 9 return a null result object so we use the file object instead
       domain           = $uploadForm.attr('action')
-      content.filepath = settings.path + $uploadForm.find('input[name=key]').val().replace('/${filename}', '')
+      content.filepath = $uploadForm.find('input[name=key]').val().replace('/${filename}', '')
       content.url      = domain + content.filepath + '/' + encodeURIComponent(file.name)
 
     content.filename   = file.name
@@ -131,6 +137,9 @@ $.fn.S3Uploader = (options) ->
 
   #public methods
   @initialize = ->
+    # Save key for IE9 Fix
+    $uploadForm.data("key", $uploadForm.find("input[name='key']").val())
+
     setUploadForm()
     this