Changeset 6985

Timestamp:

Mar 9, 2018, 2:11:58 PM (3 years ago)

Author:

Juanma

Message:

Fix firefox first launch

Location:

lliurex-on-fire/trunk/fuentes

Files:

• chromium_addon/usr/share/chromium/extensions/akabjpjncgokcndehhncnbgginikpgdp.json (modified) (1 diff)
• chromium_addon/usr/share/chromium/extensions/lliurex-on-fire.crx (modified) (previous)
• chromium_addon/usr/share/google-chrome/extensions/akabjpjncgokcndehhncnbgginikpgdp.json (modified) (1 diff)
• chromium_addon/usr/share/google-chrome/extensions/lliurex-on-fire.crx (modified) (previous)
• firefox_addon/usr/lib/firefox/distribution/extensions/lliurex-on-fire@lliurex.net.xpi (modified) (previous)
• lliurex-on-fire/lliurex_on_fire.js (modified) (5 diffs)
• lliurex-on-fire/manifest.json (modified) (1 diff)

lliurex-on-fire/trunk/fuentes/chromium_addon/usr/share/chromium/extensions/akabjpjncgokcndehhncnbgginikpgdp.json

@@ -1 +1 @@
 {
         "external_crx":"/usr/share/chromium/extensions/lliurex-on-fire.crx",
-        "external_version":"0.1.0.1"
+        "external_version":"0.1.0.7"
 }

lliurex-on-fire/trunk/fuentes/chromium_addon/usr/share/google-chrome/extensions/akabjpjncgokcndehhncnbgginikpgdp.json

@@ -1 +1 @@
 {
         "external_crx":"/usr/share/chromium/extensions/lliurex-on-fire.crx",
-        "external_version":"0.1.0.1"
+        "external_version":"0.1.0.7"
 }

lliurex-on-fire/trunk/fuentes/lliurex-on-fire/lliurex_on_fire.js

@@ -9 +9 @@
 var extra_bm_url_arr=Object.keys(extra_bm_url);
 var bm_treeNode=''
+var max_tries=6
 
 function actionLog(e)
@@ -26 +27 @@
 function checkBookmarks(bm_item)
 {
+        console.log("Lliurex-on-fire: check bm");
         folder_id=bm_item.id;
         lliurex_bm_url_arr.forEach(function loop(url){
@@ -43 +45 @@
                                         });
         },this);
+        var query={'title':bm_folder_name};
+        search=chrome.bookmarks.search(query,reload);
+}
+
+function reload(bm_folder)
+{
+        if (! bm_folder[0])
+        {
+                if (max_tries)
+                {
+                        max_tries=max_tries-1;
+                        chrome.runtime.reload();
+                }
+        }
 }
 
 function createBookmarksFolder(title)
 {
+        console.log("Lliurex-on-fire: Add bm folder");
         var bookmark_bar_id=0;
         var bookmark_title='';
         chrome.bookmarks.getTree(function(tree){
-                bookmark_bar_id=tree[0].children[0].id;
+                bookmark_bar_id=""+tree[0].children[0].id;
                 bookmark_title=tree[0].children[0].title;
-                if (bookmark_bar_id==0)
+                if (bookmark_bar_id=="menu________")
                 {
+                        console.log("Lliurex-on-fire: Firefox toolbar");
                         bookmark_bar_id='toolbar_____';
                 }
-                query={'title':""+bookmark_title};
-                chrome.bookmarks.search(query,wait_for_bm);
-                query={'title':title,'parentId':""+bookmark_bar_id};
-                bm_folder=chrome.bookmarks.create(query,function(newFolder){checkBookmarks(newFolder)});
+                console.log("Lliurex-on-fire: Title "+bookmark_title+" id "+bookmark_bar_id);
+                query={'title':title,'parentId':bookmark_bar_id};
+                bm_folder=chrome.bookmarks.create(query,function(newFolder){checkBookmarks(newFolder)})
                 });
-}
-
-function sleep(ms)
-{
-        return new Promise(resolve=>setTimeout(resolve,ms));
-}
-
-async function wait_for_bm(bm_folder)
-{
-        if (! bm_folder[0])
-        {
-                await sleep(100);
-                chrome.bookmarks.search(query,wait_for_bm);
-        }
 }
 
@@ -83 +86 @@
                 checkBookmarks(bm_folder[0]);
         } else {
+                console.log("Lliurex-on-fire: Listener");
+//              browser.bookmarks.onCreated.addListener(function(){createBookmarksFolder('Lliurex')});
                 createBookmarksFolder('LliureX');
         }
@@ -88 +93 @@
 }
 
+var search='';
 var query={'title':bm_folder_name};
-var search=chrome.bookmarks.search(query,processBookmarks);
+console.log("Lliurex-on-fire: Init");
+search=chrome.bookmarks.search(query,processBookmarks);
+

lliurex-on-fire/trunk/fuentes/lliurex-on-fire/manifest.json

@@ -3 +3 @@
   "manifest_version": 2,
   "name": "LliurexOnFire",
-  "version": "0.1.0.2",
+  "version": "0.1.0.7",
 
   "description": "Add custom settings for LliureX",