From d02d9d979c49604d111d48237e12f22e1abf320f Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 21 Mar 2017 15:19:20 +0100 Subject: [PATCH] Updated version in package.josn --- dist/js/model.js | 2 +- dist/manifest.json | 2 +- package.json | 2 +- src/js/model.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/js/model.js b/dist/js/model.js index eb9686dd..346f142a 100644 --- a/dist/js/model.js +++ b/dist/js/model.js @@ -1,2 +1,2 @@ /*! (c) Philipp König under GPL-3.0 */ -"use strict";!function(){var a={},b=[],c={updateUrls:"https://moonware.de/ajax/extensions/updateUrls",userdata:"https://moonware.de/ajax/extensions/userdata"},d={getSubTree:function(a,b){chrome.bookmarks.getSubTree(a,b)},removeTree:function(a,b){chrome.bookmarks.removeTree(a,b)},search:function(a,b){chrome.bookmarks.search(a,b)},update:function(a,b,c){chrome.bookmarks.update(a,b,c)},move:function(a,b,c){chrome.bookmarks.move(a,b,c)}},e=function(b){b.id&&("undefined"==typeof a.clickCounter["node_"+b.id]&&(a.clickCounter["node_"+b.id]=0),a.clickCounter["node_"+b.id]++,s())},f=function(b,c){e(b),b.newTab&&b.newTab===!0?chrome.tabs.query({active:!0,currentWindow:!0},function(c){chrome.tabs.create({url:b.href,active:"undefined"==typeof b.active||!!b.active,index:c[0].index+1,openerTabId:c[0].id},function(b){a.openedByExtension=b.id,s()})}):chrome.tabs.query({active:!0,currentWindow:!0},function(c){chrome.tabs.update(c[0].id,{url:b.href},function(b){a.openedByExtension=b.id,s()})})},g=function(a,b){var c=new Image;c.onload=function(){var a=document.createElement("canvas");a.width=this.width,a.height=this.height;var c=a.getContext("2d");c.drawImage(this,0,0);var d=a.toDataURL("image/png");b({img:d})},c.src="chrome://favicon/size/16@2x/"+a.url},h=function(b,c){c({views:a.clickCounter["node_"+b.id]||0,counterStartDate:a.installationDate})},i=function(a,b){d.getSubTree(""+a.id,function(a){b({bookmarks:a})})},j=function(a,b){d.search(a.searchVal,function(a){b({bookmarks:a})})},k=function(b,c){"undefined"==typeof a.openedByExtension&&d.search({url:b.url},function(a){a.some(function(a){return a.url===b.url&&(e(a),!0)})}),delete a.openedByExtension,s()},l=function(a,b){var c={parentId:""+a.parentId,index:a.index};d.move(a.id,c,function(){b({moved:a.id})})},m=function(a,b){var c={title:a.title};a.url&&(c.url=a.url),d.update(a.id,c,function(){b({updated:a.id})})},n=function(a,b){d.removeTree(a.id,function(){b({deleted:a.id})})},o=function(a,d){a.abort&&a.abort===!0?b.forEach(function(a){a.abort()}):!function(){var e=new XMLHttpRequest;e.open("POST",c.updateUrls,!0),e.onload=function(){var a=JSON.parse(e.responseText);d(a)};var f=new FormData;f.append("url",a.url),f.append("ua",navigator.userAgent),f.append("lang",chrome.i18n.getUILanguage()),e.send(f),b.push(e)}()},p=function(b,c){a.shareUserdata=b.share,a.lastShareDate=0,s()},q=function(b,c){d.getSubTree(""+b.id,function(b){var d=0,e={bookmarks:0,dirs:0,total:0},f=function b(c){c.forEach(function(c){e.total++,c.children?e.dirs++:(e.bookmarks++,a.clickCounter["node_"+c.id]&&(d+=a.clickCounter["node_"+c.id])),c.children&&c.children.length>0&&b(c.children)})};b[0]&&b[0].children&&b[0].children.length>0&&f(b[0].children),c({childrenAmount:e,clickAmount:d,counterStartDate:a.installationDate})})},r={realUrl:o,addViewAmount:k,dirInfos:q,bookmarks:i,searchBookmarks:j,moveBookmark:l,updateBookmark:m,deleteBookmark:n,shareUserdata:p,favicon:g,openLink:f,viewAmount:h};chrome.extension.onMessage.addListener(function(a,b,c){return r[a.type]&&r[a.type](a,c),!0}),chrome.browserAction.onClicked.addListener(function(){chrome.tabs.query({active:!0,currentWindow:!0},function(a){chrome.tabs.sendMessage(a[0].id,{action:"toggleSidebar"})})}),chrome.runtime.onInstalled.addListener(function(a){if("install"===a.reason);else if("update"===a.reason){var b=a.previousVersion.split("."),c=chrome.runtime.getManifest().version.split(".");b[0]===c[0]&&b[1]===c[1]||chrome.storage.sync.get(null,function(a){if(a.appearance)return!1;var b={model:{},utility:{},behaviour:{},appearance:{}};"undefined"==typeof a.openAction&&(a.openAction="contextmenu"),Object.keys(a).forEach(function(c){var d=a[c];switch("y"===d&&(d=!0),"n"===d&&(d=!1),/^\{.*\}$/.test(d)&&(d=JSON.parse(d)),"middleClickActive"===c&&"undefined"==typeof a.newTab&&(c="newTab",d=d===!0?"foreground":"background"),"pxTolerance"===c&&("string"==typeof d&&0===d.search(/^\d+$/)||"number"==typeof d)&&(d={windowed:20,maximized:d}),c){case"openStates":case"searchValue":case"scrollPos":case"entriesLocked":b.utility[c]=d;break;case"openedByExtension":case"installationDate":case"clickCounter":case"shareUserdata":case"lastShareDate":case"uuid":b.model[c]=d;break;case"addVisual":b.appearance[c]=d;break;case"utility":case"behaviour":case"appearance":break;default:b.behaviour[c]=d}"utility"!==c&&"behaviour"!==c&&"appearance"!==c&&chrome.storage.sync.remove([c])}),chrome.storage.sync.set(b)})}});var s=function(){chrome.storage.sync.set({model:a})},t=function(){chrome.storage.sync.get(["model"],function(b){return"undefined"!=typeof b.model&&(a=b.model,"undefined"==typeof a.uuid&&(a.uuid=function(){var a=+new Date;return window.performance&&"function"==typeof window.performance.now&&(a+=window.performance.now()),"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(b){var c=(a+16*Math.random())%16|0;return a=Math.floor(a/16),("x"==b?c:3&c|8).toString(16)})}()),"undefined"==typeof a.clickCounter&&(a.clickCounter={}),"undefined"==typeof a.installationDate?a.installationDate=+new Date:"undefined"==typeof a.shareUserdata&&(+new Date-a.installationDate)/864e5>5&&setTimeout(function(){chrome.tabs.query({active:!0,currentWindow:!0},function(a){chrome.tabs.sendMessage(a[0].id,{action:"showShareUserdataMask"})})},6e4),void s())})},u=function(){chrome.storage.sync.get(null,function(b){"undefined"!=typeof b.model.uuid&&("undefined"==typeof b.model.lastShareDate||(+new Date-b.model.lastShareDate)/36e5>8)&&!function(){a.lastShareDate=+new Date,s();var e=function(a){var b=new XMLHttpRequest;b.open("POST",c.userdata,!0);var d=new FormData;d.append("data",JSON.stringify(a)),b.send(d)},f=chrome.runtime.getManifest();b.uuid=b.model.uuid,"Dev"!==f.version_name&&"update_url"in f||(b.uuid="Dev"),b.extension={name:f.name,version:f.version},"undefined"!=typeof b.model.shareUserdata&&b.model.shareUserdata===!0?d.getSubTree("0",function(a){b.bookmarkAmount=0;var c=function a(c){for(var d=0;d0&&c(a[0].children),delete b.utility,delete b.model,b.ua=navigator.userAgent,b.lang=chrome.i18n.getUILanguage(),e(b)}):e({uuid:b.uuid,extension:b.extension,shareUserdata:"undefined"==typeof b.model.shareUserdata?"undefined":b.model.shareUserdata})}()})};!function(){t(),u()}()}(); \ No newline at end of file +"use strict";!function(){var a={},b=[],c={updateUrls:"https://moonware.de/ajax/extensions/updateUrls",userdata:"https://moonware.de/ajax/extensions/userdata"},d={getSubTree:function(a,b){chrome.bookmarks.getSubTree(a,b)},removeTree:function(a,b){chrome.bookmarks.removeTree(a,b)},search:function(a,b){chrome.bookmarks.search(a,b)},update:function(a,b,c){chrome.bookmarks.update(a,b,c)},move:function(a,b,c){chrome.bookmarks.move(a,b,c)}},e=function(b){b.id&&("undefined"==typeof a.clickCounter["node_"+b.id]&&(a.clickCounter["node_"+b.id]=0),a.clickCounter["node_"+b.id]++,s())},f=function(b,c){e(b),b.newTab&&b.newTab===!0?chrome.tabs.query({active:!0,currentWindow:!0},function(c){chrome.tabs.create({url:b.href,active:"undefined"==typeof b.active||!!b.active,index:c[0].index+1,openerTabId:c[0].id},function(b){a.openedByExtension=b.id,s()})}):chrome.tabs.query({active:!0,currentWindow:!0},function(c){chrome.tabs.update(c[0].id,{url:b.href},function(b){a.openedByExtension=b.id,s()})})},g=function(a,b){var c=new Image;c.onload=function(){var a=document.createElement("canvas");a.width=this.width,a.height=this.height;var c=a.getContext("2d");c.drawImage(this,0,0);var d=a.toDataURL("image/png");b({img:d})},c.src="chrome://favicon/size/16@2x/"+a.url},h=function(b,c){c({views:a.clickCounter["node_"+b.id]||0,counterStartDate:a.installationDate})},i=function(a,b){d.getSubTree(""+a.id,function(a){b({bookmarks:a})})},j=function(a,b){d.search(a.searchVal,function(a){b({bookmarks:a})})},k=function(b,c){"undefined"==typeof a.openedByExtension&&d.search({url:b.url},function(a){a.some(function(a){return a.url===b.url&&(e(a),!0)})}),delete a.openedByExtension,s()},l=function(a,b){var c={parentId:""+a.parentId,index:a.index};d.move(a.id,c,function(){b({moved:a.id})})},m=function(a,b){var c={title:a.title};a.url&&(c.url=a.url),d.update(a.id,c,function(){b({updated:a.id})})},n=function(a,b){d.removeTree(a.id,function(){b({deleted:a.id})})},o=function(a,d){a.abort&&a.abort===!0?b.forEach(function(a){a.abort()}):!function(){var e=new XMLHttpRequest;e.open("POST",c.updateUrls,!0),e.onload=function(){var a=JSON.parse(e.responseText);d(a)};var f=new FormData;f.append("url",a.url),f.append("ua",navigator.userAgent),f.append("lang",chrome.i18n.getUILanguage()),e.send(f),b.push(e)}()},p=function(b,c){a.shareUserdata=b.share,a.lastShareDate=0,s()},q=function(b,c){d.getSubTree(""+b.id,function(b){var d=0,e={bookmarks:0,dirs:0,total:0},f=function b(c){c.forEach(function(c){e.total++,c.children?e.dirs++:(e.bookmarks++,a.clickCounter["node_"+c.id]&&(d+=a.clickCounter["node_"+c.id])),c.children&&c.children.length>0&&b(c.children)})};b[0]&&b[0].children&&b[0].children.length>0&&f(b[0].children),c({childrenAmount:e,clickAmount:d,counterStartDate:a.installationDate})})},r={realUrl:o,addViewAmount:k,dirInfos:q,bookmarks:i,searchBookmarks:j,moveBookmark:l,updateBookmark:m,deleteBookmark:n,shareUserdata:p,favicon:g,openLink:f,viewAmount:h};chrome.extension.onMessage.addListener(function(a,b,c){return r[a.type]&&r[a.type](a,c),!0}),chrome.browserAction.onClicked.addListener(function(){chrome.tabs.query({active:!0,currentWindow:!0},function(a){chrome.tabs.sendMessage(a[0].id,{action:"toggleSidebar"})})}),chrome.runtime.onInstalled.addListener(function(a){if("install"===a.reason)chrome.tabs.create({url:chrome.extension.getURL("html/howto.html")});else if("update"===a.reason){chrome.tabs.create({url:chrome.extension.getURL("html/howto.html")});var b=a.previousVersion.split("."),c=chrome.runtime.getManifest().version.split(".");b[0]===c[0]&&b[1]===c[1]||chrome.storage.sync.get(null,function(a){if(a.appearance)return!1;var b={model:{},utility:{},behaviour:{},appearance:{}};"undefined"==typeof a.openAction&&(a.openAction="contextmenu"),Object.keys(a).forEach(function(c){var d=a[c];switch("y"===d&&(d=!0),"n"===d&&(d=!1),/^\{.*\}$/.test(d)&&(d=JSON.parse(d)),"middleClickActive"===c&&"undefined"==typeof a.newTab&&(c="newTab",d=d===!0?"foreground":"background"),"pxTolerance"===c&&("string"==typeof d&&0===d.search(/^\d+$/)||"number"==typeof d)&&(d={windowed:20,maximized:d}),c){case"openStates":case"searchValue":case"scrollPos":case"entriesLocked":b.utility[c]=d;break;case"openedByExtension":case"installationDate":case"clickCounter":case"shareUserdata":case"lastShareDate":case"uuid":b.model[c]=d;break;case"addVisual":b.appearance[c]=d;break;case"utility":case"behaviour":case"appearance":break;default:b.behaviour[c]=d}"utility"!==c&&"behaviour"!==c&&"appearance"!==c&&chrome.storage.sync.remove([c])}),chrome.storage.sync.set(b)})}});var s=function(){chrome.storage.sync.set({model:a})},t=function(){chrome.storage.sync.get(["model"],function(b){return"undefined"!=typeof b.model&&(a=b.model,"undefined"==typeof a.uuid&&(a.uuid=function(){var a=+new Date;return window.performance&&"function"==typeof window.performance.now&&(a+=window.performance.now()),"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(b){var c=(a+16*Math.random())%16|0;return a=Math.floor(a/16),("x"==b?c:3&c|8).toString(16)})}()),"undefined"==typeof a.clickCounter&&(a.clickCounter={}),"undefined"==typeof a.installationDate?a.installationDate=+new Date:"undefined"==typeof a.shareUserdata&&(+new Date-a.installationDate)/864e5>5&&setTimeout(function(){chrome.tabs.query({active:!0,currentWindow:!0},function(a){chrome.tabs.sendMessage(a[0].id,{action:"showShareUserdataMask"})})},6e4),void s())})},u=function(){chrome.storage.sync.get(null,function(b){"undefined"!=typeof b.model.uuid&&("undefined"==typeof b.model.lastShareDate||(+new Date-b.model.lastShareDate)/36e5>8)&&!function(){a.lastShareDate=+new Date,s();var e=function(a){var b=new XMLHttpRequest;b.open("POST",c.userdata,!0);var d=new FormData;d.append("data",JSON.stringify(a)),b.send(d)},f=chrome.runtime.getManifest();b.uuid=b.model.uuid,"Dev"!==f.version_name&&"update_url"in f||(b.uuid="Dev"),b.extension={name:f.name,version:f.version},"undefined"!=typeof b.model.shareUserdata&&b.model.shareUserdata===!0?d.getSubTree("0",function(a){b.bookmarkAmount=0;var c=function a(c){for(var d=0;d0&&c(a[0].children),delete b.utility,delete b.model,b.ua=navigator.userAgent,b.lang=chrome.i18n.getUILanguage(),e(b)}):e({uuid:b.uuid,extension:b.extension,shareUserdata:"undefined"==typeof b.model.shareUserdata?"undefined":b.model.shareUserdata})}()})};!function(){t(),u()}()}(); \ No newline at end of file diff --git a/dist/manifest.json b/dist/manifest.json index 8cb6dc16..8a6a566d 100644 --- a/dist/manifest.json +++ b/dist/manifest.json @@ -1 +1 @@ -{"manifest_version":2,"name":"__MSG_extension_name__","short_name":"__MSG_extension_name__","description":"__MSG_extension_desc__","default_locale":"en","version":"1.4.1","minimum_chrome_version":"55","background":{"scripts":["js/model.js"],"persistent":false},"content_scripts":[{"css":["css/contentBase.css"],"js":["js/extension.js"],"matches":["http://*/*","https://*/*"],"run_at":"document_end"}],"browser_action":{"default_icon":"img/icon/128x128.png"},"web_accessible_resources":["css/sidebar.css","css/overlay.css","css/content.css","img/*"],"options_ui":{"page":"html/settings.html","chrome_style":true},"icons":{"48":"img/icon/48x48.png","128":"img/icon/128x128.png","256":"img/icon/256x256.png"},"permissions":["bookmarks","storage","chrome://favicon/"]} \ No newline at end of file +{"manifest_version":2,"name":"__MSG_extension_name__","short_name":"__MSG_extension_name__","description":"__MSG_extension_desc__","default_locale":"en","version":"1.4.2","minimum_chrome_version":"55","background":{"scripts":["js/model.js"],"persistent":false},"content_scripts":[{"css":["css/contentBase.css"],"js":["js/extension.js"],"matches":["http://*/*","https://*/*"],"run_at":"document_end"}],"browser_action":{"default_icon":"img/icon/128x128.png"},"web_accessible_resources":["css/sidebar.css","css/overlay.css","css/content.css","img/*"],"options_ui":{"page":"html/settings.html","chrome_style":true},"icons":{"48":"img/icon/48x48.png","128":"img/icon/128x128.png","256":"img/icon/256x256.png"},"permissions":["bookmarks","storage","chrome://favicon/"]} \ No newline at end of file diff --git a/package.json b/package.json index e90c0deb..ef13d33e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Bookmark Sidebar", - "version": "1.4.1", + "version": "1.4.2", "license": "GPL-3.0", "author": "Philipp König", "homepage": "https://moonware.de", diff --git a/src/js/model.js b/src/js/model.js index 2ddfaccd..a47788ea 100644 --- a/src/js/model.js +++ b/src/js/model.js @@ -330,7 +330,7 @@ if (details.reason === 'install') { chrome.tabs.create({url: chrome.extension.getURL('html/howto.html')}); } else if (details.reason === 'update') { - chrome.tabs.create({url: chrome.extension.getURL('html/howto.html')}); + //chrome.tabs.create({url: chrome.extension.getURL('html/howto.html')}); let versionPartsOld = details.previousVersion.split('.'); let versionPartsNew = chrome.runtime.getManifest().version.split('.');