VFS: dropbox - now uses popupÃ driver (#28)

os-js · Dec 29, 2014 · 1038479 · 1038479
1 parent 60cf91f
commit 1038479
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/dist-dev/vendor/dropboxOauthReceiver.html b/dist-dev/vendor/dropboxOauthReceiver.html
@@ -0,0 +1 @@
+../../dist/vendor/dropboxOauthReceiver.html
diff --git a/dist/vendor/dropboxOauthReceiver.html b/dist/vendor/dropboxOauthReceiver.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <script src="dropbox.js" type="text/javascript"></script>
+    <script type="text/javascript">
+      Dropbox.AuthDriver.Popup.oauthReceiver();
+    </script>
+  </head>
+  <body>
+    <h1>Dropbox sign-in successful</h1>
+    <p>Please close this window.</p>
+  </body>
+</html>
diff --git a/src/javascript/vfs/dropbox.js b/src/javascript/vfs/dropbox.js
@@ -105,13 +105,18 @@
     var clientKey = _getConfig('ClientKey');
     this.client = new window.Dropbox.Client({ key: clientKey });
 
-    /*
     if ( this.client ) {
+      var href = window.location.href;
+      if ( !href.match(/\/$/) ) {
+        href += '/';
+      }
+      href += 'vendor/dropboxOauthReceiver.html';
+
       var authDriver = new window.Dropbox.AuthDriver.Popup({
+        receiverUrl: href
       });
       this.client.authDriver(authDriver);
     }
-    */
   }
 
   DropboxVFS.prototype.init = function(callback) {