bump to 1.5.1

quick fix: mouse click on scrollbar caused loss of tabs selection
This commit is contained in:
karol@jagiello.it 2018-03-13 18:11:22 +01:00
parent d54c794cab
commit ce87fdc247
12 changed files with 26 additions and 20 deletions

View File

@ -20,7 +20,6 @@ menu: move to group
menu: Unload other menu: Unload other
click on active to return to previous tab
sort tabs/tree sort tabs/tree
maybe filter tabs on search maybe filter tabs on search

View File

@ -0,0 +1 @@
{"ToolbarShow":true,"ColorsSet":{"pin_list_background":"#4b4e65","attention_background":"#202340","tab_background":"#202340","tab_title_font_color":"#ffffff","tab_active_background":"#f2f2f2","tab_active_border":"#0a84ff","tab_discarded_background":"#202340","tab_discarded_border":"#202340","tab_border":"#202340","group_list_background":"#4b4e65","tab_list_background":"#4b4e65","children_padding_left":"13px","group_list_default_font_color":"#f2f2f2","tab_active_selected_border":"#0a84ff","close_x":"#b8b9c2","tab_hover_background":"#373954","tab_hover_title_font_color":"#f2f2f2","tab_hover_border":"#5f6176","tab_active_hover_background":"#f2f2f2","tabs_menu_hover_background":"#90c8f6","close_hover_background":"#4a4c64","close_hover_border":"#4a4c64","filter_box_font":"#808080","button_icons":"#4a4a4b","button_icons_hover":"#404040","button_hover_background":"#d5d5d6","button_hover_border":"#d5d5d6","filter_box_border":"#bebebf","attention_border":"#00feff","tab_discarded_hover_background":"#373954","tab_discarded_hover_border":"#5f6176","expand_closed_background":"#0a84ff","expand_hover_background":"#0a84ff","expand_open_background":"#0a84ff","tab_selected_background":"#202340","tab_selected_title_font_color":"#ffffff","tab_selected_border":"#0a84ff","tab_selected_hover_background":"#373954","tab_selected_hover_title_font_color":"#0a84ff","tab_selected_hover_border":"#0a84ff","tab_active_selected_background":"#f2f2f2","tab_selected_active_hover_background":"#f2f2f2","tab_selected_discarded_background":"#202340","tab_selected_discarded_hover_background":"#373954","tab_selected_discarded_hover_border":"#0a84ff","tab_selected_discarded_border":"#0a84ff","tab_active_selected_title_font_color":"#0a84ff","tab_selected_active_hover_title_font_color":"#0a84ff"},"TabsSizeSetNumber":4,"theme_name":"Firefox Quantum","theme_version":2,"toolbar":"<div id=\"toolbar_main\"><div class=\"button\" id=\"button_new\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_pin\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_undo\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_tools\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_backup\"><div class=\"button_img\"></div></div></div><div class=\"toolbar_shelf\" id=\"toolbar_search\"><div id=\"toolbar_search_input_box\"><input id=\"filter_box\" placeholder=\"Search\" tabs...=\"\" type=\"text\"><div id=\"button_filter_clear\" style=\"opacity: 0; position: absolute;\" type=\"reset\"></div></div><div id=\"toolbar_search_buttons\"><div class=\"button url\" id=\"button_filter_type\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"filter_search_go_prev\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"filter_search_go_next\"><div class=\"button_img\"></div></div></div></div><div class=\"toolbar_shelf\" id=\"toolbar_shelf_tools\"><div class=\"button\" id=\"button_options\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_discard\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_move\"><div class=\"button_img\"></div></div></div><div class=\"toolbar_shelf\" id=\"toolbar_shelf_groups\"><div class=\"button\" id=\"button_groups_toolbar_hide\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_new_group\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_remove_group\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_edit_group\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_import_group\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_export_group\"><div class=\"button_img\"></div></div></div><div class=\"toolbar_shelf\" id=\"toolbar_shelf_backup\"><div class=\"button\" id=\"button_import_bak\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_import_merge_bak\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_export_bak\"><div class=\"button_img\"></div></div></div><div class=\"toolbar_shelf\" id=\"toolbar_shelf_folders\"><div class=\"button\" id=\"button_new_folder\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_remove_folder\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_edit_folder\"><div class=\"button_img\"></div></div></div>","unused_buttons":"<div class=\"button\" id=\"button_search\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_groups\"><div class=\"button_img\"></div></div><div class=\"button\" id=\"button_folders\" draggable=\"true\"><div class=\"button_img\"></div></div>"}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -44,5 +44,5 @@
"page": "options.html", "page": "options.html",
"open_in_tab": true "open_in_tab": true
}, },
"version": "1.5" "version": "1.5.1"
} }

View File

@ -3,6 +3,5 @@
<head><meta charset="utf-8"/></head> <head><meta charset="utf-8"/></head>
<body></body> <body></body>
<script type="text/javascript" src="../scripts/global.js"></script> <script type="text/javascript" src="../scripts/global.js"></script>
<script type="text/javascript" src="../legacy.js"></script>
<script type="text/javascript" src="../bg_ch.js"></script> <script type="text/javascript" src="../bg_ch.js"></script>
</html> </html>

View File

@ -19,5 +19,5 @@
"page": "options.html", "page": "options.html",
"open_in_tab": false "open_in_tab": false
}, },
"version": "1.0" "version": "1.5"
} }

View File

@ -4,7 +4,7 @@
function OldHashTab(tab){ function OldHashTab(tab){
if (tabs[tab.id] == undefined){ if (tabs[tab.id] == undefined){
tabs[tab.id] = {ttid: "", hash: 0, h: 0, parent: tab.pinned ? "pin_list" : "tab_list", index: tab.index, expand: "n"}; tabs[tab.id] = {ttid: "", hash: 0, h: 0, parent: tab.pinned ? "pin_list" : "tab_list", index: tab.index, expand: ""};
} }
var hash = 0; var hash = 0;
if (tab.url.length === 0){ if (tab.url.length === 0){
@ -153,9 +153,9 @@ function FirefoxLoadV100(retry) {
let tab = Promise.resolve(browser.sessions.getTabValue(tabId, "TTId")).then(function(TTId) { // LOAD TTID FROM FIREFOX GET TAB VALUE let tab = Promise.resolve(browser.sessions.getTabValue(tabId, "TTId")).then(function(TTId) { // LOAD TTID FROM FIREFOX GET TAB VALUE
if (TTId != undefined) { if (TTId != undefined) {
tabs[tabId] = {ttid: TTId, parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: "n"}; tabs[tabId] = {ttid: TTId, parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: ""};
} else { } else {
tabs[tabId] = {ttid: "", parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: "n"}; tabs[tabId] = {ttid: "", parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: ""};
} }
// IF ON LAST TAB AND LAST WINDOW, START MATCHING LOADED DATA // IF ON LAST TAB AND LAST WINDOW, START MATCHING LOADED DATA
if (tabId == lastTabId && winId == lastWinId) { if (tabId == lastTabId && winId == lastWinId) {

View File

@ -3,5 +3,7 @@
<head><meta charset="utf-8"/></head> <head><meta charset="utf-8"/></head>
<body></body> <body></body>
<script type="text/javascript" src="../scripts/global.js"></script> <script type="text/javascript" src="../scripts/global.js"></script>
<script type="text/javascript" src="../legacy.js"></script>
<script type="text/javascript" src="../bg_ch.js"></script>
<script type="text/javascript" src="../bg_ff.js"></script> <script type="text/javascript" src="../bg_ff.js"></script>
</html> </html>

View File

@ -15,6 +15,7 @@
"16": "icons/16.png" "16": "icons/16.png"
}, },
"permissions": [ "tabs", "sessions", "<all_urls>", "storage", "bookmarks" ], "permissions": [ "tabs", "sessions", "<all_urls>", "storage", "bookmarks" ],
"sidebar_action": { "sidebar_action": {
"default_icon": { "default_icon": {
"16": "icons/16.png", "16": "icons/16.png",
@ -28,12 +29,6 @@
"browser_action": { "browser_action": {
"default_icon": "icons/24.png" "default_icon": "icons/24.png"
}, },
"commands": {
"_execute_browser_action": {
"suggested_key": { "default": "F2" },
"description": "toggle Tree Tabs"
}
},
"applications": { "applications": {
"gecko": { "gecko": {
"id": "TreeTabs@jagiello.it", "id": "TreeTabs@jagiello.it",
@ -44,5 +39,5 @@
"page": "options.html", "page": "options.html",
"open_in_tab": true "open_in_tab": true
}, },
"version": "1.5" "version": "100"
} }

View File

@ -109,11 +109,20 @@ function SetEvents() {
} }
PinList.onmousedown = function(event) { PinList.onmousedown = function(event) {
if (opt.pin_list_multi_row) {
if (event.which == 1 && event.target == this) { if (event.which == 1 && event.target == this) {
DeselectFolders(); DeselectFolders();
DeselectTabs(); DeselectTabs();
HideMenus(); HideMenus();
} }
} else {
if (event.which == 1 && event.target == this && event.clientY < (this.childNodes[0].getBoundingClientRect().height + this.getBoundingClientRect().top)) {
DeselectFolders();
DeselectTabs();
HideMenus();
}
}
if (event.which == 2 && event.target == this) { if (event.which == 2 && event.target == this) {
ActionClickGroup(this, opt.midclick_group); ActionClickGroup(this, opt.midclick_group);
} }

View File

@ -70,7 +70,7 @@ function AppendGroupToList(groupId, group_name, font_color, SetEvents) {
if (SetEvents) { if (SetEvents) {
grp.onmousedown = function(event) { grp.onmousedown = function(event) {
event.stopImmediatePropagation(); event.stopImmediatePropagation();
if (event.which == 1 && event.target == this) { if (event.which == 1 && event.target == this && event.clientX < (this.childNodes[0].getBoundingClientRect().width + this.getBoundingClientRect().left)) {
DeselectFolders(); DeselectFolders();
DeselectTabs(); DeselectTabs();
HideMenus(); HideMenus();