Fix for spaces in urls

DougPuchalski · May 29, 2013 · 3e27133 · 3e27133
1 parent d647ad2
commit 3e27133
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/assets/javascripts/s3_direct_upload.js.coffee b/app/assets/javascripts/s3_direct_upload.js.coffee
@@ -112,11 +112,12 @@ $.fn.S3Uploader = (options) ->
 
   build_content_object = ($uploadForm, file, result) ->
     content = {}
+    domain             = $uploadForm.attr('action')
     if result # Use the S3 response to set the URL to avoid character encodings bugs
-      content.url      = $(result).find("Location").text()
-      content.filepath = $('<a />').attr('href', content.url)[0].pathname
+      content.filepath = $(result).find("Key").text()
+      pathname         = $('<a />').attr('href', content.filepath)[0].pathname
+      content.url      = domain + pathname
     else # IE <= 9 return a null result object so we use the file object instead
-      domain           = $uploadForm.attr('action')
       content.filepath = $uploadForm.find('input[name=key]').val().replace('/${filename}', '')
       content.url      = domain + content.filepath + '/' + encodeURIComponent(file.name)