m/quickdial-webext
1
0
Fork 0
mirror of https://github.com/MatMoul/quickdial-webext.git synced 2024-12-23 15:36:12 +00:00
Code Releases Activity

Improvement: Bookmarks sync

Browse Source
This commit is contained in:
MatMoul 2017-11-10 23:32:53 +01:00
parent dd95e95b20
commit 63c06fe5a5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/js/background.js
View File

@ -388,7 +388,7 @@ app.GridNodes.sync = function(gridNode, rootPath, callback){ // Sync GridNodes w
app.Bookmarks.load(rootPath, function(bookmarkItem){ app.Bookmarks.load(rootPath, function(bookmarkItem){
function syncNode(gridNode, bookmarkItem){ function syncNode(gridNode, bookmarkItem){
gridNode.id = bookmarkItem.id; gridNode.id = bookmarkItem.id;
if(!gridNode.title) gridNode.title = bookmarkItem.title; gridNode.title = bookmarkItem.title;
if(bookmarkItem.url){ if(bookmarkItem.url){
gridNode.type = app.GridNodes.GridNodeType.bookmark; gridNode.type = app.GridNodes.GridNodeType.bookmark;
if(!gridNode.url) gridNode.url = bookmarkItem.url; if(!gridNode.url) gridNode.url = bookmarkItem.url;
@ -496,18 +496,16 @@ app.GridNodes.updateNode = function(gridNode, value, callback){
if(value.titleLocked!=null) gridNode.titleLocked = value.titleLocked; if(value.titleLocked!=null) gridNode.titleLocked = value.titleLocked;
if(value.image) gridNode.image = value.image; if(value.image) gridNode.image = value.image;
else delete gridNode.image; else delete gridNode.image;
if(gridNode.type == app.GridNodes.GridNodeType.bookmark && value.url && gridNode.url != value.url){ if(gridNode.type == app.GridNodes.GridNodeType.bookmark) gridNode.url = value.url;
gridNode.url = value.url; app.GridNodes.refreshNode(gridNode, function(){
app.GridNodes.refreshNode(gridNode, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded });
browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); var data = { title: gridNode.title };
var data = { title: gridNode.title }; if(gridNode.type == app.GridNodes.GridNodeType.bookmark) data.url = gridNode.url;
if(gridNode.url) data.url = gridNode.url; browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged);
browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); browser.bookmarks.update(gridNode.id, data).then(function(){
browser.bookmarks.update(gridNode.id, data).then(function(){ browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged);
browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged);
});
}); });
} });
app.GridNodes.saveNode(gridNode); app.GridNodes.saveNode(gridNode);
} }
if(callback) callback(gridNode); if(callback) callback(gridNode);