From 941772844a1df499b35a9e5436d74c1741322ae5 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 3 Jan 2019 21:06:23 +0100 Subject: [PATCH] Add startpage timeout settings --- src/html/settings.html | 6 +- src/js/background.js | 1577 ++++++++++++++++++++-------------------- src/js/settings.js | 2 + 3 files changed, 799 insertions(+), 786 deletions(-) diff --git a/src/html/settings.html b/src/html/settings.html index 59d6b31..c38d927 100644 --- a/src/html/settings.html +++ b/src/html/settings.html @@ -68,6 +68,10 @@ + + Startpage timeout : + + @@ -246,4 +250,4 @@ - \ No newline at end of file + diff --git a/src/js/background.js b/src/js/background.js index 1e28963..46d8494 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -1,786 +1,793 @@ -var app = {}; // App object - -app.init = function(){ // Init module - app.Settings.init(function(){ - app.Messages.init(); - browser.runtime.sendMessage({ cmd: app.Messages.Commands.settingsChanged }); - browser.browserAction.onClicked.addListener(function(e){ - if(app.settings.openQuickDialInNewPage) browser.tabs.create({}); - else browser.tabs.update(e.id, {url: '/dial'}).then(); - }); - app.GridNodes.sync(app.node, app.settings.grid.root, function(){ - browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); - app.Bookmarks.initListener(); - app.ContextMenus.initMenu(); - }); - - // Start page workaround : - setTimeout(function(){ - browser.tabs.query({}).then( function(tabs) { - tabs.forEach(function(itm){ - if(itm.url=='about:blank'){ - browser.tabs.update(itm.id, {url: browser.extension.getURL('dial')}); - } +var app = {}; // App object + +app.init = function(){ // Init module + app.Settings.init(function(){ + app.Messages.init(); + browser.runtime.sendMessage({ cmd: app.Messages.Commands.settingsChanged }); + browser.browserAction.onClicked.addListener(function(e){ + if(app.settings.openQuickDialInNewPage) browser.tabs.create({}); + else browser.tabs.update(e.id, {url: '/dial'}).then(); + }); + browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); + app.ContextMenus.initMenu(); + window.setTimeout(function(){ + app.GridNodes.sync(app.node, app.settings.grid.root, function(){ + app.Bookmarks.initListener(); + }); + }, 500); + + // Start page workaround : + if(app.settings.startpageTimeout>0){ + setTimeout(function(){ + browser.tabs.query({}).then( function(tabs) { + tabs.forEach(function(itm){ + if(itm.url=='about:blank'){ + browser.tabs.update(itm.id, {url: browser.extension.getURL('dial')}); + } + }); + }); + }, app.settings.startpageTimeout); + } + + }); +}; + +app.Messages = {}; // Messages helper object +app.Messages.Commands = { + getSettings: 0, + setSettings: 1, + getNode: 2, + getNodeByID: 3, + updateNode: 4, + setNodeIndex: 5, + createBookmark: 6, + createFolder: 7, + deleteNode: 8, + refreshNode: 9, + capturePage: 10, + settingsChanged: 100, + gridNodesLoaded: 101 +}; +app.Messages.init = function(){ // Init Messages Listeners + browser.runtime.onMessage.addListener(function(request, sender, sendResponse){ + switch(request.cmd){ + case app.Messages.Commands.getSettings: + sendResponse(app.settings); + break; + case app.Messages.Commands.setSettings: + let rootChanged = (app.settings.grid.root!=request.settings.grid.root); + app.settings = request.settings; + app.Settings.save(); + sendResponse(app.settings); + browser.runtime.sendMessage( { cmd: app.Messages.Commands.settingsChanged } ); + if(rootChanged){ + app.node = { children: [] }; + app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); + } else { + browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); + } + app.ContextMenus.updateMenu(); + break; + case app.Messages.Commands.getNodeByID: + var nodes = app.GridNodes.getNodeWithParents(request.id); + if(nodes) sendResponse(nodes[nodes.length-1]); + else sendResponse(null); + break; + case app.Messages.Commands.updateNode: + app.GridNodes.updateNode(app.GridNodes.getNodeById(request.id), request.value, function(){ + browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); }); - }); - }, 500); - - }); -}; - -app.Messages = {}; // Messages helper object -app.Messages.Commands = { - getSettings: 0, - setSettings: 1, - getNode: 2, - getNodeByID: 3, - updateNode: 4, - setNodeIndex: 5, - createBookmark: 6, - createFolder: 7, - deleteNode: 8, - refreshNode: 9, - capturePage: 10, - settingsChanged: 100, - gridNodesLoaded: 101 -}; -app.Messages.init = function(){ // Init Messages Listeners - browser.runtime.onMessage.addListener(function(request, sender, sendResponse){ - switch(request.cmd){ - case app.Messages.Commands.getSettings: - sendResponse(app.settings); - break; - case app.Messages.Commands.setSettings: - let rootChanged = (app.settings.grid.root!=request.settings.grid.root); - app.settings = request.settings; - app.Settings.save(); - sendResponse(app.settings); - browser.runtime.sendMessage( { cmd: app.Messages.Commands.settingsChanged } ); - if(rootChanged){ - app.node = { children: [] }; - app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); - } else { - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - } - app.ContextMenus.updateMenu(); - break; - case app.Messages.Commands.getNodeByID: - var nodes = app.GridNodes.getNodeWithParents(request.id); - if(nodes) sendResponse(nodes[nodes.length-1]); - else sendResponse(null); - break; - case app.Messages.Commands.updateNode: - app.GridNodes.updateNode(app.GridNodes.getNodeById(request.id), request.value, function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); - break; - case app.Messages.Commands.getNode: - sendResponse(app.GridNodes.getNode(app.node, request.path.substr(1))); - break; - case app.Messages.Commands.setNodeIndex: - app.GridNodes.setNodeIndex(app.GridNodes.getNode(app.node, request.path.substr(1)), request.index, request.newIndex, function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); - break; - case app.Messages.Commands.createBookmark: - app.GridNodes.createBookmark(app.GridNodes.getNode(app.node, request.path.substr(1)), request.url, request.title, function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); - break; - case app.Messages.Commands.createFolder: - app.GridNodes.createFolder(app.GridNodes.getNode(app.node, request.path.substr(1)), request.name, function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); - break; - case app.Messages.Commands.deleteNode: - app.GridNodes.deleteNode(app.GridNodes.getNode(app.node, request.path.substr(1)), request.id, function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); - break; - case app.Messages.Commands.refreshNode: - app.GridNodes.refreshNode(app.GridNodes.getChildNode(app.GridNodes.getNode(app.node, request.path.substr(1)), request.id), function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); - break; - case app.Messages.Commands.capturePage: - app.GridNodes.capturePage(app.GridNodes.getChildNode(app.GridNodes.getNode(app.node, request.path.substr(1)), request.id), function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); - break; - } - }); -}; - -app.Settings = {}; // Settings helper object -app.Settings.init = function(callback){ // Load settings and nodes - browser.storage.local.get().then(function(data){ - if(Object.keys(data).length == 0 || ! data.settings) { - data = { - version: 3, - settings: { - backgroundColor: '#3c4048', - backgroundImage: null, - backgroundMode: 0, - menuShowAdd: true, - openQuickDialInNewPage: true, - grid: { - margin: 10, - rows: 4, - columns: 5, - ratioX: 4, - ratioY: 3, - backNode: true, - backIcon: 'url(/img/back.png)', - backIconMode: 3, - folderIcon: 'url(/img/folder.png)', - folderIconMode: 0, - loadingIcon: 'url(/img/throbber.gif)', - openBookmarkMethod: 0, - openFolderMethod: 0, - cells: { - margin: 4, - marginHover: 4, - opacity: 1, - opacityHover: 1, - backgroundColor: null, - backgroundColorHover: null, - borderColor: '#333333', - borderColorHover: '#a9a9a9', - borderRadius: 4, - borderRadiusHover: 4, - borderSize: 1, - borderSizeHover: 1, - title: true, - titleHover: true, - titleHeight: 16, - titleHeightHover: 16, - titleFontSize: 10, - titleFontSizeHover: 10, - titleFont: 'Arial, Verdana, Sans-serif', - titleColor: '#ffffff', - titleColorHover: '#33ccff', - titleBackgroundColor: null, - titleBackgroundColorHover: null, - titleBorderSize: 1, - titleBorderSizeHover: 1, - previewWidth: 1200, - previewHeight: 710, - snapshotDelay: 2000 - }, - root: 'Quick Dial', - } - }, - node: { children: [] } - } - } - if(!data.version){ // Upgrade Data Version - data.version = 2; - data.grid.backNode = true; - data.grid.backIcon = 'url(/img/back.png)'; - data.grid.folderIcon = 'url(/img/folder.png)'; - data.grid.loadingIcon = 'url(/img/throbber.gif)'; - data.grid.cells.backgroundColor = null; - data.grid.cells.backgroundColorHover = null; - data.grid.cells.titleBackgroundColor = null; - data.grid.cells.titleBackgroundColorHover = null; - delete data.grid.cells.backIcon; - delete data.grid.cells.folderIcon; - delete data.grid.cells.loadingIcon; - delete data.grid.cells.backPanel; - } - if(data.version == 2){ // Upgrade Data Version - var oldData = data; - data = {}; - data.version = 3; - data.settings = oldData; - data.node = oldData.grid.node; - delete data.settings.version; - delete data.settings.grid.node; - app.settings = data.settings; - app.node = data.node; - browser.storage.local.clear().then(function(){ - app.Settings.save(); - }); - } - if(data.version == 3){ // Upgrade Data Version - data.version = 4; - data.settings.backgroundMode = 0; - data.settings.grid.backIconMode = 3; - data.settings.grid.folderIconMode = 0; - data.settings.grid.cells.opacity = 1; - data.settings.grid.cells.opacityHover = 1; - data.settings.grid.cells.borderSize = 1; - data.settings.grid.cells.borderSizeHover = data.settings.grid.cells.borderSize; - data.settings.grid.cells.titleHover = data.settings.grid.cells.title; - data.settings.grid.cells.titleHeightHover = data.settings.grid.cells.titleHeight; - data.settings.grid.cells.titleFontSizeHover = data.settings.grid.cells.titleFontSize; - data.settings.grid.cells.titleBorderSize = 1; - data.settings.grid.cells.titleBorderSizeHover = data.settings.grid.cells.titleBorderSize; - app.Settings.save(); - } - if(data.version == 4){ // Upgrade Data Version - if(!data.settings.grid.cells.snapshotDelay) data.settings.grid.cells.snapshotDelay = 2000; - if(data.settings.grid.ratioAuto == true || data.settings.grid.ratioAuto == false){ - delete data.settings.grid.ratioAuto; - data.settings.grid.ratioX = 4; - data.settings.grid.ratioY = 3; - } - if(!data.settings.grid.ratioX){ - data.settings.grid.ratioX = 4; - data.settings.grid.ratioY = 3; - } - if(!(data.settings.menuShowAdd == true) && !(data.settings.menuShowAdd == false)){ - data.settings.menuShowAdd = true; - } - if(!data.settings.grid.openBookmarkMethod && data.settings.grid.openBookmarkMethod != 0){ - data.settings.grid.openBookmarkMethod = 0; - data.settings.grid.openFolderMethod = 0; - } - if(!data.settings.openQuickDialInNewPage && data.settings.openQuickDialInNewPage != false){ - data.settings.openQuickDialInNewPage = true; - } - //app.Settings.save(); - } - app.settings = data.settings; - app.node = data.node; - if(callback) callback(); - }, function(){ console.log('Error loading data'); }); -}; -app.Settings.update = function(settings, callback){ // Save new settings - app.settings = settings; - app.Settings.save(callback); -}; -app.Settings.save = function(callback){ // Save settings - if(! app.settings) return; - var data = { version: 4 }; - data.settings = app.settings; - data.node = app.node; - browser.storage.local.set(data).then(function(){ - if(callback) callback(); - }, function(){ console.log('Error saving settings'); }); -}; - -app.init(); - -app.ContextMenus = {} // ContextMenu helper Object -app.ContextMenus.menuItemClicked = function(info, tab){ - if (info.menuItemId == "AddToQuickDial") app.GridNodes.createBookmark(app.node, info.pageUrl, tab.title, function(){ - browser.runtime.sendMessage( { cmd: app.Messages.Commands.gridNodesLoaded } ); - }); -}; -app.ContextMenus.initMenu = function(){ // (Called from app.init) Init context menu in all pages - if(app.settings.menuShowAdd){ - browser.contextMenus.create({ // Create Context menu - id: 'AddToQuickDial', - title: browser.i18n.getMessage("menuAddToQuickDial"), - contexts: ["all"], - documentUrlPatterns: [ 'http://*/*', 'https://*/*', 'file://*/*', 'ftp://*/*' ] - }, function(){}); - browser.contextMenus.onClicked.addListener(app.ContextMenus.menuItemClicked); - } -}; -app.ContextMenus.updateMenu = function(){ - browser.contextMenus.onClicked.removeListener(app.ContextMenus.menuItemClicked); - browser.contextMenus.removeAll(); - app.ContextMenus.initMenu(); -}; - -app.Bookmarks = {} // Bookmarks helper object -app.Bookmarks._onCreated = function(){ app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); } -app.Bookmarks._onChanged = function(){ app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); } -app.Bookmarks._onMoved = function(){ app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); } -app.Bookmarks._onRemoved = function(){ app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); } -app.Bookmarks._onImportBegan = function(){ - browser.bookmarks.onCreated.removeListener(app.Bookmarks._onCreated); - browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); - browser.bookmarks.onMoved.removeListener(app.Bookmarks._onMoved); - browser.bookmarks.onRemoved.removeListener(app.Bookmarks._onRemoved); -} -app.Bookmarks._onImportEnded = function(){ - app.GridNodes.sync(app.node, app.settings.grid.root, function(){ browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); }); - app.Bookmarks.initListener(); -} -app.Bookmarks.initListener = function(){ // (Called from app.init) (/!\ Need filter to root tree only) Init listener of bookmarks - browser.bookmarks.onCreated.addListener(app.Bookmarks._onCreated); - browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); - browser.bookmarks.onMoved.addListener(app.Bookmarks._onMoved); - browser.bookmarks.onRemoved.addListener(app.Bookmarks._onRemoved); -} -app.Bookmarks.load = function(rootPath, callback){ // Load root bookmark and create it if not exist - if(!callback) return; - var root = 'menu________'; - if(rootPath.substr(0,1)=='/') root = 'root________'; - browser.bookmarks.getSubTree(root).then(function(bookmarkItems){ - function getChildItem(bookmarkItem, path, callback){ - if(path.length == 0){ - callback(bookmarkItem); - return; - } - for(var child of bookmarkItem.children) - if((path + '/').startsWith(child.title + '/')) - return getChildItem(child, path.substr(child.title.length + 1), callback); - browser.bookmarks.create({ - parentId: bookmarkItem.id, - title: path.substr(0, (path + '/').indexOf('/')) - }).then(function(bookmarkItem){ - return getChildItem(bookmarkItem, path.substr(bookmarkItem.title.length + 1), callback); - }, function(){ callback(); }); - } - if(rootPath.substr(0,1)=='/') getChildItem(bookmarkItems[0], rootPath.substr(1), callback); - else getChildItem(bookmarkItems[0], rootPath, callback); - }, function(){ callback(); }); -} - -app.SiteInfos = {} // Siteinfos helper object -app.SiteInfos.fromNewTab = function(url, callback){ // Retrieve infos from a new tab. callback( { url, title, icon, screenshot } || error: callback() ) - browser.tabs.create({url: url, active: false}).then(function(tab){ - browser.tabs.update(tab.id, {muted: true}).then(); - function whaitLoaded(){ - browser.tabs.get(tab.id).then(function(tab){ - if(tab.status == 'loading') setTimeout(whaitLoaded, 300); - else { - browser.tabs.update(tab.id, {active: true}).then(function(){ - setTimeout(function(){ - browser.tabs.captureVisibleTab().then(function(img){ - browser.tabs.remove(tab.id); - - var imgObj = new Image; - imgObj.src = img; - - var previewWidth = 1200; // Need to be linked to settings - var previewHeight = previewWidth / app.settings.grid.ratioX * app.settings.grid.ratioY; - if(app.settings.grid.title == true) previewHeight -= app.settings.grid.titleHeight; - - var canvas = document.createElement('canvas'); - canvas.style.width = previewWidth.toString() + 'px'; - canvas.style.height = previewHeight.toString() + 'px'; - canvas.width = previewWidth / 2; - canvas.height = previewHeight / 2; - - var ctx = canvas.getContext('2d'); - ctx.clearRect(0, 0, previewWidth, previewHeight); - ctx.save(); - ctx.scale(0.5, 0.5); - setTimeout(function(){ - if(tab.height * previewWidth / previewHeight >= tab.width){ - // Cut the bottom of the page - ctx.drawImage(imgObj, 0, 0, tab.width, tab.width / previewWidth * previewHeight, 0, 0, previewWidth, previewHeight); - } else { - // Stretch or cutting right part of the page ? actualy Stretch - ctx.drawImage(imgObj, 0, 0, tab.width, tab.height, 0, 0, previewWidth, previewHeight); - //ctx.drawImage(imgObj, 0, 0, tab.height / previewHeight * previewWidth, tab.height, 0, 0, previewWidth, previewHeight); - } - ctx.restore(); - img = canvas.toDataURL(); - if(callback) callback( { url: tab.url, title: tab.title, icon: tab.favIconUrl, screenshot: img } ); - }, 100); - }, function(){ - browser.tabs.remove(tab.id); - if(callback) callback(); - }); - }, app.settings.grid.cells.snapshotDelay); - }, function(){ if(callback) callback(); }); - } - }, function(){ if(callback) callback(); }); - } - setTimeout(whaitLoaded, 300); - }, function(){ if(callback) callback(); }); -} -app.SiteInfos.fromFrame = function(url, callback){ // Retrieve infos from an iframe. callback( { url, title, (/!\ Not handled now)icon, screenshot } || error: callback() ) - function pageLoaded(){ - if(!iframe) return; - var docTitle = iframe.contentWindow.document.title; - var docIcon = null; - var docScreenshot = null; - //title - if(docTitle == '') docTitle = url; - //icon - //screenshot - var canvas = document.createElement('canvas'); - canvas.style.width = previewWidth.toString() + 'px'; - canvas.style.height = previewHeight.toString() + 'px'; - canvas.width = previewWidth / 2; - canvas.height = previewHeight / 2; - var ctx = canvas.getContext('2d'); - ctx.clearRect(0, 0, previewWidth, previewHeight); - ctx.save(); - ctx.scale(0.5, 0.5); - ctx.drawWindow(iframe.contentWindow, 0, 0, previewWidth, previewHeight, 'rgb(255, 255, 255)'); - ctx.restore(); - docScreenshot = canvas.toDataURL(); - - document.body.removeChild(iframe); - iframe = null; - if(callback) callback({ url: url, title: docTitle, icon: docIcon, screenshot:docScreenshot }); - } - - var previewWidth = 1200; // Need to be linked to settings - var previewHeight = previewWidth / app.settings.grid.ratioX * app.settings.grid.ratioY; - if(app.settings.grid.title == true) previewHeight -= app.settings.grid.titleHeight; - var iframe; - var xmlHttp = new XMLHttpRequest(); - xmlHttp.timeout = 10000 - xmlHttp.open('GET', url, true); - xmlHttp.onload = function(){ - iframe = document.createElement('iframe'); - iframe.width = previewWidth - iframe.height = previewHeight - iframe.style.position = 'absolute'; - iframe.scrolling = 'no'; - var content = xmlHttp.responseText.replace('', ''); - iframe.onload = function(){ pageLoaded(); } - document.body.appendChild(iframe); - iframe.srcdoc = content; - setTimeout(function(){ pageLoaded(); }, 6000); - } - xmlHttp.onabort = function(){ if(callback) callback(); } - xmlHttp.onerror = function(){ if(callback) callback(); } - xmlHttp.ontimeout = function(){ if(callback) callback(); } - xmlHttp.send(); -} -app.SiteInfos.fromWS = function(url, callback){ // Retrieve infos from a Web Service. callback( { url, title, (/!\ Not handled now)icon, screenshot } || error: callback() ) - console.log('Not implemented'); - return app.SiteInfos.fromFrame(url, callback); -} - -app.GridNodes = {}; // GridNodes helper object -app.GridNodes.GridNodeType = { // GridNodeType - back: -1, - empty: 0, - folder: 1, - bookmark: 2 -} -app.GridNodes.sync = function(gridNode, rootPath, callback){ // Sync GridNodes with Bookmarks - if(app.GridNodes._syncing) { - app.GridNodes._needSync = true; - return; - } - app.GridNodes._syncing = true; - app.Bookmarks.load(rootPath, function(bookmarkItem){ - function syncNode(gridNode, bookmarkItem){ - gridNode.id = bookmarkItem.id; - gridNode.title = bookmarkItem.title; - switch(bookmarkItem.type){ - case 'bookmark': - gridNode.type = app.GridNodes.GridNodeType.bookmark; - if(gridNode.url != bookmarkItem.url){ - gridNode.url = bookmarkItem.url; - delete gridNode.image; - } - break; - case 'folder': - gridNode.type = app.GridNodes.GridNodeType.folder; - var EmptyNodes = []; - if(! gridNode.children) gridNode.children = []; - else { - for(var i=gridNode.children.length-1; i>=0; i--){ - if(!gridNode.children[i]) gridNode.children[i] = { type: app.GridNodes.GridNodeType.empty }; - if(gridNode.children[i].type==app.GridNodes.GridNodeType.empty){ - EmptyNodes.unshift(gridNode.children[i]); - } else { - var found = false; - for(var child of bookmarkItem.children){ - if(child.id==gridNode.children[i].id){ - found = true; - break; - } - } - if(! found){ - if(i0){ - childGridNode = EmptyNodes[0]; - EmptyNodes.shift(); - }else { - childGridNode = {}; - gridNode.children.push(childGridNode) - } - } - syncNode(childGridNode, child); - } - EmptyNodes.length = 0; - break; - default: - gridNode.type = app.GridNodes.GridNodeType.empty; - break; - } - } - - syncNode(gridNode, bookmarkItem); - delete app.GridNodes._syncing; - if(app.GridNodes._needSync == true) { - delete app.GridNodes._needSync; - app.GridNodes.sync(gridNode, rootPath, callback); - } else { - app.GridNodes.save(); - if(callback) callback(); - } - }); -} -app.GridNodes.save = function(callback){ // Save GridNodes - app.Settings.save(callback); -} -app.GridNodes.getNode = function(gridNode, path){ // Return GridNode from RootGridNode path - if(path.length == 0 || path == '/') return gridNode; - for(var child of gridNode.children) - if(path.startsWith(child.title + '/')) - return app.GridNodes.getNode(child, path.substr(child.title.length + 1)); - return null; -} -app.GridNodes.getNodeById = function(id){ - var nodes = app.GridNodes.getNodeWithParents(id); - if(nodes) return nodes[nodes.length-1]; - return null; -} -app.GridNodes.getNodeWithParents = function(id){ - - var parents = []; - - function findNode(gridNode){ - if(gridNode.id == id){ - parents.unshift(gridNode); - return gridNode; - } - if(gridNode.children){ - for(var i=0; i0) return parents; - return null; -} -app.GridNodes.updateNode = function(gridNode, value, callback){ - if(value){ - if(value.title) gridNode.title = value.title; - if(value.titleLocked!=null) gridNode.titleLocked = value.titleLocked; - if(value.imageLocked!=null){ - gridNode.imageLocked = value.imageLocked; - if(value.image) gridNode.image = value.image; - else delete gridNode.image; - } else if(gridNode.imageLocked != true){ - if(value.image) gridNode.image = value.image; - else delete gridNode.image; - } - if(value.imageMode || value.imageMode == 0) { - if(value.imageMode == -1) delete gridNode.imageMode; - else gridNode.imageMode = value.imageMode; - } - if(gridNode.type == app.GridNodes.GridNodeType.bookmark && value.url && gridNode.url != value.url){ - gridNode.url = value.url; - app.GridNodes.refreshNode(gridNode, function(){ - browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); - app.GridNodes.saveNode(gridNode); - var data = { title: gridNode.title }; - //if(gridNode.imageMode) data.imageMode = gridNode.imageMode; - //if(gridNode.type == app.GridNodes.GridNodeType.bookmark) data.url = gridNode.url; - data.url = gridNode.url; - browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); - browser.bookmarks.update(gridNode.id, data).then(function(){ - browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); - }); - }); - } else { - browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); - app.GridNodes.saveNode(gridNode); - var data = { title: gridNode.title }; - //if(gridNode.imageMode) data.imageMode = gridNode.imageMode; - browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); - browser.bookmarks.update(gridNode.id, data).then(function(){ - browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); - }); - } - } - if(callback) callback(gridNode); -} -app.GridNodes.getChildNode = function(gridNode, id){ // Return child node by ID - for(var child of gridNode.children) if(child.id == id) return child; - return null; -} -app.GridNodes.saveNode = function(gridNode, callback){ // Save GridNode - app.Settings.save(callback); -} -app.GridNodes.setNodeIndex = function(gridNode, index, newIndex, callback){ // Set Child GridNodeIndex. callback(gridNode, node1, node2) - while(newIndex>=gridNode.children.length) - gridNode.children.push({ type: app.GridNodes.GridNodeType.empty }); - var node1 = gridNode.children[index]; - var node2 = gridNode.children[newIndex]; - gridNode.children[index] = node2; - gridNode.children[newIndex] = node1; - for(var i=gridNode.children.length-1; i>=0; i--){ - if(gridNode.children[i].type != app.GridNodes.GridNodeType.empty) break; - gridNode.children.pop(); - } - app.GridNodes.saveNode(gridNode); - if(callback) callback(gridNode, node1, node2); -} -app.GridNodes.createBookmark = function(gridNode, url, title, callback){ // Create a new Bookmark in a GridNode. callback(gridNode, newGridNode) - browser.bookmarks.onCreated.removeListener(app.Bookmarks._onCreated); - var prefix = ''; - if(url.indexOf('://')<0) prefix = 'http://'; - browser.bookmarks.create({ - parentId: gridNode.id, - title: title || url, - url: prefix + url - }).then(function(bookmarkItem){ - if(!gridNode) return; // ??? Why this method are called a second time with gridNode = null ??? - browser.bookmarks.onCreated.addListener(app.Bookmarks._onCreated); - var newGridNode = { id: bookmarkItem.id, type: app.GridNodes.GridNodeType.bookmark, url: prefix + url, title }; - var EmptyCellFound = false; - for(var i=0; i=0; i--){ - if(gridNode.children[i].type != app.GridNodes.GridNodeType.empty) break; - gridNode.children.pop(); - } - browser.bookmarks.onRemoved.removeListener(app.Bookmarks._onRemoved); - browser.bookmarks.removeTree(id).then(function(){ - browser.bookmarks.onRemoved.addListener(app.Bookmarks._onRemoved); - }, function(){ - browser.bookmarks.onRemoved.addListener(app.Bookmarks._onRemoved); - }); - if(callback) callback(gridNode, id); -} - -app.GridNodes.refreshNode = function(gridNode, callback){ // Refresh content of a GridNode - if(gridNode.__isLoading == true) return; - gridNode.__isLoading = true; - switch(gridNode.type){ - case app.GridNodes.GridNodeType.folder: - delete gridNode.image; - delete gridNode.__isLoading; - app.GridNodes.saveNode(gridNode); - if(callback) callback({ title: gridNode.title, screenshot: gridNode.image }); - /* - browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); - browser.bookmarks.update(gridNode.id, { title: gridNode.title }).then(function(){ - browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); - }); - */ - break; - case app.GridNodes.GridNodeType.bookmark: - app.SiteInfos.fromFrame(gridNode.url, function(infos){ - if(gridNode.imageLocked!=true){ - if(infos){ - if(gridNode.titleLocked!=true) gridNode.title = infos.title; - gridNode.image = infos.screenshot; - } else { - gridNode.image = '0'; - } - } - - delete gridNode.__isLoading; - app.GridNodes.saveNode(gridNode); - if(callback) callback(infos); - browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); - browser.bookmarks.update(gridNode.id, { title: gridNode.title, url: gridNode.url }).then(function(){ - browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); - }); - }); - break; - } -} -app.GridNodes.capturePage = function(gridNode, callback){ - if(gridNode.__isLoading == true) return; - gridNode.__isLoading = true; - switch(gridNode.type){ - case app.GridNodes.GridNodeType.folder: - var nodes = app.GridNodes.getNodeWithParents(gridNode.id); - if(nodes){ - var path = ''; - for(var i=1; i= tab.width){ + // Cut the bottom of the page + ctx.drawImage(imgObj, 0, 0, tab.width, tab.width / previewWidth * previewHeight, 0, 0, previewWidth, previewHeight); + } else { + // Stretch or cutting right part of the page ? actualy Stretch + ctx.drawImage(imgObj, 0, 0, tab.width, tab.height, 0, 0, previewWidth, previewHeight); + //ctx.drawImage(imgObj, 0, 0, tab.height / previewHeight * previewWidth, tab.height, 0, 0, previewWidth, previewHeight); + } + ctx.restore(); + img = canvas.toDataURL(); + if(callback) callback( { url: tab.url, title: tab.title, icon: tab.favIconUrl, screenshot: img } ); + }, 100); + }, function(){ + browser.tabs.remove(tab.id); + if(callback) callback(); + }); + }, app.settings.grid.cells.snapshotDelay); + }, function(){ if(callback) callback(); }); + } + }, function(){ if(callback) callback(); }); + } + setTimeout(whaitLoaded, 300); + }, function(){ if(callback) callback(); }); +} +app.SiteInfos.fromFrame = function(url, callback){ // Retrieve infos from an iframe. callback( { url, title, (/!\ Not handled now)icon, screenshot } || error: callback() ) + function pageLoaded(){ + if(!iframe) return; + var docTitle = iframe.contentWindow.document.title; + var docIcon = null; + var docScreenshot = null; + //title + if(docTitle == '') docTitle = url; + //icon + //screenshot + var canvas = document.createElement('canvas'); + canvas.style.width = previewWidth.toString() + 'px'; + canvas.style.height = previewHeight.toString() + 'px'; + canvas.width = previewWidth / 2; + canvas.height = previewHeight / 2; + var ctx = canvas.getContext('2d'); + ctx.clearRect(0, 0, previewWidth, previewHeight); + ctx.save(); + ctx.scale(0.5, 0.5); + ctx.drawWindow(iframe.contentWindow, 0, 0, previewWidth, previewHeight, 'rgb(255, 255, 255)'); + ctx.restore(); + docScreenshot = canvas.toDataURL(); + + document.body.removeChild(iframe); + iframe = null; + if(callback) callback({ url: url, title: docTitle, icon: docIcon, screenshot:docScreenshot }); + } + + var previewWidth = 1200; // Need to be linked to settings + var previewHeight = previewWidth / app.settings.grid.ratioX * app.settings.grid.ratioY; + if(app.settings.grid.title == true) previewHeight -= app.settings.grid.titleHeight; + var iframe; + var xmlHttp = new XMLHttpRequest(); + xmlHttp.timeout = 10000 + xmlHttp.open('GET', url, true); + xmlHttp.onload = function(){ + iframe = document.createElement('iframe'); + iframe.width = previewWidth + iframe.height = previewHeight + iframe.style.position = 'absolute'; + iframe.scrolling = 'no'; + var content = xmlHttp.responseText.replace('', ''); + iframe.onload = function(){ pageLoaded(); } + document.body.appendChild(iframe); + iframe.srcdoc = content; + setTimeout(function(){ pageLoaded(); }, 6000); + } + xmlHttp.onabort = function(){ if(callback) callback(); } + xmlHttp.onerror = function(){ if(callback) callback(); } + xmlHttp.ontimeout = function(){ if(callback) callback(); } + xmlHttp.send(); +} +app.SiteInfos.fromWS = function(url, callback){ // Retrieve infos from a Web Service. callback( { url, title, (/!\ Not handled now)icon, screenshot } || error: callback() ) + console.log('Not implemented'); + return app.SiteInfos.fromFrame(url, callback); +} + +app.GridNodes = {}; // GridNodes helper object +app.GridNodes.GridNodeType = { // GridNodeType + back: -1, + empty: 0, + folder: 1, + bookmark: 2 +} +app.GridNodes.sync = function(gridNode, rootPath, callback){ // Sync GridNodes with Bookmarks + if(app.GridNodes._syncing) { + app.GridNodes._needSync = true; + return; + } + app.GridNodes._syncing = true; + app.Bookmarks.load(rootPath, function(bookmarkItem){ + function syncNode(gridNode, bookmarkItem){ + gridNode.id = bookmarkItem.id; + gridNode.title = bookmarkItem.title; + switch(bookmarkItem.type){ + case 'bookmark': + gridNode.type = app.GridNodes.GridNodeType.bookmark; + if(gridNode.url != bookmarkItem.url){ + gridNode.url = bookmarkItem.url; + delete gridNode.image; + } + break; + case 'folder': + gridNode.type = app.GridNodes.GridNodeType.folder; + var EmptyNodes = []; + if(! gridNode.children) gridNode.children = []; + else { + for(var i=gridNode.children.length-1; i>=0; i--){ + if(!gridNode.children[i]) gridNode.children[i] = { type: app.GridNodes.GridNodeType.empty }; + if(gridNode.children[i].type==app.GridNodes.GridNodeType.empty){ + EmptyNodes.unshift(gridNode.children[i]); + } else { + var found = false; + for(var child of bookmarkItem.children){ + if(child.id==gridNode.children[i].id){ + found = true; + break; + } + } + if(! found){ + if(i0){ + childGridNode = EmptyNodes[0]; + EmptyNodes.shift(); + }else { + childGridNode = {}; + gridNode.children.push(childGridNode) + } + } + syncNode(childGridNode, child); + } + EmptyNodes.length = 0; + break; + default: + gridNode.type = app.GridNodes.GridNodeType.empty; + break; + } + } + + syncNode(gridNode, bookmarkItem); + delete app.GridNodes._syncing; + if(app.GridNodes._needSync == true) { + delete app.GridNodes._needSync; + app.GridNodes.sync(gridNode, rootPath, callback); + } else { + app.GridNodes.save(); + if(callback) callback(); + } + }); +} +app.GridNodes.save = function(callback){ // Save GridNodes + app.Settings.save(callback); +} +app.GridNodes.getNode = function(gridNode, path){ // Return GridNode from RootGridNode path + if(path.length == 0 || path == '/') return gridNode; + for(var child of gridNode.children) + if(path.startsWith(child.title + '/')) + return app.GridNodes.getNode(child, path.substr(child.title.length + 1)); + return null; +} +app.GridNodes.getNodeById = function(id){ + var nodes = app.GridNodes.getNodeWithParents(id); + if(nodes) return nodes[nodes.length-1]; + return null; +} +app.GridNodes.getNodeWithParents = function(id){ + + var parents = []; + + function findNode(gridNode){ + if(gridNode.id == id){ + parents.unshift(gridNode); + return gridNode; + } + if(gridNode.children){ + for(var i=0; i0) return parents; + return null; +} +app.GridNodes.updateNode = function(gridNode, value, callback){ + if(value){ + if(value.title) gridNode.title = value.title; + if(value.titleLocked!=null) gridNode.titleLocked = value.titleLocked; + if(value.imageLocked!=null){ + gridNode.imageLocked = value.imageLocked; + if(value.image) gridNode.image = value.image; + else delete gridNode.image; + } else if(gridNode.imageLocked != true){ + if(value.image) gridNode.image = value.image; + else delete gridNode.image; + } + if(value.imageMode || value.imageMode == 0) { + if(value.imageMode == -1) delete gridNode.imageMode; + else gridNode.imageMode = value.imageMode; + } + if(gridNode.type == app.GridNodes.GridNodeType.bookmark && value.url && gridNode.url != value.url){ + gridNode.url = value.url; + app.GridNodes.refreshNode(gridNode, function(){ + browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); + app.GridNodes.saveNode(gridNode); + var data = { title: gridNode.title }; + //if(gridNode.imageMode) data.imageMode = gridNode.imageMode; + //if(gridNode.type == app.GridNodes.GridNodeType.bookmark) data.url = gridNode.url; + data.url = gridNode.url; + browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); + browser.bookmarks.update(gridNode.id, data).then(function(){ + browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); + }); + }); + } else { + browser.runtime.sendMessage({ cmd: app.Messages.Commands.gridNodesLoaded }); + app.GridNodes.saveNode(gridNode); + var data = { title: gridNode.title }; + //if(gridNode.imageMode) data.imageMode = gridNode.imageMode; + browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); + browser.bookmarks.update(gridNode.id, data).then(function(){ + browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); + }); + } + } + if(callback) callback(gridNode); +} +app.GridNodes.getChildNode = function(gridNode, id){ // Return child node by ID + for(var child of gridNode.children) if(child.id == id) return child; + return null; +} +app.GridNodes.saveNode = function(gridNode, callback){ // Save GridNode + app.Settings.save(callback); +} +app.GridNodes.setNodeIndex = function(gridNode, index, newIndex, callback){ // Set Child GridNodeIndex. callback(gridNode, node1, node2) + while(newIndex>=gridNode.children.length) + gridNode.children.push({ type: app.GridNodes.GridNodeType.empty }); + var node1 = gridNode.children[index]; + var node2 = gridNode.children[newIndex]; + gridNode.children[index] = node2; + gridNode.children[newIndex] = node1; + for(var i=gridNode.children.length-1; i>=0; i--){ + if(gridNode.children[i].type != app.GridNodes.GridNodeType.empty) break; + gridNode.children.pop(); + } + app.GridNodes.saveNode(gridNode); + if(callback) callback(gridNode, node1, node2); +} +app.GridNodes.createBookmark = function(gridNode, url, title, callback){ // Create a new Bookmark in a GridNode. callback(gridNode, newGridNode) + browser.bookmarks.onCreated.removeListener(app.Bookmarks._onCreated); + var prefix = ''; + if(url.indexOf('://')<0) prefix = 'http://'; + browser.bookmarks.create({ + parentId: gridNode.id, + title: title || url, + url: prefix + url + }).then(function(bookmarkItem){ + if(!gridNode) return; // ??? Why this method are called a second time with gridNode = null ??? + browser.bookmarks.onCreated.addListener(app.Bookmarks._onCreated); + var newGridNode = { id: bookmarkItem.id, type: app.GridNodes.GridNodeType.bookmark, url: prefix + url, title }; + var EmptyCellFound = false; + for(var i=0; i=0; i--){ + if(gridNode.children[i].type != app.GridNodes.GridNodeType.empty) break; + gridNode.children.pop(); + } + browser.bookmarks.onRemoved.removeListener(app.Bookmarks._onRemoved); + browser.bookmarks.removeTree(id).then(function(){ + browser.bookmarks.onRemoved.addListener(app.Bookmarks._onRemoved); + }, function(){ + browser.bookmarks.onRemoved.addListener(app.Bookmarks._onRemoved); + }); + if(callback) callback(gridNode, id); +} + +app.GridNodes.refreshNode = function(gridNode, callback){ // Refresh content of a GridNode + if(gridNode.__isLoading == true) return; + gridNode.__isLoading = true; + switch(gridNode.type){ + case app.GridNodes.GridNodeType.folder: + delete gridNode.image; + delete gridNode.__isLoading; + app.GridNodes.saveNode(gridNode); + if(callback) callback({ title: gridNode.title, screenshot: gridNode.image }); + /* + browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); + browser.bookmarks.update(gridNode.id, { title: gridNode.title }).then(function(){ + browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); + }); + */ + break; + case app.GridNodes.GridNodeType.bookmark: + app.SiteInfos.fromFrame(gridNode.url, function(infos){ + if(gridNode.imageLocked!=true){ + if(infos){ + if(gridNode.titleLocked!=true) gridNode.title = infos.title; + gridNode.image = infos.screenshot; + } else { + gridNode.image = '0'; + } + } + + delete gridNode.__isLoading; + app.GridNodes.saveNode(gridNode); + if(callback) callback(infos); + browser.bookmarks.onChanged.removeListener(app.Bookmarks._onChanged); + browser.bookmarks.update(gridNode.id, { title: gridNode.title, url: gridNode.url }).then(function(){ + browser.bookmarks.onChanged.addListener(app.Bookmarks._onChanged); + }); + }); + break; + } +} +app.GridNodes.capturePage = function(gridNode, callback){ + if(gridNode.__isLoading == true) return; + gridNode.__isLoading = true; + switch(gridNode.type){ + case app.GridNodes.GridNodeType.folder: + var nodes = app.GridNodes.getNodeWithParents(gridNode.id); + if(nodes){ + var path = ''; + for(var i=1; i