fix(pageAction): Copy Public Gateway URL

- closes #217 - hides IPFS actions when WebUI is opened
ipfs · Mar 18, 2017 · b2525ba · b2525ba
1 parent 3c7148b
commit b2525ba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/add-on/manifest.json b/add-on/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "IPFS Gateway Redirect (Development Channel)",
-    "version" : "2.0.0alpha2",
+    "version" : "2.0.0alpha3",
 
     "description": "Access IPFS resources via custom HTTP2IPFS gateway",
     "homepage_url": "https://github.com/lidel/ipfs-firefox-addon",

diff --git a/add-on/src/lib/common.js b/add-on/src/lib/common.js
@@ -296,7 +296,7 @@ function updateContextMenus () {
 
 function onUpdatedTab (tabId, changeInfo, tab) {
   if (tab && tab.url) {
-    const ipfsContext = window.IsIpfs.url(tab.url)
+    const ipfsContext = window.IsIpfs.url(tab.url) && !tab.url.startsWith(state.apiURLString)
     if (ipfsContext) {
       browser.pageAction.show(tab.id)
     } else {
@@ -408,17 +408,17 @@ function onStorageChange (changes, area) { // eslint-disable-line no-unused-vars
       // debug info
       // console.info(`Storage key "${key}" in namespace "${area}" changed. Old value was "${change.oldValue}", new value is "${change.newValue}".`)
       if (key === 'ipfsApiUrl') {
-        state.apiURLString = change.newValue
-        state.apiURL = new URL(state.apiURLString)
+        state.apiURL = new URL(change.newValue)
+        state.apiURLString = state.apiURL.toString()
         ipfs = initIpfsApi(state.apiURLString)
         browser.alarms.create(ipfsApiStatusUpdateAlarm, {})
       } else if (key === 'ipfsApiPollMs') {
         browser.alarms.clear(ipfsApiStatusUpdateAlarm).then(() => {
           createIpfsApiStatusUpdateAlarm(change.newValue)
         })
       } else if (key === 'customGatewayUrl') {
-        state.gwURLString = change.newValue
-        state.gwURL = new URL(state.gwURLString)
+        state.gwURL = new URL(change.newValue)
+        state.gwURLString = state.gwURL.toString()
       } else if (key === 'useCustomGateway') {
         state.redirect = change.newValue
         browser.alarms.create(ipfsRedirectUpdateAlarm, {})

diff --git a/add-on/src/popup/page-action.js b/add-on/src/popup/page-action.js
@@ -35,7 +35,7 @@ function initPageAction () {
       return browser.runtime.getBackgroundPage()
         .then(bg => {
           copyPublicGwAddress.onclick = () => {
-            const publicGwAddress = new URL(currentTab.url.replace(bg.state.gwURLString, 'https://ipfs.io')).toString()
+            const publicGwAddress = new URL(currentTab.url.replace(bg.state.gwURLString, 'https://ipfs.io/')).toString()
             copyTextToClipboard(publicGwAddress)
             bg.notify('Copied Public URL', publicGwAddress) // TODO: i18
             window.close()