Skip to content

Commit

Permalink
Merge branch 'cleanup' into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	chrome/content/preferences.xul
	chrome/content/tabutils.js
	chrome/content/tabutils.xul
	defaults/preferences/prefs.js
  • Loading branch information
@ithinc
ithinc committed Feb 22, 2014
2 parents d1d2529 + 97d788b commit 02abaa4
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 48 deletions.
31 changes: 16 additions & 15 deletions chrome/content/preferences.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<preference id="loadBookmarksInBackground" name="browser.tabs.loadBookmarksInBackground" type="bool" inverted="true"/>
<preference id="loadDivertedInBackground" name="browser.tabs.loadDivertedInBackground" type="bool" inverted="true"/>
<preference id="loadInBackground" name="browser.tabs.loadInBackground" type="bool" inverted="true"/>
<preference id="maxTabsUndo" name="browser.sessionstore.max_tabs_undo" type="int" suggest="15"/>
<preference id="maxTabsUndo" name="browser.sessionstore.max_tabs_undo" type="int" suggest="20"/>
<preference id="userDefinedURL" name="browser.newtab.url" type="string"/>
</preferences>

Expand Down Expand Up @@ -321,8 +321,8 @@
<preference id="middleClickTab" name="extensions.tabutils.middleClickTab" type="int"/>
<preference id="rightClickTab" name="extensions.tabutils.rightClickTab" type="int"/>
<preference id="dblClickTab" name="extensions.tabutils.dblClickTab" type="int"/>
<preference id="altClickTab" name="extensions.tabutils.altClickTab" type="int" suggest="21"/>
<preference id="ctrlClickTab" name="extensions.tabutils.ctrlClickTab" type="int" suggest="31" onchange="mouseReleaseSelect();"/>
<preference id="altClickTab" name="extensions.tabutils.altClickTab" type="int"/>
<preference id="shiftClickTab" name="extensions.tabutils.shiftClickTab" type="int" suggest="32" onchange="mouseReleaseSelect();"/>
<preference id="ctrlShiftClickTab" name="extensions.tabutils.ctrlShiftClickTab" type="int" suggest="33" onchange="mouseReleaseSelect();"/>

Expand Down Expand Up @@ -522,38 +522,38 @@
<preference id="context_duplicateTab" name="extensions.tabutils.menu.context_duplicateTab" type="bool" suggest="true"/>
<preference id="context_reloadEvery" name="extensions.tabutils.menu.context_reloadEvery" type="bool" suggest="true"/>
<preference id="context_moveToWindow" name="extensions.tabutils.menu.context_moveToWindow" type="bool" suggest="true"/>
<preference id="context_mergeWindow" name="extensions.tabutils.menu.context_mergeWindow" type="bool" suggest="true"/>
<preference id="context_mergeGroup" name="extensions.tabutils.menu.context_mergeGroup" type="bool" suggest="true"/>
<preference id="context_mergeWindow" name="extensions.tabutils.menu.context_mergeWindow" type="bool"/>
<preference id="context_mergeGroup" name="extensions.tabutils.menu.context_mergeGroup" type="bool"/>
<preference id="context_bookmarkTab" name="extensions.tabutils.menu.context_bookmarkTab" type="bool"/>
<preference id="context_recentlyClosedTabs" name="extensions.tabutils.menu.context_recentlyClosedTabs" type="bool" suggest="true"/>
<preference id="context_readTab" name="extensions.tabutils.menu.context_readTab" type="bool"/>
<preference id="context_protectTab" name="extensions.tabutils.menu.context_protectTab" type="bool" suggest="true"/>
<preference id="context_lockTab" name="extensions.tabutils.menu.context_lockTab" type="bool" suggest="true"/>
<preference id="context_faviconizeTab" name="extensions.tabutils.menu.context_faviconizeTab" type="bool" suggest="true"/>
<preference id="context_faviconizeTab" name="extensions.tabutils.menu.context_faviconizeTab" type="bool"/>
<preference id="context_renameTab" name="extensions.tabutils.menu.context_renameTab" type="bool"/>
<preference id="context_restartTab" name="extensions.tabutils.menu.context_restartTab" type="bool" suggest="true"/>
<preference id="context_copyTabURL" name="extensions.tabutils.menu.context_copyTabURL" type="bool"/>
<preference id="context_copyTitleAndURL" name="extensions.tabutils.menu.context_copyTitleAndURL" type="bool" suggest="true"/>
<preference id="context_closeLeftTabs" name="extensions.tabutils.menu.context_closeLeftTabs" type="bool"/>
<preference id="context_closeRightTabs" name="extensions.tabutils.menu.context_closeRightTabs" type="bool"/>
<preference id="context_closeRightTabs" name="extensions.tabutils.menu.context_closeRightTabs" type="bool" suggest="false"/>
<preference id="context_closeOtherTabs" name="extensions.tabutils.menu.context_closeOtherTabs" type="bool"/>
<preference id="context_closeDuplicateTabs" name="extensions.tabutils.menu.context_closeDuplicateTabs" type="bool"/>
<preference id="context_closeSimilarTabs" name="extensions.tabutils.menu.context_closeSimilarTabs" type="bool" suggest="true"/>
<preference id="context_closeSimilarTabs" name="extensions.tabutils.menu.context_closeSimilarTabs" type="bool"/>
<preference id="context_markTab" name="extensions.tabutils.menu.context_markTab" type="bool" suggest="true"/>
<preference id="context_markTabs" name="extensions.tabutils.menu.context_markTabs" type="bool" suggest="true"/>
<preference id="context_selectTabs" name="extensions.tabutils.menu.context_selectTabs" type="bool"/>
<preference id="context_selectSimilarTabs" name="extensions.tabutils.menu.context_selectSimilarTabs" type="bool"/>
<preference id="context_selectAllTabs" name="extensions.tabutils.menu.context_selectAllTabs" type="bool"/>
<preference id="context_unselectAllTabs" name="extensions.tabutils.menu.context_unselectAllTabs" type="bool"/>
<preference id="context_invertSelection" name="extensions.tabutils.menu.context_invertSelection" type="bool"/>
<preference id="context_showAllTabs" name="extensions.tabutils.menu.context_showAllTabs" type="bool" suggest="true"/>
<preference id="context_showAllTabs" name="extensions.tabutils.menu.context_showAllTabs" type="bool"/>
<preference id="context_readAllTabs" name="extensions.tabutils.menu.context_readAllTabs" type="bool"/>
<preference id="context_protectAllTabs" name="extensions.tabutils.menu.context_protectAllTabs" type="bool" suggest="true"/>
<preference id="context_lockAllTabs" name="extensions.tabutils.menu.context_lockAllTabs" type="bool" suggest="true"/>
<preference id="context_faviconizeAllTabs" name="extensions.tabutils.menu.context_faviconizeAllTabs" type="bool" suggest="true"/>
<preference id="context_faviconizeAllTabs" name="extensions.tabutils.menu.context_faviconizeAllTabs" type="bool"/>
<preference id="context_restartAllTabs" name="extensions.tabutils.menu.context_restartAllTabs" type="bool" suggest="true"/>
<preference id="context_closeAllTabs" name="extensions.tabutils.menu.context_closeAllTabs" type="bool" suggest="true"/>
<preference id="context_closeAllDuplicateTabs" name="extensions.tabutils.menu.context_closeAllDuplicateTabs" type="bool" suggest="true"/>
<preference id="context_selectAllTabs" name="extensions.tabutils.menu.context_selectAllTabs" type="bool"/>
<preference id="context_unselectAllTabs" name="extensions.tabutils.menu.context_unselectAllTabs" type="bool"/>
<preference id="context_invertSelection" name="extensions.tabutils.menu.context_invertSelection" type="bool"/>

<preference id="statusbarMode" name="extensions.tabutils.statusbarMode" type="int"/>
<preference id="hideOpenInTab" name="extensions.tabutils.hideOpenInTab" type="bool"/>
Expand Down Expand Up @@ -752,9 +752,6 @@
<checkbox preference="context_markTabs" label="&markTabs.label;"/>
<checkbox preference="context_selectTabs" label="&selectTabs.label;"/>
<checkbox preference="context_selectSimilarTabs" label="&selectSimilarTabs.label;"/>
<checkbox preference="context_selectAllTabs" label="&selectAllTabs.label;"/>
<checkbox preference="context_unselectAllTabs" label="&unselectAllTabs.label;"/>
<checkbox preference="context_invertSelection" label="&invertSelection.label;"/>
</vbox>
</groupbox>
<vbox flex="1">
Expand All @@ -770,6 +767,10 @@
<separator class="groove"/>
<checkbox preference="context_closeAllTabs" label="&closeAllTabs.label;"/>
<checkbox preference="context_closeAllDuplicateTabs" label="&closeAllDuplicateTabs.label;"/>
<separator class="groove"/>
<checkbox preference="context_selectAllTabs" label="&selectAllTabs.label;"/>
<checkbox preference="context_unselectAllTabs" label="&unselectAllTabs.label;"/>
<checkbox preference="context_invertSelection" label="&invertSelection.label;"/>
</groupbox>
</vbox>
</tabpanel>
Expand Down
18 changes: 10 additions & 8 deletions chrome/content/tabutils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2595,13 +2595,17 @@ tabutils._tabContextMenu = function() {
item.setAttribute("disabled", gBrowser[aMethod](tabs).length == 0);
});

var selectedTabs = gBrowser.selectedTabs;
$("context_stackTab").setAttribute("disabled", selectedTabs.length <= 1);
$("context_stackTab").setAttribute("disabled", gBrowser.selectedTabs.length <= 1);
$("context_markTab").setAttribute("checked", gBrowser.mContextTab.hasAttribute("multiselected"));
$("context_markTabs").setAttribute("checked", gBrowser.mContextTab.hasAttribute("multiselected"));
$("context_unselectAllTabs").setAttribute("disabled", selectedTabs.length == 0);

$("context_openTabInWindow").hidden = !$("context_moveToWindow").collapsed;
$("context_mergeWindow").setAttribute("disabled", Services.wm.getZOrderDOMWindowEnumerator("navigator:browser", false).getNext() == window);

if (!("TabView" in window)) // Compat. with Pale Moon
$("context_tabViewMenu").hidden = true;

$("context_mergeGroup").hidden = $("context_tabViewMenu").hidden;
$("context_mergeGroup").setAttribute("disabled", !Array.some(gBrowser.mTabs, function(aTab) aTab.hidden));
}, false);

Expand All @@ -2627,11 +2631,8 @@ tabutils._tabContextMenu = function() {

// Panorama enhancements
tabutils._tabView = function() {
if (!("TabView" in window)) {
TU_setPref("extensions.tabutils.menu.context_tabViewMenu", false);
TU_setPref("extensions.tabutils.menu.context_mergeGroup", false);
if (!("TabView" in window))
return;
}

TabView.populateGroupMenu = function(aPopup, aExcludeEmpty) {
while (aPopup.lastChild && aPopup.lastChild.localName != "menuseparator")
Expand Down Expand Up @@ -2763,9 +2764,10 @@ tabutils._allTabsPopup = function() {
item.setAttribute("disabled", tabs.every(function(aTab) !aTab.hasAttribute("faviconized")));
}

$("context_restartAllTabs").setAttribute("disabled", $("context_lockAllTabs").getAttribute("checked") == "true");
$("context_closeAllTabs").setAttribute("disabled", $("context_protectAllTabs").getAttribute("checked") == "true");
$("context_closeAllDuplicateTabs").setAttribute("disabled", $("context_protectAllTabs").getAttribute("checked") == "true");
$("context_restartAllTabs").setAttribute("disabled", $("context_lockAllTabs").getAttribute("checked") == "true");
$("context_unselectAllTabs").setAttribute("disabled", gBrowser.selectedTabs.length == 0);
}, true);

function $() {return document.getElementById.apply(document, arguments);}
Expand Down
25 changes: 10 additions & 15 deletions chrome/content/tabutils.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,21 +365,6 @@
accesskey="&selectSimilarTabs.accesskey;"
multiselected="any"
oncommand="gBrowser.selectedTabs = gBrowser.similarTabsOf(gBrowser.mContextTabs);event.stopPropagation();"/>
<menuitem id="context_selectAllTabs"
label="&selectAllTabs.label;"
accesskey="&selectAllTabs.accesskey;"
multiselected="any"
oncommand="gBrowser.selectedTabs = gBrowser.allTabs;event.stopPropagation();"/>
<menuitem id="context_unselectAllTabs"
label="&unselectAllTabs.label;"
accesskey="&unselectAllTabs.accesskey;"
multiselected="any"
oncommand="gBrowser.selectedTabs = [];event.stopPropagation();"/>
<menuitem id="context_invertSelection"
label="&invertSelection.label;"
accesskey="&invertSelection.accesskey;"
multiselected="any"
oncommand="gBrowser.selectedTabs = gBrowser.otherTabsOf(gBrowser.selectedTabs);event.stopPropagation();"/>
</menupopup>

<menupopup id="alltabs-popup"
Expand Down Expand Up @@ -417,6 +402,16 @@
label="&closeAllDuplicateTabs.label;"
oncommand="gBrowser.closeAllDuplicateTabs();"/>
<menuseparator/>
<menuitem id="context_selectAllTabs"
label="&selectAllTabs.label;"
oncommand="gBrowser.selectedTabs = gBrowser.allTabs;"/>
<menuitem id="context_unselectAllTabs"
label="&unselectAllTabs.label;"
oncommand="gBrowser.selectedTabs = [];"/>
<menuitem id="context_invertSelection"
label="&invertSelection.label;"
oncommand="gBrowser.selectedTabs = gBrowser.otherTabsOf(gBrowser.selectedTabs);"/>
<menuseparator/>
</menupopup>

<menupopup id="menu_ToolsPopup">
Expand Down
19 changes: 9 additions & 10 deletions defaults/preferences/prefs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ pref("extensions.tabutils.dblClickTab", 4);
pref("extensions.tabutils.ctrlClickTab", 0);
pref("extensions.tabutils.altClickTab", 0);
pref("extensions.tabutils.shiftClickTab", 0);
pref("extensions.tabutils.ctrlShiftClickTab", 0);
pref("extensions.tabutils.ctrlAltClickTab", 23);
pref("extensions.tabutils.ctrlShiftClickTab", 33);

pref("extensions.tabutils.leftClickTabBar", 0);
pref("extensions.tabutils.middleClickTabBar", 5);
Expand Down Expand Up @@ -108,13 +109,11 @@ pref("extensions.tabutils.hideLoadInBackground", false);
pref("extensions.tabutils.hideLoadInForeground", true);

pref("extensions.tabutils.menu.menu_tuOptions", true);
pref("extensions.tabutils.menu.context_newTab", true);
pref("extensions.tabutils.menu.context_duplicateTab", true);
pref("extensions.tabutils.menu.context_newTab", false);
pref("extensions.tabutils.menu.context_duplicateTab", false);
pref("extensions.tabutils.menu.context_reloadEvery", false);
pref("extensions.tabutils.menu.context_openTabInWindow", false);
pref("extensions.tabutils.menu.context_moveToWindow", false);
pref("extensions.tabutils.menu.context_mergeWindow", false);
pref("extensions.tabutils.menu.context_tabViewMenu", true);
pref("extensions.tabutils.menu.context_mergeGroup", false);
pref("extensions.tabutils.menu.context_bookmarkTab", false);
pref("extensions.tabutils.menu.context_recentlyClosedTabs", true);
Expand All @@ -128,7 +127,7 @@ pref("extensions.tabutils.menu.context_copyTabURL", false);
pref("extensions.tabutils.menu.context_copyTitleAndURL", false);
pref("extensions.tabutils.menu.context_copyTitleAndURL.format", '[["Plain Text", "%T - %U"], ["HTML Link", "<a href=\\"%U\\">%T</a>"], [], ["BB Code", "[url=%U]%T[/url]"], ["Markdown", "[%T](%U)"], ["Wikipedia", "[%U %T]"]]');
pref("extensions.tabutils.menu.context_closeLeftTabs", false);
pref("extensions.tabutils.menu.context_closeRightTabs", false);
pref("extensions.tabutils.menu.context_closeRightTabs", true);
pref("extensions.tabutils.menu.context_closeTabsToTheEnd", false);
pref("extensions.tabutils.menu.context_closeOtherTabs", true);
pref("extensions.tabutils.menu.context_closeOtherTabs.insertafter", "context_closeRightTabs");
Expand All @@ -138,9 +137,6 @@ pref("extensions.tabutils.menu.context_markTab", false);
pref("extensions.tabutils.menu.context_markTabs", false);
pref("extensions.tabutils.menu.context_selectTabs", false);
pref("extensions.tabutils.menu.context_selectSimilarTabs", false);
pref("extensions.tabutils.menu.context_selectAllTabs", false);
pref("extensions.tabutils.menu.context_unselectAllTabs", false);
pref("extensions.tabutils.menu.context_invertSelection", false);
pref("extensions.tabutils.menu.context_showAllTabs", false);
pref("extensions.tabutils.menu.context_readAllTabs", false);
pref("extensions.tabutils.menu.context_protectAllTabs", false);
Expand All @@ -149,6 +145,9 @@ pref("extensions.tabutils.menu.context_faviconizeAllTabs", false);
pref("extensions.tabutils.menu.context_restartAllTabs", false);
pref("extensions.tabutils.menu.context_closeAllTabs", false);
pref("extensions.tabutils.menu.context_closeAllDuplicateTabs", false);
pref("extensions.tabutils.menu.context_selectAllTabs", false);
pref("extensions.tabutils.menu.context_unselectAllTabs", false);
pref("extensions.tabutils.menu.context_invertSelection", false);

pref("extensions.tabutils.menu.context_template", false);
pref("extensions.tabutils.menu.context_template.label", "");
Expand Down Expand Up @@ -241,7 +240,7 @@ pref("extensions.tabutils.reloadInterval", 300);
pref("extensions.tabutils.restartAfter", 0);

//Tab Stack
pref("extensions.tabutils.autoStack", false);
pref("extensions.tabutils.autoStack", true);
pref("extensions.tabutils.autoExpandStackOnDragover", false);
pref("extensions.tabutils.autoExpandStackAndCollapseOthersOnSelect", true);
pref("extensions.tabutils.autoCollapseStackOnBlur", false);
Expand Down

0 comments on commit 02abaa4

Please sign in to comment.