stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove codes for "replace current one tab".

Browse Source 
Because it was removed on Firefox 8. These codes are already expired.
This commit is contained in:
Piro / YUKI Hiroshi 2014-01-29 01:35:13 +09:00
parent 8596d9dec1
commit 7f3fdb1ab1
21 changed files with 20 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
content/treestyletab/bookmarksOverlay.js
View File

@ -253,7 +253,7 @@ var TreeStyleTabBookmarksService = {
'if (item.uri) { $& }' 'if (item.uri) { $& }'
).replace( ).replace(
/(browserWindow\.(?:getBrowser\(\)|gBrowser)\.loadTabs\([^;]+\);)/, /(browserWindow\.(?:getBrowser\(\)|gBrowser)\.loadTabs\([^;]+\);)/,
'var TSTResult = browserWindow.TreeStyleTabBookmarksService.handleTabsOpenProcess(where, aEvent, browserWindow, ids, urls, typeof replaceCurrentTab == "undefined" ? undefined : replaceCurrentTab, aFolderTitle);\n' + 'var TSTResult = browserWindow.TreeStyleTabBookmarksService.handleTabsOpenProcess(where, aEvent, browserWindow, ids, urls, aFolderTitle);\n' +
'TSTTreeStructure = TSTResult.treeStructure;\n' + 'TSTTreeStructure = TSTResult.treeStructure;\n' +
'TSTPreviousTabs = TSTResult.previousTabs;\n' + 'TSTPreviousTabs = TSTResult.previousTabs;\n' +
'TSTOpenGroupBookmarkBehavior = TSTResult.behavior;\n' + 'TSTOpenGroupBookmarkBehavior = TSTResult.behavior;\n' +
@ -370,7 +370,7 @@ var TreeStyleTabBookmarksService = {
); );
} }
}, },
handleTabsOpenProcess : function TSTBMService_handleTabsOpenProcess(aWhere, aEvent, aBrowserWindow, aIDs, aURLs, aReplaceCurrentTab, aFolderTitle) handleTabsOpenProcess : function TSTBMService_handleTabsOpenProcess(aWhere, aEvent, aBrowserWindow, aIDs, aURLs, aFolderTitle)
{ {
var result = { var result = {
behavior : undefined, behavior : undefined,
@ -432,14 +432,6 @@ var TreeStyleTabBookmarksService = {
else { else {
sv.readyToOpenNewTabGroup(null, treeStructure, result.behavior & sv.kGROUP_BOOKMARK_EXPAND_ALL_TREE); sv.readyToOpenNewTabGroup(null, treeStructure, result.behavior & sv.kGROUP_BOOKMARK_EXPAND_ALL_TREE);
} }
// replaceCurrentTab works only on Firefox 7 or earlier
// See: https://bugzilla.mozilla.org/show_bug.cgi?id=440093
if (typeof aReplaceCurrentTab !== 'undefined')
result.replaceCurrentTab = false;
}
else {
if (typeof aReplaceCurrentTab !== 'undefined')
result.replaceCurrentTab = !!(result.behavior & sv.kGROUP_BOOKMARK_REPLACE);
} }
return result; return result;
}, },

17
content/treestyletab/config.js
View File

@ -36,8 +36,7 @@ function syncEnabledState(aElement, aEnabled)
var gGroupBookmarkRadio, var gGroupBookmarkRadio,
gGroupBookmarkUnderParent, gGroupBookmarkUnderParent,
gGroupBookmarkType, gGroupBookmarkType,
gGroupBookmarkBehaviorPref, gGroupBookmarkBehaviorPref;
gGroupBookmarkReplacePref;
function ensureGroupBookmarkItems() function ensureGroupBookmarkItems()
{ {
@ -47,14 +46,6 @@ function ensureGroupBookmarkItems()
gGroupBookmarkUnderParent = document.getElementById('openGroupBookmark.underParent-check'); gGroupBookmarkUnderParent = document.getElementById('openGroupBookmark.underParent-check');
gGroupBookmarkType = document.getElementById('openGroupBookmark.subtreeType-menulist'); gGroupBookmarkType = document.getElementById('openGroupBookmark.subtreeType-menulist');
gGroupBookmarkBehaviorPref = document.getElementById('extensions.treestyletab.openGroupBookmark.behavior'); gGroupBookmarkBehaviorPref = document.getElementById('extensions.treestyletab.openGroupBookmark.behavior');
var bookmarkReplaceKey = 'browser.tabs.loadFolderAndReplace';
gGroupBookmarkReplacePref = document.getElementById(bookmarkReplaceKey);
try {
gGroupBookmarkReplacePref.value = prefs.getPref(bookmarkReplaceKey);
}
catch(e) {
prefs.setPref(bookmarkReplaceKey, gGroupBookmarkReplacePref.value != 'false');
}
} }
function init() function init()
@ -142,12 +133,6 @@ function initTabPane()
var newTabPref = document.getElementById('extensions.treestyletab.autoAttach.newTabButton-box'); var newTabPref = document.getElementById('extensions.treestyletab.autoAttach.newTabButton-box');
newTabPref.removeAttribute('hidden'); newTabPref.removeAttribute('hidden');
var bookmarkGroupReplacePref = document.getElementById('openGroupBookmark.replace');
if (bookmarkGroupReplacePref.selected) {
document.getElementById('openGroupBookmark.subtree').selected = true;
}
bookmarkGroupReplacePref.setAttribute('hidden', true);
} }
function onSyncGroupBookmarkUIToPref() function onSyncGroupBookmarkUIToPref()

5
content/treestyletab/config.xul
View File

@ -339,9 +339,6 @@
<preference id="extensions.treestyletab.openGroupBookmark.behavior" <preference id="extensions.treestyletab.openGroupBookmark.behavior"
name="extensions.treestyletab.openGroupBookmark.behavior" name="extensions.treestyletab.openGroupBookmark.behavior"
type="int"/> type="int"/>
<preference id="browser.tabs.loadFolderAndReplace"
name="browser.tabs.loadFolderAndReplace.override"
type="bool"/>
<preference id="extensions.treestyletab.dropLinksOnTab.behavior" <preference id="extensions.treestyletab.dropLinksOnTab.behavior"
name="extensions.treestyletab.dropLinksOnTab.behavior" name="extensions.treestyletab.dropLinksOnTab.behavior"
type="int"/> type="int"/>
@ -452,8 +449,6 @@
</vbox> </vbox>
</hbox> </hbox>
<radio value="2" label="&config.openGroupBookmark.flat;"/> <radio value="2" label="&config.openGroupBookmark.flat;"/>
<radio id="openGroupBookmark.replace"
value="4" label="&config.openGroupBookmark.replace;"/>
</radiogroup> </radiogroup>
</vbox> </vbox>
</deck> </deck>

2
content/treestyletab/license.txt
View File

@ -14,7 +14,7 @@ License.
The Original Code is the Tree Style Tab. The Original Code is the Tree Style Tab.
The Initial Developer of the Original Code is YUKI "Piro" Hiroshi. The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
Portions created by the Initial Developer are Copyright (C) 2007-2013 Portions created by the Initial Developer are Copyright (C) 2007-2014
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com> Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>

1
defaults/preferences/treestyletab.js
View File

@ -601,7 +601,6 @@ pref("extensions.treestyletab.restoreTree.level", 1);
* conflict with TST features. They will be rolled back when TST is uninstalled. * conflict with TST features. They will be rolled back when TST is uninstalled.
*/ */
pref("browser.link.open_newwindow.restriction.override", 0); pref("browser.link.open_newwindow.restriction.override", 0);
pref("browser.tabs.loadFolderAndReplace.override", false);
pref("browser.tabs.insertRelatedAfterCurrent.override", false); pref("browser.tabs.insertRelatedAfterCurrent.override", false);
pref("browser.tabs.insertRelatedAfterCurrent.override.force", true); pref("browser.tabs.insertRelatedAfterCurrent.override.force", true);

1
locale/da-DK/treestyletab/treestyletab.dtd
View File

@ -98,7 +98,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorer"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorer">
<!ENTITY config.openGroupBookmark.subtree.type.after "Faners træstruktur gemt i bogmærker"> <!ENTITY config.openGroupBookmark.subtree.type.after "Faners træstruktur gemt i bogmærker">
<!ENTITY config.openGroupBookmark.flat "Åben som faner (Firefox standard)"> <!ENTITY config.openGroupBookmark.flat "Åben som faner (Firefox standard)">
<!ENTITY config.openGroupBookmark.replace "Erstat aktuel fane med siderne i mappen">
<!ENTITY config.openGroupBookmark.underParent "Arranger faner under ny gruppefane"> <!ENTITY config.openGroupBookmark.underParent "Arranger faner under ny gruppefane">
<!ENTITY config.dropLinksOnTab.caption "Droppet link, URL, bogmærke eller fil til eksisterende fane"> <!ENTITY config.dropLinksOnTab.caption "Droppet link, URL, bogmærke eller fil til eksisterende fane">

1
locale/de-DE/treestyletab/treestyletab.dtd
View File

@ -99,7 +99,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Ignoriere"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Ignoriere">
<!ENTITY config.openGroupBookmark.subtree.type.after "Anordnung der Tabs im Zweig beim Speichern als Lesezeichen"> <!ENTITY config.openGroupBookmark.subtree.type.after "Anordnung der Tabs im Zweig beim Speichern als Lesezeichen">
<!ENTITY config.openGroupBookmark.flat "Als eigenständige Tabs öffnen (Firefox Standard)"> <!ENTITY config.openGroupBookmark.flat "Als eigenständige Tabs öffnen (Firefox Standard)">
<!ENTITY config.openGroupBookmark.replace "Aktuelles Tab durch die neuen Tabs ersetzen">
<!ENTITY config.openGroupBookmark.underParent "Seiten zur Gruppierung einem Dummytab unterordnen"> <!ENTITY config.openGroupBookmark.underParent "Seiten zur Gruppierung einem Dummytab unterordnen">
<!ENTITY config.dropLinksOnTab.caption "Verhalten für Drag &amp; Drop auf Tabs"> <!ENTITY config.dropLinksOnTab.caption "Verhalten für Drag &amp; Drop auf Tabs">

2
locale/en-US/treestyletab/license.txt
View File

@ -14,7 +14,7 @@ License.
The Original Code is the Tree Style Tab. The Original Code is the Tree Style Tab.
The Initial Developer of the Original Code is YUKI "Piro" Hiroshi. The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
Portions created by the Initial Developer are Copyright (C) 2007-2012 Portions created by the Initial Developer are Copyright (C) 2007-2014
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com> Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>

1
locale/en-US/treestyletab/treestyletab.dtd
View File

@ -84,7 +84,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Ignore"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Ignore">
<!ENTITY config.openGroupBookmark.subtree.type.after "tree structure of tabs saved to bookmarks"> <!ENTITY config.openGroupBookmark.subtree.type.after "tree structure of tabs saved to bookmarks">
<!ENTITY config.openGroupBookmark.flat "Open as separate tabs (Firefox default)"> <!ENTITY config.openGroupBookmark.flat "Open as separate tabs (Firefox default)">
<!ENTITY config.openGroupBookmark.replace "Replace the current one tab with the pages in the folder">
<!ENTITY config.openGroupBookmark.underParent "Put tabs under a dummy tab for grouping"> <!ENTITY config.openGroupBookmark.underParent "Put tabs under a dummy tab for grouping">
<!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab"> <!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab">

1
locale/es-ES/treestyletab/treestyletab.dtd
View File

@ -87,7 +87,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorar"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorar">
<!ENTITY config.openGroupBookmark.subtree.type.after "Estructura del árbol guardado en marcadores"> <!ENTITY config.openGroupBookmark.subtree.type.after "Estructura del árbol guardado en marcadores">
<!ENTITY config.openGroupBookmark.flat "Abrir como pestañas separadas (Firefox Predeterminado)"> <!ENTITY config.openGroupBookmark.flat "Abrir como pestañas separadas (Firefox Predeterminado)">
<!ENTITY config.openGroupBookmark.replace "Remplazar la pestaña actual con las páginas de la carpeta">
<!ENTITY config.openGroupBookmark.underParent "Agrupar las pestañas bajo una carpeta"> <!ENTITY config.openGroupBookmark.underParent "Agrupar las pestañas bajo una carpeta">
<!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab"> <!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab">

1
locale/fr-FR/treestyletab/treestyletab.dtd
View File

@ -85,7 +85,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorer"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorer">
<!ENTITY config.openGroupBookmark.subtree.type.after "l'arborescence des onglets sauvegardée dans les marque-pages"> <!ENTITY config.openGroupBookmark.subtree.type.after "l'arborescence des onglets sauvegardée dans les marque-pages">
<!ENTITY config.openGroupBookmark.flat "Ouvrir dans des onglets séparés (défaut Firefox)"> <!ENTITY config.openGroupBookmark.flat "Ouvrir dans des onglets séparés (défaut Firefox)">
<!ENTITY config.openGroupBookmark.replace "Remplacer l'onglet actuel par les pages du dossier">
<!ENTITY config.openGroupBookmark.underParent "Mettre les onglets sous un onglet fictif afin de les grouper"> <!ENTITY config.openGroupBookmark.underParent "Mettre les onglets sous un onglet fictif afin de les grouper">
<!ENTITY config.dropLinksOnTab.caption "Action pour les glisser-déposer de liens, URL, marques-pages ou fichiers sur un onglet existant"> <!ENTITY config.dropLinksOnTab.caption "Action pour les glisser-déposer de liens, URL, marques-pages ou fichiers sur un onglet existant">

1
locale/it-IT/treestyletab/treestyletab.dtd
View File

@ -87,7 +87,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Ignore"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Ignore">
<!ENTITY config.openGroupBookmark.subtree.type.after "tree structure of tabs saved to bookmarks"> <!ENTITY config.openGroupBookmark.subtree.type.after "tree structure of tabs saved to bookmarks">
<!ENTITY config.openGroupBookmark.flat "apre i segnalibri in schede separate (comportamento predefinito di Firefox)"> <!ENTITY config.openGroupBookmark.flat "apre i segnalibri in schede separate (comportamento predefinito di Firefox)">
<!ENTITY config.openGroupBookmark.replace "sostituisce la scheda in uso con i segnalibri contenuti nella cartella selezionata">
<!ENTITY config.openGroupBookmark.underParent "Put tabs under a dummy tab for grouping"> <!ENTITY config.openGroupBookmark.underParent "Put tabs under a dummy tab for grouping">
<!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab"> <!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab">

2
locale/ja/treestyletab/license.txt
View File

@ -14,7 +14,7 @@ License.
The Original Code is the Tree Style Tab. The Original Code is the Tree Style Tab.
The Initial Developer of the Original Code is YUKI "Piro" Hiroshi. The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
Portions created by the Initial Developer are Copyright (C) 2007-2012 Portions created by the Initial Developer are Copyright (C) 2007-2014
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com> Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>

1
locale/ja/treestyletab/treestyletab.dtd
View File

@ -85,7 +85,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "無視する"> <!ENTITY config.openGroupBookmark.subtree.type.flat "無視する">
<!ENTITY config.openGroupBookmark.subtree.type.after ""> <!ENTITY config.openGroupBookmark.subtree.type.after "">
<!ENTITY config.openGroupBookmark.flat "ばらばらのタブとして開く（Firefox初期状態）"> <!ENTITY config.openGroupBookmark.flat "ばらばらのタブとして開く（Firefox初期状態）">
<!ENTITY config.openGroupBookmark.replace "現在のタブ1つだけをブックマークの内容で置き換える">
<!ENTITY config.openGroupBookmark.underParent "グループ化用のダミーのタブを親にする"> <!ENTITY config.openGroupBookmark.underParent "グループ化用のダミーのタブを親にする">
<!ENTITY config.dropLinksOnTab.caption "タブにドラッグ＆ドロップされたリンク、URL、ブックマーク、ファイルなど"> <!ENTITY config.dropLinksOnTab.caption "タブにドラッグ＆ドロップされたリンク、URL、ブックマーク、ファイルなど">

1
locale/pl/treestyletab/treestyletab.dtd
View File

@ -87,7 +87,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Zignoruj"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Zignoruj">
<!ENTITY config.openGroupBookmark.subtree.type.after "strukturę drzewiastą kart zapisanych jako zakładki"> <!ENTITY config.openGroupBookmark.subtree.type.after "strukturę drzewiastą kart zapisanych jako zakładki">
<!ENTITY config.openGroupBookmark.flat "Otwieraj jako osobne karty (domyślnie działanie Firefoksa)"> <!ENTITY config.openGroupBookmark.flat "Otwieraj jako osobne karty (domyślnie działanie Firefoksa)">
<!ENTITY config.openGroupBookmark.replace "Zastępuj aktywną kartę stronami z folderu">
<!ENTITY config.openGroupBookmark.underParent "Umieszczaj karty pod pustą kartą dla lepszego grupowania"> <!ENTITY config.openGroupBookmark.underParent "Umieszczaj karty pod pustą kartą dla lepszego grupowania">
<!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab"> <!ENTITY config.dropLinksOnTab.caption "Dropped link, URL, bookmark or file to existing tab">

1
locale/ru/treestyletab/treestyletab.dtd
View File

@ -85,7 +85,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Игнорировать"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Игнорировать">
<!ENTITY config.openGroupBookmark.subtree.type.after "структуру дерева вкладок, сохраненную в закладках"> <!ENTITY config.openGroupBookmark.subtree.type.after "структуру дерева вкладок, сохраненную в закладках">
<!ENTITY config.openGroupBookmark.flat "Открывать как раздельные вкладки (по умолчанию в Firefox)"> <!ENTITY config.openGroupBookmark.flat "Открывать как раздельные вкладки (по умолчанию в Firefox)">
<!ENTITY config.openGroupBookmark.replace "Открывать с заменой текущей вкладки">
<!ENTITY config.openGroupBookmark.underParent "Поместить вкладки в «титульную» родительскую вкладку"> <!ENTITY config.openGroupBookmark.underParent "Поместить вкладки в «титульную» родительскую вкладку">
<!ENTITY config.dropLinksOnTab.caption "При перетаскивании ссылки, закладки или файла на существующую вкладку"> <!ENTITY config.dropLinksOnTab.caption "При перетаскивании ссылки, закладки или файла на существующую вкладку">

1
locale/sv-SE/treestyletab/treestyletab.dtd
View File

@ -97,7 +97,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorera"> <!ENTITY config.openGroupBookmark.subtree.type.flat "Ignorera">
<!ENTITY config.openGroupBookmark.subtree.type.after "trädstrukturen för flikar som sparats till bokmärken"> <!ENTITY config.openGroupBookmark.subtree.type.after "trädstrukturen för flikar som sparats till bokmärken">
<!ENTITY config.openGroupBookmark.flat "Öppna som separata flikar (standard i Firefox)"> <!ENTITY config.openGroupBookmark.flat "Öppna som separata flikar (standard i Firefox)">
<!ENTITY config.openGroupBookmark.replace "Ersätt den aktuella fliken med sidorna i mappen">
<!ENTITY config.openGroupBookmark.underParent "Placera flikar under en tillfällig flik för gruppering"> <!ENTITY config.openGroupBookmark.underParent "Placera flikar under en tillfällig flik för gruppering">
<!ENTITY config.dropLinksOnTab.caption "När länk, URL, bokmärke eller fil släpps på befintlig flik"> <!ENTITY config.dropLinksOnTab.caption "När länk, URL, bokmärke eller fil släpps på befintlig flik">

1
locale/zh-CN/treestyletab/treestyletab.dtd
View File

@ -97,7 +97,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "忽略"> <!ENTITY config.openGroupBookmark.subtree.type.flat "忽略">
<!ENTITY config.openGroupBookmark.subtree.type.after "保存到书签时的树状结构"> <!ENTITY config.openGroupBookmark.subtree.type.after "保存到书签时的树状结构">
<!ENTITY config.openGroupBookmark.flat "在单独标签中平行打开（Firefox 默认）"> <!ENTITY config.openGroupBookmark.flat "在单独标签中平行打开（Firefox 默认）">
<!ENTITY config.openGroupBookmark.replace "覆盖当前标签打开">
<!ENTITY config.openGroupBookmark.underParent "将标签置于一伪标签下以便分组"> <!ENTITY config.openGroupBookmark.underParent "将标签置于一伪标签下以便分组">
<!ENTITY config.dropLinksOnTab.caption "如何打开拖拽到现有标签的链接、网址、书签或文件？"> <!ENTITY config.dropLinksOnTab.caption "如何打开拖拽到现有标签的链接、网址、书签或文件？">

1
locale/zh-TW/treestyletab/treestyletab.dtd
View File

@ -85,7 +85,6 @@
<!ENTITY config.openGroupBookmark.subtree.type.flat "忽略"> <!ENTITY config.openGroupBookmark.subtree.type.flat "忽略">
<!ENTITY config.openGroupBookmark.subtree.type.after "樹狀結構"> <!ENTITY config.openGroupBookmark.subtree.type.after "樹狀結構">
<!ENTITY config.openGroupBookmark.flat "以各自的分頁開啟（Firefox 預設）"> <!ENTITY config.openGroupBookmark.flat "以各自的分頁開啟（Firefox 預設）">
<!ENTITY config.openGroupBookmark.replace "將目前瀏覽的分頁取代為書籤的內容">
<!ENTITY config.openGroupBookmark.underParent "開啟於一個分組用的父分頁下"> <!ENTITY config.openGroupBookmark.underParent "開啟於一個分組用的父分頁下">
<!ENTITY config.dropLinksOnTab.caption "拖曳鏈結、URL 或書籤到現存分頁時"> <!ENTITY config.dropLinksOnTab.caption "拖曳鏈結、URL 或書籤到現存分頁時">

17
modules/base.js
View File

@ -14,7 +14,7 @@
* The Original Code is the Tree Style Tab. * The Original Code is the Tree Style Tab.
* *
* The Initial Developer of the Original Code is YUKI "Piro" Hiroshi. * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
* Portions created by the Initial Developer are Copyright (C) 2010-2013 * Portions created by the Initial Developer are Copyright (C) 2010-2014
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com> * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
@ -135,7 +135,6 @@ var TreeStyleTabBase = {
this.onPrefChange('extensions.treestyletab.indent.vertical'); this.onPrefChange('extensions.treestyletab.indent.vertical');
this.onPrefChange('extensions.treestyletab.indent.horizontal'); this.onPrefChange('extensions.treestyletab.indent.horizontal');
this.onPrefChange('extensions.treestyletab.clickOnIndentSpaces.enabled'); this.onPrefChange('extensions.treestyletab.clickOnIndentSpaces.enabled');
this.onPrefChange('browser.tabs.loadFolderAndReplace.override');
this.onPrefChange('browser.tabs.insertRelatedAfterCurrent.override'); this.onPrefChange('browser.tabs.insertRelatedAfterCurrent.override');
this.onPrefChange('extensions.stm.tabBarMultiRows.override'); // Super Tab Mode this.onPrefChange('extensions.stm.tabBarMultiRows.override'); // Super Tab Mode
this.onPrefChange('extensions.treestyletab.tabbar.scroll.smooth'); this.onPrefChange('extensions.treestyletab.tabbar.scroll.smooth');
@ -187,7 +186,6 @@ var TreeStyleTabBase = {
prefs.removePrefListener(this); prefs.removePrefListener(this);
let restorePrefs = [ let restorePrefs = [
'browser.tabs.loadFolderAndReplace',
'browser.tabs.insertRelatedAfterCurrent', 'browser.tabs.insertRelatedAfterCurrent',
'extensions.stm.tabBarMultiRows' // Super Tab Mode 'extensions.stm.tabBarMultiRows' // Super Tab Mode
]; ];
@ -396,11 +394,10 @@ var TreeStyleTabBase = {
utils.treeBundle.getString('openGroupBookmarkBehavior.title'), utils.treeBundle.getString('openGroupBookmarkBehavior.title'),
utils.treeBundle.getString('openGroupBookmarkBehavior.text'), utils.treeBundle.getString('openGroupBookmarkBehavior.text'),
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0) + (Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0) +
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1) + (Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1),
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_2),
utils.treeBundle.getString('openGroupBookmarkBehavior.subTree'), utils.treeBundle.getString('openGroupBookmarkBehavior.subTree'),
utils.treeBundle.getString('openGroupBookmarkBehavior.separate'), utils.treeBundle.getString('openGroupBookmarkBehavior.separate'),
utils.treeBundle.getString('openGroupBookmarkBehavior.replace'), null,
utils.treeBundle.getString('openGroupBookmarkBehavior.never'), utils.treeBundle.getString('openGroupBookmarkBehavior.never'),
checked checked
); );
@ -409,14 +406,12 @@ var TreeStyleTabBase = {
button = 1; button = 1;
var behaviors = [ var behaviors = [
this.kGROUP_BOOKMARK_SUBTREE | dummyTabFlag, this.kGROUP_BOOKMARK_SUBTREE | dummyTabFlag,
this.kGROUP_BOOKMARK_SEPARATE, this.kGROUP_BOOKMARK_SEPARATE
this.kGROUP_BOOKMARK_REPLACE
]; ];
behavior = behaviors[button]; behavior = behaviors[button];
if (checked.value) { if (checked.value) {
utils.setTreePref('openGroupBookmark.behavior', behavior); utils.setTreePref('openGroupBookmark.behavior', behavior);
prefs.setPref('browser.tabs.loadFolderAndReplace', !!(behavior & this.kGROUP_BOOKMARK_REPLACE));
} }
return behavior; return behavior;
}, },
@ -424,7 +419,6 @@ var TreeStyleTabBase = {
kGROUP_BOOKMARK_FIXED : 1 + 2 + 4, kGROUP_BOOKMARK_FIXED : 1 + 2 + 4,
kGROUP_BOOKMARK_SUBTREE : 1, kGROUP_BOOKMARK_SUBTREE : 1,
kGROUP_BOOKMARK_SEPARATE : 2, kGROUP_BOOKMARK_SEPARATE : 2,
kGROUP_BOOKMARK_REPLACE : 4,
kGROUP_BOOKMARK_USE_DUMMY : 256, kGROUP_BOOKMARK_USE_DUMMY : 256,
kGROUP_BOOKMARK_USE_DUMMY_FORCE : 1024, kGROUP_BOOKMARK_USE_DUMMY_FORCE : 1024,
kGROUP_BOOKMARK_DONT_RESTORE_TREE_STRUCTURE : 512, kGROUP_BOOKMARK_DONT_RESTORE_TREE_STRUCTURE : 512,
@ -2429,7 +2423,6 @@ var TreeStyleTabBase = {
domains : [ domains : [
'extensions.treestyletab.', 'extensions.treestyletab.',
'browser.tabs.animate', 'browser.tabs.animate',
'browser.tabs.loadFolderAndReplace',
'browser.tabs.insertRelatedAfterCurrent', 'browser.tabs.insertRelatedAfterCurrent',
'extensions.stm.tabBarMultiRows' // Super Tab Mode 'extensions.stm.tabBarMultiRows' // Super Tab Mode
], ],
@ -2463,14 +2456,12 @@ var TreeStyleTabBase = {
return this.updateTabWidthPrefs(aPrefName); return this.updateTabWidthPrefs(aPrefName);
case 'browser.tabs.insertRelatedAfterCurrent': case 'browser.tabs.insertRelatedAfterCurrent':
case 'browser.tabs.loadFolderAndReplace':
case 'extensions.stm.tabBarMultiRows': // Super Tab Mode case 'extensions.stm.tabBarMultiRows': // Super Tab Mode
if (this.prefOverriding) if (this.prefOverriding)
return; return;
aPrefName += '.override'; aPrefName += '.override';
prefs.setPref(aPrefName, value); prefs.setPref(aPrefName, value);
case 'browser.tabs.insertRelatedAfterCurrent.override': case 'browser.tabs.insertRelatedAfterCurrent.override':
case 'browser.tabs.loadFolderAndReplace.override':
case 'extensions.stm.tabBarMultiRows.override': // Super Tab Mode case 'extensions.stm.tabBarMultiRows.override': // Super Tab Mode
if (prefs.getPref(aPrefName+'.force')) { if (prefs.getPref(aPrefName+'.force')) {
let defaultValue = prefs.getDefaultPref(aPrefName); let defaultValue = prefs.getDefaultPref(aPrefName);

15
modules/utils.js
View File

@ -14,7 +14,7 @@
* The Original Code is the Tree Style Tab. * The Original Code is the Tree Style Tab.
* *
* The Initial Developer of the Original Code is YUKI "Piro" Hiroshi. * The Initial Developer of the Original Code is YUKI "Piro" Hiroshi.
* Portions created by the Initial Developer are Copyright (C) 2010-2013 * Portions created by the Initial Developer are Copyright (C) 2010-2014
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com> * Contributor(s): YUKI "Piro" Hiroshi <piro.outsider.reflex@gmail.com>
@ -64,7 +64,7 @@ XPCOMUtils.defineLazyModuleGetter(this, 'TreeStyleTabConstants',
'resource://treestyletab-modules/constants.js', 'TreeStyleTabConstants'); 'resource://treestyletab-modules/constants.js', 'TreeStyleTabConstants');
const TST_PREF_PREFIX = 'extensions.treestyletab.'; const TST_PREF_PREFIX = 'extensions.treestyletab.';
const TST_PREF_VERSION = 9; const TST_PREF_VERSION = 10;
let TreeStyleTabUtils = { let TreeStyleTabUtils = {
@ -133,8 +133,6 @@ let TreeStyleTabUtils = {
behavior += ( behavior += (
this.getTreePref('openGroupBookmarkAsTabSubTree') ? this.getTreePref('openGroupBookmarkAsTabSubTree') ?
TreeStyleTabConstants.kGROUP_BOOKMARK_SUBTREE : TreeStyleTabConstants.kGROUP_BOOKMARK_SUBTREE :
this.getTreePref('browser.tabs.loadFolderAndReplace') ?
TreeStyleTabConstants.kGROUP_BOOKMARK_REPLACE :
TreeStyleTabConstants.kGROUP_BOOKMARK_SEPARATE TreeStyleTabConstants.kGROUP_BOOKMARK_SEPARATE
); );
} }
@ -142,7 +140,6 @@ let TreeStyleTabUtils = {
this.clearTreePref('openGroupBookmarkBehavior.confirm'); this.clearTreePref('openGroupBookmarkBehavior.confirm');
this.clearTreePref('openGroupBookmarkAsTabSubTree'); this.clearTreePref('openGroupBookmarkAsTabSubTree');
this.clearTreePref('openGroupBookmarkAsTabSubTree.underParent'); this.clearTreePref('openGroupBookmarkAsTabSubTree.underParent');
prefs.setPref('browser.tabs.loadFolderAndReplace', !!(behavior & TreeStyleTabConstants.kGROUP_BOOKMARK_REPLACE));
} }
case 4: case 4:
let (subTreePrefs = [ let (subTreePrefs = [
@ -202,6 +199,14 @@ let TreeStyleTabUtils = {
'extensions.treestyletab.indent', 'extensions.treestyletab.indent',
'extensions.treestyletab.indent.min' 'extensions.treestyletab.indent.min'
]); ]);
case 9:
let (behavior = this.getTreePref('openGroupBookmark.behavior')) {
if (behavior & 4) {
behavior ^= 4;
behavior |= 1;
this.setTreePref('openGroupBookmark.behavior', behavior);
}
}
default: default:
for (let i = 0, maxi = orientalPrefs.length; i < maxi; i++) for (let i = 0, maxi = orientalPrefs.length; i < maxi; i++)
{ {