Why won't auto-auth work :(

GMOD · Nov 27, 2012 · 267dd24 · 267dd24
1 parent 33f2d0d
commit 267dd24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/JBrowse/View/Cloud/gdriveAuth.js b/src/JBrowse/View/Cloud/gdriveAuth.js
@@ -52,13 +52,12 @@ define(["dojo/_base/declare"], function(declare){
         },
 
         // fully authorized
-        authorized: function(authResult){
-            if (this.silent == undefined){
+        authorized: function(authResult){       
+            console.debug("Authorized");
+            if (this.silent !== 'silent'){
                 var authButton = document.getElementById('authorizeButton');
                 authButton.style.display = 'none';
-            }
-            console.debug("authorized");
-            if(this.callback){
+            } else if(this.callback){
                  this.callback();
             }
         }

diff --git a/src/JBrowse/View/Cloud/gdriveUpload.js b/src/JBrowse/View/Cloud/gdriveUpload.js
@@ -29,7 +29,8 @@ define( [
             var boundary = '-------314159265358979323846';
             var delimiter = "\r\n--" + boundary + "\r\n";
             var close_delim = "\r\n--" + boundary + "--";
-            var contentType = fileData.format ? 'application/x-'+ fileData.format.toLowerCase() : 'application/octet-stream';
+            var contentType = 'text/plain'//fileData.format ? 'application/x-'+ fileData.format.toLowerCase() : 'text/plain';
+            // ^ remove 'text/plain' and uncomment the rest of the line for proper MIME types.
             var metadata = {
                 'title': fileData.name,
                 'mimeType': contentType