Changeset 6878

Timestamp:

Feb 20, 2018, 9:20:38 AM (18 months ago)

Author:

Juanma

Message:

Chrome/Firefox? compat

File:

• lliurex-on-fire/trunk/fuentes/lliurex-on-fire.install/usr/lib/firefox-addons/distributions/extensions/lliurex-on-fire/lliurex_on_fire.js (modified) (5 diffs)

lliurex-on-fire/trunk/fuentes/lliurex-on-fire.install/usr/lib/firefox-addons/distributions/extensions/lliurex-on-fire/lliurex_on_fire.js

@@ -1 +1 @@
 /**
- * Extension that adds Lliurex way-of-life to Firefox
+ * Extension that adds Lliurex mods to Firefox/Chromium
  */
 
 var bm_folder_name='LliureX';
-var lliurex_bm_url={'http://wiki.lliurex.net/Inicio':'Wiki de LliureX','http://mestreacasa.gva.es/web/lliurex':'LliureX','http://mestreacasa.gva.es/web/lliurex/forums':'foro de LliureX'};
+var lliurex_bm_url={'http://wiki.lliurex.net/Inicio':'Wiki de LliureX','http://mestreacasa.gva.es/web/lliurex':'LliureX','http://mestreacasa.gva.es/web/lliurex/forums':'Foro de LliureX'};
 var lliurex_bm_url_arr=Object.keys(lliurex_bm_url);
 var extra_bm_url={'http://mestreacasa.gva.es/web/guest/inicio':'Mestre a casa'};
 var extra_bm_url_arr=Object.keys(extra_bm_url);
+var bm_treeNode=''
 
 function actionLog(e)
@@ -19 +20 @@
         {
                 bm_data={'title':name,'url':url,'parentId':folder_id,'index':0};
-                var bm=browser.bookmarks.create(bm_data);
-                bm.then(actionLog);
+                var bm=chrome.bookmarks.create(bm_data);
         }}
 
@@ -27 +27 @@
         folder_id=bm_item.id;
         lliurex_bm_url_arr.forEach(function loop(url){
-                var query={'url':url}
+                var query={'url':url};
                 var name=lliurex_bm_url[query['url']];
-                var search=browser.bookmarks.search(query);
-                search.then(function helper(bm_item_tree){
-                                createBookmark(bm_item_tree,name,url,folder_id);},actionLog);
+                var search=chrome.bookmarks.search(query,
+                                        function helper(bm_item_tree){
+                                                        createBookmark(bm_item_tree,name,url,folder_id);
+                                        });
         },this);
         extra_bm_url_arr.forEach(function loop(url){
                 var query={'url':url}
                 var name=extra_bm_url[query['url']];
-                var search=browser.bookmarks.search(query);
-//              search.then(function helper(bm_item_tree){
-//                              createBookmark(bm_item_tree,name,url,'menu________');},actionLog);
-                search.then(function helper(bm_item_tree){
-                                createBookmark(bm_item_tree,name,url,'toolbar_____');},actionLog);
+                var search=chrome.bookmarks.search(query,
+                                        function helper(bm_item_tree){
+                                                        createBookmark(bm_item_tree,name,url,folder_id);
+                                        });
         },this);
 }
@@ -46 +46 @@
 function createBookmarksFolder(title)
 {
-//#     query={'title':title,'type':'folder','parentId':'menu________'};
-        query={'title':title,'type':'folder','parentId':'toolbar_____'};
-        bm_folder=browser.bookmarks.create(query)
-        bm_folder.then(checkBookmarks,actionLog)
+        var bookmark_bar_id=0;
+        chrome.bookmarks.getTree(function(tree){
+                bookmark_bar_id=tree[0].children[0].id;
+                if (bookmark_bar_id==0)
+                {
+                        bookmark_bar_id='toolbar_____';
+                }
+                query={'title':title,'parentId':""+bookmark_bar_id};
+                bm_folder=chrome.bookmarks.create(query,function(newFolder){checkBookmarks(newFolder)});
+                });
 }
+
 
 function processBookmarks(bm_folder)
@@ -64 +71 @@
 
 var query={'title':bm_folder_name};
-var search=browser.bookmarks.search(query);
-search.then(processBookmarks,actionLog);
+var search=chrome.bookmarks.search(query,processBookmarks);