Fix vAPI.download across all platforms

shuaaaa · Mar 11, 2015 · 0379762 · 0379762
1 parent 60e36c0
commit 0379762
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js
@@ -71,7 +71,7 @@ vAPI.download = function(details) {
     };
 
     if ( vAPI.isMainProcess ) {
-        vAPI.tabs.open(request);
+        vAPI.tabs.open(request.details);
         return;
     }
 

diff --git a/platform/firefox/vapi-common.js b/platform/firefox/vapi-common.js
@@ -57,14 +57,22 @@ vAPI.download = function(details) {
         a.dispatchEvent(new MouseEvent('click'));
         return;
     }
-    var messager = vAPI.messaging.channel('_download');
-    messager.send({
+
+    var request = {
         what: 'gotoURL',
         details: {
             url: details.url,
             index: -1
         }
-    });
+    };
+
+    if ( vAPI.isMainProcess ) {
+        vAPI.tabs.open(request);
+        return;
+    }
+
+    var messager = vAPI.messaging.channel('_download');
+    messager.send(request);
     messager.close();
 };
 

diff --git a/platform/safari/vapi-background.js b/platform/safari/vapi-background.js
@@ -31,7 +31,8 @@
     "use strict";
 
     var vAPI = self.vAPI = self.vAPI || {};
-
+
+    vAPI.isMainProcess = true;
     vAPI.safari = true;
 
     /******************************************************************************/

diff --git a/platform/safari/vapi-common.js b/platform/safari/vapi-common.js
@@ -55,14 +55,21 @@ vAPI.download = function(details) {
         a.dispatchEvent(new MouseEvent('click'));
         return;
     }
-    var messager = vAPI.messaging.channel('_download');
-    messager.send({
+    var request = {
         what: 'gotoURL',
         details: {
             url: details.url,
             index: -1
         }
-    });
+    };
+
+    if ( vAPI.isMainProcess ) {
+        vAPI.tabs.open(request);
+        return;
+    }
+
+    var messager = vAPI.messaging.channel('_download');
+    messager.send(request);
     messager.close();
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ vAPI.download = function(details) { @@
         };
         if ( vAPI.isMainProcess ) {
-            vAPI.tabs.open(request);
+            vAPI.tabs.open(request.details);
             return;
         }
@@ Expand Down @@