Merge pull request antimatter15#22 from chaohuang/master

blob issue fixed

Author: antimatter15

files.js

@@ -57,7 +57,7 @@ XMLHttpRequest.prototype.sendMultipart = function(params) {
   if(binxhr){
     var req = '', append = function(data){req += data}
   }else{
-    var req = new BlobBuilder(), append = function(data){req.append(data)}
+    var req = [], append = function(data){req.push(data)}
   }
 
   append("--" + BOUNDARY);
@@ -115,7 +115,7 @@ XMLHttpRequest.prototype.sendMultipart = function(params) {
     if(binxhr){
       xhr.sendAsBinary(req);
     }else{
-    	superblob = req.getBlob();
+    	superblob = new Blob(req);
       xhr.send(superblob);
     }
   });

hosts/google/docs.js

@@ -1,9 +1,8 @@
 Hosts.gdocs = function uploadGDocs(req, callback){
 
   getBuffer(req, function(file){
-    var builder = new BlobBuilder();
-    builder.append(file.data);
-    
+//    var builder = new BlobBuilder();
+//    builder.append(file.data);
 
   function handleErrors(resp){
 		if(resp.indexOf("ServiceForbiddenException") != -1){
@@ -61,7 +60,8 @@ Hosts.gdocs = function uploadGDocs(req, callback){
 
 
       console.log('uploading new mime type', file.type);
-      var blob = builder.getBlob(file.type);
+      //var blob = builder.getBlob(file.type);
+      var blob = new Blob([file.data], {type: file.type});
 
       GoogleOAUTH.sendSignedRequest(
         'https://docs.google.com/feeds/upload/create-session/default/private/full',

hosts/google/picasa.js

@@ -22,10 +22,9 @@ Hosts.picasa = function uploadPicasa(req, callback){
   };
 
   getBuffer(req, function(file){
-    var builder = new BlobBuilder();
-    builder.append(file.data);
-    
-  
+    //var builder = new BlobBuilder();
+    //builder.append(file.data);
+    var blob = new Blob([file.data], {type: file.type});
 
   function complete(resp, xhr){
     var prs = JSON.parse(resp);
@@ -79,7 +78,8 @@ xmlns:media='http://search.yahoo.com/mrss/'\
           parameters: {
             alt: 'json'
           },
-          body: builder.getBlob(file.type)
+          //body: builder.getBlob(file.type)
+          body: blob
         });
 
 

hosts/sugarsync.js

@@ -43,9 +43,10 @@ Hosts.sugarsync = function uploadsugarsync(req, callback){
 
 	function upload(ref){
 		getBuffer(req, function(file){
-			var builder = new BlobBuilder();
-			builder.append(file.data);
-			var blob = builder.getBlob();
+			//var builder = new BlobBuilder();
+			//builder.append(file.data);
+			//var blob = builder.getBlob();
+			var blob = new Blob([file.data]);
 			var xhr = new XMLHttpRequest();
 			xhr.open('PUT', ref+'/data', true);
 			xhr.setRequestHeader('Authorization', localStorage.sugarsync_auth);

hosts/webdav/dav.js

@@ -16,13 +16,14 @@ Hosts.webdav = function uploadWebDAV(req, callback){
   var fs = new WebDAV.Fs(localStorage.webdav_url);
   WebDAV.auth = localStorage.webdav_auth; //this is a nasty hack
   getRaw(req, function(file){
-    var body = new BlobBuilder();
+    //var body = new BlobBuilder();
     var bin = file.data, arr = new Uint8Array(bin.length);
     for(var i = 0; i < bin.length; i++){
       arr[i] = bin.charCodeAt(i);
     }
-    body.append(arr.buffer);
-    fs.file("/"+file.name).write(body.getBlob(), function(body, xhr){
+    //body.append(arr.buffer);
+    var body = new Blob([arr.buffer]);
+    fs.file("/"+file.name).write(body, function(body, xhr){
       if(xhr.status >= 200 && xhr.status < 300){
         callback("Yay I think this means it works");
       }else{

login_popup.html

@@ -1,5 +1,3 @@
-<script src="login_popup.js"></script>
-
 <form name="login_form" action='' autocomplete="off">
 	<label for="usr"> Username: </label>
 	<input id="usr" name="usr" required="required" type="text" placeholder="Username" autocomplete="off" /><br />
@@ -11,4 +9,6 @@
 
 	<input type="submit" name='submit' value="Login" />
 	<input type="button" name='cancel' value="Cancel" />
-</form>
+</form>
+
+<script src="login_popup.js"></script>

login_popup.js

@@ -11,5 +11,5 @@ function usrpwd(){
 
 document.addEventListener('DOMContentLoaded', function () {
 	document.login_form.addEventListener('submit',usrpwd);
-	document.login_form.cancel.addEventListener('click',window.close);
+	document.login_form.cancel.addEventListener('click',function(){window.close.call(window)});
 });

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Cloud Save",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "Save to cloud.",
   "background": {
     "page": "cloudsave.html"