Skip to content

Commit 0df7ad6

Browse files
ithincithinc
committed
Merge branch 'nightly'
2 parents 2900916 + 814e208 commit 0df7ad6

File tree

4 files changed

+22
-24
lines changed

4 files changed

+22
-24
lines changed

‎chrome/content/preferences.xul

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@
489489
<preference id="highlightCurrent" name="extensions.tabutils.highlightCurrent" type="bool" onchange="onHighlightEnabled('Current');" suggest="true"/>
490490
<preference id="highlightUnread" name="extensions.tabutils.highlightUnread" type="bool" onchange="onHighlightEnabled('Unread');" suggest="true"/>
491491
<preference id="highlightRead" name="extensions.tabutils.highlightRead" type="bool" onchange="onHighlightEnabled('Read');"/>
492-
<preference id="highlightUnloaded" name="extensions.tabutils.highlightUnloaded" type="bool" onchange="onHighlightEnabled('Unloaded');" suggest="true"/>
492+
<preference id="highlightUnloaded" name="extensions.tabutils.highlightUnloaded" type="bool" onchange="onHighlightEnabled('Unloaded');"/>
493493
<preference id="highlightSelected" name="extensions.tabutils.highlightSelected" type="bool" onchange="onHighlightEnabled('Selected');"/>
494494
<preference id="styleCurrent" name="extensions.tabutils.styles.current" type="string" onchange="onHighlightStyle('Current');"/>
495495
<preference id="styleUnread" name="extensions.tabutils.styles.unread" type="string" onchange="onHighlightStyle('Unread');"/>
@@ -504,8 +504,8 @@
504504
<preference id="tabMinHeight" name="browser.tabs.tabMinHeight" type="int"/>
505505

506506
<preference id="menu_tuOptions" name="extensions.tabutils.menu.menu_tuOptions" type="bool" suggest="true"/>
507-
<preference id="context_newTab" name="extensions.tabutils.menu.context_newTab" type="bool" suggest="true"/>
508-
<preference id="context_duplicateTab" name="extensions.tabutils.menu.context_duplicateTab" type="bool" suggest="true"/>
507+
<preference id="context_newTab" name="extensions.tabutils.menu.context_newTab" type="bool"/>
508+
<preference id="context_duplicateTab" name="extensions.tabutils.menu.context_duplicateTab" type="bool"/>
509509
<preference id="context_reloadEvery" name="extensions.tabutils.menu.context_reloadEvery" type="bool" suggest="true"/>
510510
<preference id="context_moveToWindow" name="extensions.tabutils.menu.context_moveToWindow" type="bool" suggest="true"/>
511511
<preference id="context_mergeWindow" name="extensions.tabutils.menu.context_mergeWindow" type="bool"/>

‎chrome/content/tabutils-st.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,6 @@ tabutils._stackTabs = function() {
113113
if (bTab.getAttribute("group-counter") == 1) {
114114
bTab.setAttribute("group-collapsed", !options.expand && TU_getPref("extensions.tabutils.autoCollapseNewStack", true));
115115
this.mTabContainer.mTabstrip.ensureElementIsVisible(bTab);
116-
117-
if (bTab.image)
118-
Services.mozIColorAnalyzer.findRepresentativeColor(makeURI(bTab.image), function(success, color) {
119-
if (success)
120-
this.updateStack(bTab, {color: "#" + ("000000" + color.toString(16)).slice(-6)});
121-
}.bind(this));
122116
}
123117

124118
//must happen after "group" is set to avoid bypassing stack, and

‎chrome/content/tabutils.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ var tabutils = {
4444
});
4545
}
4646

47+
let os = Services.appinfo.OS; //WINNT, Linux or Darwin
48+
let version = parseFloat(Services.appinfo.version);
49+
document.documentElement.setAttribute("OS", os);
50+
document.documentElement.setAttribute("v4", true);
51+
document.documentElement.setAttribute("v6", true);
52+
document.documentElement.setAttribute("v14", true);
53+
document.documentElement.setAttribute("v17", true);
54+
document.documentElement.setAttribute("v29", version >= 29.0);
55+
4756
// Function.prototype.__defineGetter__("stack", function() {
4857
// var stack = [];
4958
// for (let caller = this; caller && stack.length < 15; caller = caller.caller) {
@@ -161,7 +170,6 @@ window.addEventListener("DOMContentLoaded", tabutils, false);
161170
[
162171
["@mozilla.org/browser/sessionstore;1", "nsISessionStore", "_ss", tabutils], // Bug 898732 [Fx26]
163172
["@mozilla.org/docshell/urifixup;1", "nsIURIFixup"], // Bug 802026 [Fx20]
164-
["@mozilla.org/places/colorAnalyzer;1", "mozIColorAnalyzer"],
165173
["@mozilla.org/widget/clipboardhelper;1", "nsIClipboardHelper"],
166174
["@mozilla.org/uuid-generator;1", "nsIUUIDGenerator"]
167175
].forEach(function([aContract, aInterface, aName, aObject])
@@ -1693,6 +1701,11 @@ tabutils._multiTabHandler = function() {
16931701
this.selectedTabs = [];
16941702
});
16951703

1704+
TU_hookCode("gBrowser.onTabMove", "{", function() {
1705+
if (aTab.hasAttribute("multiselected"))
1706+
this._selectedTabs = null;
1707+
});
1708+
16961709
TU_hookCode("gBrowser.onTabHide", "}", function() {
16971710
if (aTab.hasAttribute("multiselected")) {
16981711
aTab.removeAttribute("multiselected");
@@ -1849,7 +1862,7 @@ tabutils._multiTabHandler = function() {
18491862
tabutils.addEventListener(gBrowser.mTabContainer, "dragstart", function(event) {
18501863
if (event.target.localName == "tab") {
18511864
let draggedTab = event.target;
1852-
let draggedTabs = gBrowser.contextTabsOf(draggedTab);
1865+
let draggedTabs = gBrowser.contextTabsOf(draggedTab).slice();
18531866
draggedTabs.splice(draggedTabs.indexOf(draggedTab), 1);
18541867
draggedTabs.unshift(draggedTab);
18551868

@@ -2375,15 +2388,6 @@ tabutils._miscFeatures = function() {
23752388
});
23762389

23772390
//Compatibility with themes
2378-
let os = Services.appinfo.OS; //WINNT, Linux or Darwin
2379-
let version = parseFloat(Services.appinfo.version);
2380-
document.documentElement.setAttribute("OS", os);
2381-
document.documentElement.setAttribute("v4", version >= 4.0);
2382-
document.documentElement.setAttribute("v6", version >= 6.0);
2383-
document.documentElement.setAttribute("v14", version >= 14.0);
2384-
document.documentElement.setAttribute("v17", version >= 17.0);
2385-
document.documentElement.setAttribute("v29", version >= 29.0);
2386-
23872391
for (let sheet of Array.slice(document.styleSheets)) {
23882392
switch (sheet.href) {
23892393
case "chrome://browser/skin/browser.css":
@@ -3301,7 +3305,7 @@ tabutils._tabPrefObserver = {
33013305
if (color && !(group in this._tabColoringRules)) {
33023306
let selectorText;
33033307
if (group[0] == "{")
3304-
selectorText = '.tabbrowser-tabs[colorStack="true"] > .tabbrowser-tab[group="' + group + '"]:not([group-counter="1"])';
3308+
selectorText = '#main-window .tabbrowser-tab[group="' + group + '"]:not([group-counter="1"])';
33053309
else
33063310
selectorText = '.tabbrowser-tabs[colorStack="true"] > .tabbrowser-tab[group^="{' + group + '"]:not([group-counter="1"])';
33073311

‎defaults/preferences/prefs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pref("extensions.tabutils.showAllTabs", false);
8585
pref("extensions.tabutils.highlightCurrent", false);
8686
pref("extensions.tabutils.highlightUnread", false);
8787
pref("extensions.tabutils.highlightRead", false);
88-
pref("extensions.tabutils.highlightUnloaded", false);
88+
pref("extensions.tabutils.highlightUnloaded", true);
8989
pref("extensions.tabutils.highlightSelected", true);
9090
pref("extensions.tabutils.styles.current", '{"bold":true,"color":true,"colorCode":"blue"}');
9191
pref("extensions.tabutils.styles.unread", '{"italic":true,"color":true,"colorCode":"red"}');
@@ -104,8 +104,8 @@ pref("extensions.tabutils.hideLoadInBackground", false);
104104
pref("extensions.tabutils.hideLoadInForeground", true);
105105

106106
pref("extensions.tabutils.menu.menu_tuOptions", true);
107-
pref("extensions.tabutils.menu.context_newTab", false);
108-
pref("extensions.tabutils.menu.context_duplicateTab", false);
107+
pref("extensions.tabutils.menu.context_newTab", true);
108+
pref("extensions.tabutils.menu.context_duplicateTab", true);
109109
pref("extensions.tabutils.menu.context_reloadEvery", false);
110110
pref("extensions.tabutils.menu.context_reloadEvery.list", "10,30,60,120,300,600,1800");
111111
pref("extensions.tabutils.menu.context_moveToWindow", false);

0 commit comments

Comments
 (0)