Merge pull request #118 from codesy/install-redirect-117

Install redirect 117

Author: groovecoder

README.md

@@ -46,8 +46,8 @@ The codesy.io widget is an add-on for Firefox, Chrome, and Opera that adds codes
 * **build-chrome-file**: create zip for chrome dev in the chrome.source directory with dev settings
 
 #### build-{browser}-directory:
-* **build-firefox-directory**: create firefox dev directroy in the firefox.source directory with dev settings
-* **build-chrome-directory**: create chrome dev directroy in the chrome.source directory with dev settings
+* **build-firefox-directory**: create firefox dev directory in the firefox.source directory with dev settings
+* **build-chrome-directory**: create chrome dev directory in the chrome.source directory with dev settings
 
 #### workon-{browser}-directory or workon-{browser}-directory:
 watches extension files and rebuilds

gulpfile.js

@@ -11,7 +11,7 @@ const headerComment = require('gulp-header-comment');
 // Settings for building packages
 const settings = {
     name: 'codesy',
-    version: '0.0.0.7',
+    version: '0.0.0.8',
     source: './src',
     destination: './dist',
     static_files: {

src/csp.js

@@ -3,7 +3,7 @@ function makeCspAppender (domain='') {
     const name_finder = (name) => (csp_name) => csp_name === name.toUpperCase()
     const if_csp = (name) => csp_names.find(name_finder(name)) ? true : false
 
-    const codesy_types = 'connect-src child-src script-src style-src';
+    const codesy_types = 'connect-src frame-src child-src script-src style-src';
     const is_codesy = (type) => codesy_types.indexOf(type) !== -1;
     const add_codesy = (accum, word) =>`${accum} ${word} ${is_codesy(word) ? domain : '' }`;
     const insert_domain = (csp) => csp.split(' ').reduce(add_codesy,'');
@@ -39,7 +39,7 @@ function setCodesyAppender (domain) {
 };
 
 chrome.storage.local.get(null,
-    ({domain})=>{
+    ({domain = "https://codesy.io" })=>{
         if (domain) setCodesyAppender(domain);
     }
 );

src/issue.js

@@ -54,7 +54,7 @@ function wait_for_page_change  ( {url, id} ) {
 
 function get_codesy_domain () {
     return new Promise((resolve) => {
-        const resolve_domain = ({domain}) => resolve(domain)
+        const resolve_domain = ({domain = "https://codesy.io"}) => resolve(domain)
         chrome.storage.local.get(null, resolve_domain)
     });
 }

src/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "codesy.io",
     "author": "[email protected]",
-    "description": "codesy is a pay-what-you-want market for the open source community to encourage coders to fix important bugs.",
+    "description": "Codesy is a platform for fixing and funding open source software.",
     "manifest_version": 2,
     "permissions": [
         "https://*.codesy.io/",

src/on_install.js

@@ -1,49 +1,57 @@
 function find_these (query) {
     return new Promise((resolve)=>{
-        chrome.tabs.query(query, resolve);
+        if (Object.keys(query).includes('title')) {
+            // this is necessary until FF tab.title search works like Chrome
+            chrome.tabs.query({}, (all_tabs)=>{
+                tabs = all_tabs.filter(tab=>tab.title.includes(query.title))
+                resolve(tabs)
+            });
+        } else {
+            return chrome.tabs.query(query, resolve);
+        }
     });
 }
 
-function wait_for (id, resolve) {
+function wait_for (tab, resolve) {
     let times_checked = 0;
     let timerID, load_status;
     const set_status = ({status}) =>load_status=status
     const check_until = (status) => {
         if (load_status === status || (times_checked += 1) > 150){
             window.clearTimeout(timerID)
-            return resolve()
+            return resolve(tab)
         }
-        chrome.tabs.get(id, set_status)
+        chrome.tabs.get(tab.id, set_status)
         timerID = window.setTimeout(check_until, 100, status);
     }
     check_until ( 'complete' )
 }
 
-function reload (id) {
+function reload (tab) {
     return new Promise((resolve) => {
-        chrome.tabs.reload(id)
-        wait_for(id, resolve)
+        chrome.tabs.reload(tab.id)
+        wait_for(tab, resolve)
     });
 }
 
 function reload_them (tabs) {
-    const reloads = tabs.map(({id})=>reload(id))
-    return Promise.all(reloads)
+    const reloaded = tabs.map((tab)=>reload(tab))
+    return Promise.all(reloaded)
 }
 
-function select_them (tabs) {
-    tabs.map( ({id}) => chrome.tabs.update(id, {selected:true}) )
-    return tabs
+function activate_them (tabs) {
+    activated = tabs.map( (tab)=>chrome.tabs.update(tab.id,{'active': true}) )
+    return Promise.all(activated)
 }
 
 function when_installed ({reason}) {
-    find_these({ title: "*codesy.io*" })
-            .then(select_them)
-                .then(reload_them)
-                    .then(()=>{
-                        find_these({ url: "*://*.github.com/*" })
-                            .then(reload_them)
-                    })
+    find_these( {title:"codesy.io"} )
+        .then(reload_them)
+            .then(activate_them)
+                .then(()=>{
+                    find_these( {url: "*://*.github.com/*"} )
+                        .then(reload_them)
+                })
 }
 
 chrome.runtime.onInstalled.addListener(when_installed);