1.2.0

Added recently closed tabs bar. May be enabled in options.
camellia-app · Nov 29, 2016 · 42073ce · 42073ce
1 parent cfefd1f
commit 42073ce
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 16 deletions.
diff --git a/public/_locales/ru/messages.json b/public/_locales/ru/messages.json
@@ -201,6 +201,20 @@
 	},
 
 
+	"option_recently_closed_label": {
+		"message": "Последние закрытые вкладки"
+	},
+	"option_recently_closed_hint": {
+		"message": "Отображение списка последних закрытых вкладок."
+	},
+	"option_recently_closed_display": {
+		"message": "Отображать"
+	},
+	"option_recently_closed_hide": {
+		"message": "Скрывать"
+	},
+
+
 
 	"back_to_questions": {
 		"message": "назад к вопросам"
@@ -247,6 +261,14 @@
 	},
 
 
+	"help_request_permissions_title": {
+		"message": "Почему расширение иногда запрашивает новые права доступа?"
+	},
+	"help_request_permissions_answer": {
+		"message": "Это необходимо для введения новых функций. Из-за реализации браузерных расширений, чтобы получить доступ к одной единственной некритичной функции, приходится запрашивать доступ сразу ко всему функционалу, который может даже не пригодиться. Например, чтобы получить доступ к последним закрытым вкладкам, приходится запрашивать доступ к функциям, которые работают с сессиями."
+	},
+
+
 	"help_change_theme_title": {
 		"message": "Можно ли изменить тему (дизайн)?"
 	},

diff --git a/public/js/background.js b/public/js/background.js
diff --git a/public/js/background.js.map b/public/js/background.js.map
diff --git a/public/js/newtab.js b/public/js/newtab.js
@@ -19348,6 +19348,20 @@ if (typeof browser === "undefined") {
       "maxArgs": 1
     }
   },
+  "sessions": {
+	  "getRecentlyClosed": {
+		"minArgs": 0,
+		"maxArgs": 1
+	  },
+	  "getDevices": {
+		  "minArgs": 0,
+        "maxArgs": 1
+	  },
+	  "restore": {
+		  "minArgs": 0,
+        "maxArgs": 0
+	  }
+  },
   "storage": {
     "local": {
       "clear": {
@@ -20050,21 +20064,40 @@ String.prototype.encodeHTML = function () {
 */
 
 Promise.all([
-    browser.storage.local.get(),
-    browser.storage.sync.get(),
+	browser.storage.local.get(),
+	browser.storage.sync.get(),
 	browser.bookmarks.getTree(),
 	browser.management.getSelf(),
-	browser.topSites.get()
+	browser.topSites.get(),
+	browser.sessions.getRecentlyClosed()
 ])
-.then(([local_storage, sync_storage, browserBookmarks, extensionInfo, topSites]) => {
+.then(([local_storage, sync_storage, browserBookmarks, extensionInfo, topSites, recentlyClosed]) => {
 	let allBookmarks          = browserBookmarks[0]['children'][0]['children'];
 	let columnsCount          = local_storage['columns_count'];
 	let backgroundImage       = local_storage['background_image'];
 	let openBookmarksInNewTab = local_storage['bookmarks_in_new_tab'];
 	let allTopSites           = local_storage['top_sites'] === true ? topSites : [];
 
-	console.log(allBookmarks);
-	console.log(allTopSites);
+	//
+	// Preparing recently closed tabs
+	//
+
+	let allClosedTabs = [];
+
+	if (local_storage['recently_closed'] === true) {
+		recentlyClosed.forEach(closedTab => {
+			if ( typeof closedTab['tab'] !== 'undefined'
+			&& typeof closedTab['tab']['title'] !== 'undefined'
+			&& typeof closedTab['tab']['url'] !== 'undefined') {
+				allClosedTabs.push({
+					title: closedTab['tab']['title'],
+					url:   closedTab['tab']['url']
+				});
+			}
+		});
+	}
+
+	console.log(allClosedTabs);
 
 	/*
 	|--------------------------------------------------------------------------
@@ -20106,6 +20139,8 @@ Promise.all([
 				chunkedBookmarks:      allBookmarks.chunk(columnsCount, true),
 				allTopSites:           allTopSites,
 				chunkedTopSites:       allTopSites.chunk(columnsCount, true),
+				allClosedTabs:         allClosedTabs,
+				chunkedClosedTabs:     allClosedTabs.chunk(columnsCount, true),
 				openBookmarksInNewTab: openBookmarksInNewTab,
 				columnSize:            Math.round(COLUMN_COUNT / columnsCount),
 
@@ -20115,6 +20150,13 @@ Promise.all([
 			};
 		},
 		template: `<main>
+				<ul class="bookmark-tree row pb-1"
+				v-if="allClosedTabs.length > 0">
+					<bookmark-column
+					v-for="site in chunkedClosedTabs"
+					:bookmarks="site"></bookmark-column>
+				</ul>
+
 				<ul class="bookmark-tree row pb-1"
 				v-if="allTopSites.length > 0">
 					<bookmark-column
@@ -20293,6 +20335,9 @@ Promise.all([
 				}, {
 					'title': browser.i18n.getMessage('help_why_permissions_title'),
 					'answer': browser.i18n.getMessage('help_why_permissions_answer')
+				}, {
+					'title': browser.i18n.getMessage('help_request_permissions_title'),
+					'answer': browser.i18n.getMessage('help_request_permissions_answer')
 				}, {
 					'title': browser.i18n.getMessage('help_change_theme_title'),
 					'answer': browser.i18n.getMessage('help_change_theme_answer')

diff --git a/public/js/newtab.js.map b/public/js/newtab.js.map
diff --git a/public/js/options.js b/public/js/options.js
diff --git a/public/js/options.js.map b/public/js/options.js.map
diff --git a/public/manifest.json b/public/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "__MSG_app_name__",
-	"version": "1.1.3",
+	"version": "1.2.0",
 	"author": "terron",
 	"homepage_url": "https://github.com/terron-kun/camellia",
 	"description": "__MSG_app_description__",
@@ -18,6 +18,7 @@
 		"storage",
 		"notifications",
 		"topSites",
+		"sessions",
 		"<all_urls>"
 	],
 

diff --git a/resources/assets/js/background.js b/resources/assets/js/background.js
@@ -237,6 +237,12 @@ browser.runtime.onInstalled.addListener(details => {
 		|| typeof local_storage['top_sites'] !== 'boolean') {
 			local_storage['top_sites'] = false;
 		}
+
+		// Display recently closed tabs
+		if (typeof local_storage['recently_closed'] === 'undefined'
+		|| typeof local_storage['recently_closed'] !== 'boolean') {
+			local_storage['recently_closed'] = false;
+		}
 
 		browser.storage.sync.set(sync_storage);
 		browser.storage.local.set(local_storage);

diff --git a/resources/assets/js/newtab.js b/resources/assets/js/newtab.js
@@ -9,21 +9,40 @@
 */
 
 Promise.all([
-    browser.storage.local.get(),
-    browser.storage.sync.get(),
+	browser.storage.local.get(),
+	browser.storage.sync.get(),
 	browser.bookmarks.getTree(),
 	browser.management.getSelf(),
-	browser.topSites.get()
+	browser.topSites.get(),
+	browser.sessions.getRecentlyClosed()
 ])
-.then(([local_storage, sync_storage, browserBookmarks, extensionInfo, topSites]) => {
+.then(([local_storage, sync_storage, browserBookmarks, extensionInfo, topSites, recentlyClosed]) => {
 	let allBookmarks          = browserBookmarks[0]['children'][0]['children'];
 	let columnsCount          = local_storage['columns_count'];
 	let backgroundImage       = local_storage['background_image'];
 	let openBookmarksInNewTab = local_storage['bookmarks_in_new_tab'];
 	let allTopSites           = local_storage['top_sites'] === true ? topSites : [];
 
-	console.log(allBookmarks);
-	console.log(allTopSites);
+	//
+	// Preparing recently closed tabs
+	//
+
+	let allClosedTabs = [];
+
+	if (local_storage['recently_closed'] === true) {
+		recentlyClosed.forEach(closedTab => {
+			if ( typeof closedTab['tab'] !== 'undefined'
+			&& typeof closedTab['tab']['title'] !== 'undefined'
+			&& typeof closedTab['tab']['url'] !== 'undefined') {
+				allClosedTabs.push({
+					title: closedTab['tab']['title'],
+					url:   closedTab['tab']['url']
+				});
+			}
+		});
+	}
+
+	console.log(allClosedTabs);
 
 	/*
 	|--------------------------------------------------------------------------
@@ -65,6 +84,8 @@ Promise.all([
 				chunkedBookmarks:      allBookmarks.chunk(columnsCount, true),
 				allTopSites:           allTopSites,
 				chunkedTopSites:       allTopSites.chunk(columnsCount, true),
+				allClosedTabs:         allClosedTabs,
+				chunkedClosedTabs:     allClosedTabs.chunk(columnsCount, true),
 				openBookmarksInNewTab: openBookmarksInNewTab,
 				columnSize:            Math.round(COLUMN_COUNT / columnsCount),
 
@@ -74,6 +95,13 @@ Promise.all([
 			};
 		},
 		template: `<main>
+				<ul class="bookmark-tree row pb-1"
+				v-if="allClosedTabs.length > 0">
+					<bookmark-column
+					v-for="site in chunkedClosedTabs"
+					:bookmarks="site"></bookmark-column>
+				</ul>
+
 				<ul class="bookmark-tree row pb-1"
 				v-if="allTopSites.length > 0">
 					<bookmark-column
@@ -252,6 +280,9 @@ Promise.all([
 				}, {
 					'title': browser.i18n.getMessage('help_why_permissions_title'),
 					'answer': browser.i18n.getMessage('help_why_permissions_answer')
+				}, {
+					'title': browser.i18n.getMessage('help_request_permissions_title'),
+					'answer': browser.i18n.getMessage('help_request_permissions_answer')
 				}, {
 					'title': browser.i18n.getMessage('help_change_theme_title'),
 					'answer': browser.i18n.getMessage('help_change_theme_answer')