Small cleanup after merge of #30

ipfs · Dec 18, 2015 · 82c9228 · 82c9228
1 parent c48470a
commit 82c9228
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/gateways.js b/lib/gateways.js
@@ -43,14 +43,14 @@ function pin(address) {
   let IPFS_API_URI = 'http://' + prefs.customGatewayHost + ':5001/api/v0';
   let uri = ioservice.newURI(IPFS_API_URI + '/pin/add?arg=' + address, null, null);
 
-  Request({
+  new Request({
     url: uri.spec,
     onComplete: function (response) {
       let pinned = address.indexOf(response.json.Pinned)==6;
       notifications.notify({
         title: pinned ? 'Pinned' : 'Failed to Pin',
         text: address.slice(6)
-      })
+      });
     }
   }).get();
 }
@@ -88,6 +88,8 @@ exports.onChange = (f) => {
   callbacks.push(f);
 };
 
+exports.reload = reloadCachedProperties;
+
 exports.customUri = function() {
   return CUSTOM_GATEWAY_URI;
 };
@@ -97,3 +99,4 @@ exports.publicUri = function() {
 exports.publicHosts = function() {
   return PUBLIC_GATEWAY_HOSTS;
 };
+
diff --git a/lib/redirects.js b/lib/redirects.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const gw = require('./gateways');
-var prefs = require('sdk/simple-prefs').prefs;
 
 var {
   Cc, Ci
@@ -16,7 +15,7 @@ var ipfsRequestObserver = {
       let httpUrl = channel.URI.spec;
       if (httpUrl.match(gw.publicHosts()) && httpUrl.match(gw.IPFS_RESOURCE)) {
         channel.setRequestHeader('x-ipfs-firefox-addon', 'true', false);
-        if (prefs.useCustomGateway) {
+        if (gw.isEnabled()) {
           //console.info('Detected HTTP request to the public gateway: ' + channel.URI.spec);
           let uri = ioservice.newURI(httpUrl.replace(gw.publicHosts(), gw.customUri().spec), null, null);
           //console.info('Redirecting to custom gateway: ' + uri.spec);
@@ -50,6 +49,7 @@ gw.onChange(() => {
     ipfsRequestObserver.unregister();
   }
 });
+gw.reload(); // enable redirect
 
 
 exports.on = ipfsRequestObserver.register;