Bug 583044 - Rename code references of TabCandy to TabView

Move files and update references to tabview from tabcandy. Only remaining candy reference is the link to aza's webm video.

--HG--
rename : browser/base/content/browser-tabcandy.js => browser/base/content/browser-tabview.js
rename : browser/base/content/tabcandy/app/drag.js => browser/base/content/tabview/drag.js
rename : browser/base/content/tabcandy/app/groups.js => browser/base/content/tabview/groups.js
rename : browser/base/content/tabcandy/app/infoitems.js => browser/base/content/tabview/infoitems.js
rename : browser/base/content/tabcandy/core/iq.js => browser/base/content/tabview/iq.js
rename : browser/base/content/tabcandy/app/items.js => browser/base/content/tabview/items.js
rename : browser/base/content/tabcandy/core/profile.js => browser/base/content/tabview/profile.js
rename : browser/base/content/tabcandy/app/storage.js => browser/base/content/tabview/storage.js
rename : browser/base/content/tabcandy/app/tabitems.js => browser/base/content/tabview/tabitems.js
rename : browser/base/content/tabcandy/tabcandy.css => browser/base/content/tabview/tabview.css
rename : browser/base/content/tabcandy/tabcandy.html => browser/base/content/tabview/tabview.html
rename : browser/base/content/tabcandy/tabcandy.js => browser/base/content/tabview/tabview.js
rename : browser/base/content/tabcandy/app/trench.js => browser/base/content/tabview/trench.js
rename : browser/base/content/tabcandy/app/ui.js => browser/base/content/tabview/ui.js
rename : browser/themes/gnomestripe/browser/tabcandy/edit-light.png => browser/themes/gnomestripe/browser/tabview/edit-light.png
rename : browser/themes/gnomestripe/browser/tabcandy/edit.png => browser/themes/gnomestripe/browser/tabview/edit.png
rename : browser/themes/gnomestripe/browser/tabcandy/new-tab.png => browser/themes/gnomestripe/browser/tabview/new-tab.png
rename : browser/themes/gnomestripe/browser/tabcandy/platform.css => browser/themes/gnomestripe/browser/tabview/platform.css
rename : browser/themes/gnomestripe/browser/tabcandy/stack-expander.png => browser/themes/gnomestripe/browser/tabview/stack-expander.png
rename : browser/themes/gnomestripe/browser/tabcandy/tabcandy.png => browser/themes/gnomestripe/browser/tabview/tabview.png
rename : browser/themes/pinstripe/browser/tabcandy/edit-light.png => browser/themes/pinstripe/browser/tabview/edit-light.png
rename : browser/themes/pinstripe/browser/tabcandy/edit.png => browser/themes/pinstripe/browser/tabview/edit.png
rename : browser/themes/pinstripe/browser/tabcandy/new-tab.png => browser/themes/pinstripe/browser/tabview/new-tab.png
rename : browser/themes/pinstripe/browser/tabcandy/platform.css => browser/themes/pinstripe/browser/tabview/platform.css
rename : browser/themes/pinstripe/browser/tabcandy/stack-expander.png => browser/themes/pinstripe/browser/tabview/stack-expander.png
rename : browser/themes/pinstripe/browser/tabcandy/tabcandy.png => browser/themes/pinstripe/browser/tabview/tabview.png
rename : browser/themes/winstripe/browser/tabcandy/edit-light.png => browser/themes/winstripe/browser/tabview/edit-light.png
rename : browser/themes/winstripe/browser/tabcandy/edit.png => browser/themes/winstripe/browser/tabview/edit.png
rename : browser/themes/winstripe/browser/tabcandy/new-tab.png => browser/themes/winstripe/browser/tabview/new-tab.png
rename : browser/themes/winstripe/browser/tabcandy/platform.css => browser/themes/winstripe/browser/tabview/platform.css
rename : browser/themes/winstripe/browser/tabcandy/stack-expander.png => browser/themes/winstripe/browser/tabview/stack-expander.png
rename : browser/themes/winstripe/browser/tabcandy/tabcandy.png => browser/themes/winstripe/browser/tabview/tabview.png
This commit is contained in:
Edward Lee 2010-07-29 12:37:25 -07:00
Родитель 04f4755ec8
Коммит d3f620c5ea
50 изменённых файлов: 186 добавлений и 185 удалений

Просмотреть файл

@ -208,9 +208,9 @@
<menu id="view-menu" label="&viewMenu.label;"
accesskey="&viewMenu.accesskey;">
<menupopup id="menu_viewPopup">
<menuitem id="menu_tabcandy"
label="&showTabCandy.label;"
command="Browser:ToggleTabCandy"/>
<menuitem id="menu_tabview"
label="&showTabView.label;"
command="Browser:ToggleTabView"/>
<menu id="viewToolbarsMenu"
label="&viewToolbarsMenu.label;"
accesskey="&viewToolbarsMenu.accesskey;">

Просмотреть файл

@ -117,7 +117,7 @@
<command id="Browser:NextTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(1, true);"/>
<command id="Browser:PrevTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(-1, true);"/>
<command id="Browser:ShowAllTabs" oncommand="allTabs.open();"/>
<command id="Browser:ToggleTabCandy" oncommand="TabCandy.toggle();"/>
<command id="Browser:ToggleTabView" oncommand="TabView.toggle();"/>
<command id="cmd_fullZoomReduce" oncommand="FullZoom.reduce()"/>
<command id="cmd_fullZoomEnlarge" oncommand="FullZoom.enlarge()"/>
<command id="cmd_fullZoomReset" oncommand="FullZoom.reset()"/>

Просмотреть файл

@ -11,10 +11,10 @@
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is the Tab Candy
# The Original Code is the Tab View
#
# The Initial Developer of the Original Code is Google Inc.
# Portions created by the Initial Developer are Copyright (C) 2006
# The Initial Developer of the Original Code is Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
@ -35,25 +35,25 @@
# ***** END LICENSE BLOCK *****
// New API methods can be added to here.
var TabCandy = {
let TabView = {
toggle: function() {
let event = document.createEvent("Events");
if (this.isVisible()) {
event.initEvent("tabcandyhide", false, false);
event.initEvent("tabviewhide", false, false);
} else {
event.initEvent("tabcandyshow", false, false);
event.initEvent("tabviewshow", false, false);
}
dispatchEvent(event);
},
isVisible: function() {
return (window.document.getElementById("tab-candy-deck").selectedIndex == 1);
return (window.document.getElementById("tab-view-deck").selectedIndex == 1);
},
getWindowTitle: function() {
var brandBundle = document.getElementById("bundle_brand");
var brandShortName = brandBundle.getString("brandShortName");
return gNavigatorBundle.getFormattedString("tabCandy.title", [brandShortName]);
return gNavigatorBundle.getFormattedString("tabView.title", [brandShortName]);
}
};

Просмотреть файл

@ -166,7 +166,7 @@ let gInitialPages = [
#include inspector.js
#include browser-places.js
#include browser-tabPreviews.js
#include browser-tabcandy.js
#include browser-tabview.js
XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
#ifdef XP_WIN

Просмотреть файл

@ -101,7 +101,7 @@
<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
<deck flex="1" id="tab-candy-deck">
<deck flex="1" id="tab-view-deck">
<vbox flex="1">
# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
@ -857,7 +857,7 @@
iconsize="small" defaulticonsize="small" lockiconsize="true"
aria-label="&tabsToolbar.label;"
context="toolbar-context-menu"
defaultset="tabbrowser-tabs,new-tab-button,tabcandy-button,alltabs-button,tabs-closebutton"
defaultset="tabbrowser-tabs,new-tab-button,tabview-button,alltabs-button,tabs-closebutton"
collapsed="true">
<tabs id="tabbrowser-tabs"
@ -891,10 +891,10 @@
position="after_end"/>
</toolbarbutton>
<toolbarbutton id="tabcandy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
label="&tabCandyButton.label;"
command="Browser:ToggleTabCandy"
tooltiptext="&tabCandyButton.tooltip;"
<toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
label="&tabViewButton.label;"
command="Browser:ToggleTabView"
tooltiptext="&tabViewButton.tooltip;"
removable="true"/>
<toolbarbutton id="tabs-closebutton"
@ -1035,7 +1035,7 @@
#endif
</vbox>
<iframe id="tab-candy" transparent="true" flex="1" src="chrome://browser/content/tabcandy.html" />
<iframe id="tab-view" transparent="true" flex="1" src="chrome://browser/content/tabview.html" />
</deck>
</window>

Просмотреть файл

@ -717,9 +717,9 @@
<method name="updateTitlebar">
<body>
<![CDATA[
if (TabCandy.isVisible()) {
if (TabView.isVisible()) {
// ToDo: this will be removed when we gain ability to draw o the menu bar.
this.ownerDocument.title = TabCandy.getWindowTitle();
this.ownerDocument.title = TabView.getWindowTitle();
} else {
this.ownerDocument.title = this.getWindowTitleForBrowser(this.mCurrentBrowser);
}
@ -1336,7 +1336,7 @@
var closeWindow = false;
var newTab = false;
if (this.tabs.length - this._removingTabs.length == 1) {
if (!TabCandy.isVisible()) {
if (!TabView.isVisible()) {
closeWindow = aCloseWindowWithLastTab != null ? aCloseWindowWithLastTab :
!window.toolbar.visible ||
this.tabContainer._closeWindowWithLastTab;

Просмотреть файл

@ -63,7 +63,7 @@ function max(list){ return list.slice().sort(numCmp).reverse()[0]; }
// ##########
// Class: Group
// A single group in the tab candy window. Descended from <Item>.
// A single group in the TabView window. Descended from <Item>.
// Note that it implements the <Subscribable> interface.
//
// ----------
@ -212,7 +212,7 @@ window.Group = function Group(listOfEls, options) {
"padding-left": "1px"
}, {
duration: 200,
easing: 'tabcandyBounce'
easing: "tabviewBounce"
});
}
};
@ -272,7 +272,7 @@ window.Group = function Group(listOfEls, options) {
// ___ Stack Expander
this.$expander = iQ("<img/>")
.attr('src', 'chrome://browser/skin/tabcandy/stack-expander.png')
.attr("src", "chrome://browser/skin/tabview/stack-expander.png")
.addClass("stackExpander")
.appendTo($container)
.hide();
@ -504,7 +504,7 @@ window.Group.prototype = Utils.extend(new Item(), new Subscribable(), {
TabItems.pausePainting();
iQ(this.container).animate(css, {
duration: 350,
easing: 'tabcandyBounce',
easing: "tabviewBounce",
complete: function() {
TabItems.resumePainting();
}
@ -772,7 +772,7 @@ window.Group.prototype = Utils.extend(new Item(), new Subscribable(), {
if (!immediately)
this.$ntb.animate(box.css(), {
duration: 320,
easing: 'tabcandyBounce'
easing: "tabviewBounce"
});
else
this.$ntb.css(box.css());
@ -1090,7 +1090,7 @@ window.Group.prototype = Utils.extend(new Item(), new Subscribable(), {
left: pos.left
}, {
duration: 200,
easing: 'tabcandyBounce'
easing: "tabviewBounce"
})
.addClass("overlay");
@ -1151,7 +1151,7 @@ window.Group.prototype = Utils.extend(new Item(), new Subscribable(), {
opacity: 0
}, {
duration: 350,
easing: 'tabcandyBounce',
easing: "tabviewBounce",
complete: function() {
iQ(this).remove();
}
@ -1260,12 +1260,12 @@ window.Group.prototype = Utils.extend(new Item(), new Subscribable(), {
let newTab = gBrowser.loadOneTab(url || "about:blank", {inBackground: true});
// Because opening a new tab happens in a different thread(?)
// calling UI.showTabCandy() inline won't do anything. Instead
// calling UI.showTabView() inline won't do anything. Instead
// we have to marshal it. A value of 0 wait time doesn't seem
// to work. Instead, we use a value of 1 which seems to be the
// minimum amount of time required.
Utils.timeout(function(){
UI.showTabCandy()
UI.showTabView()
}, 1);
var self = this;
@ -1299,7 +1299,7 @@ window.Group.prototype = Utils.extend(new Item(), new Subscribable(), {
complete: function(){
iQ(tab.container).css({opacity: 1});
gBrowser.selectedTab = newTab;
UI.hideTabCandy()
UI.hideTabView()
gWindow.gURLBar.focus();
$anim.remove();
// We need a timeout here so that there is a chance for the
@ -1691,7 +1691,7 @@ window.Groups = {
// Function: getActiveGroup
// Returns the active group. Active means the group where a new
// tab will live when it is created as well as what tabs are
// shown in the tab bar when not in the TabCandy interface.
// shown in the tab bar when not in the TabView interface.
getActiveGroup: function() {
return this._activeGroup;
},

Просмотреть файл

@ -44,7 +44,7 @@
// ##########
// Class: InfoItem
// An <Item> in TabCandy used for displaying information, such as the welcome video.
// An <Item> in TabView used for displaying information, such as the welcome video.
// Note that it implements the <Subscribable> interface.
//
// ----------
@ -194,7 +194,7 @@ window.InfoItem.prototype = Utils.extend(new Item(), new Subscribable(), {
TabItems.pausePainting();
iQ(this.container).animate(css, {
duration: 350,
easing: 'tabcandyBounce',
easing: "tabviewBounce",
complete: function() {
TabItems.resumePainting();
}

Просмотреть файл

@ -532,7 +532,7 @@ iQClass.prototype = {
// Possible "options" properties:
// duration - how long to animate, in milliseconds
// easing - easing function to use. Possibilities include
// 'tabcandyBounce', 'easeInQuad'. Default is 'ease'.
// "tabviewBounce", "easeInQuad". Default is "ease".
// complete - function to call once the animation is done, takes nothing
// in, but "this" is set to the element that was animated.
animate: function(css, options) {
@ -543,7 +543,7 @@ iQClass.prototype = {
options = {};
let easings = {
tabcandyBounce: 'cubic-bezier(0.0, 0.63, .6, 1.29)',
tabviewBounce: "cubic-bezier(0.0, 0.63, .6, 1.29)",
easeInQuad: 'ease-in', // TODO: make it a real easeInQuad, or decide we don't care
fast: 'cubic-bezier(0.7,0,1,1)'
};

Просмотреть файл

@ -476,7 +476,7 @@ let Utils = {
// Pass as many arguments as you want, it'll print them all.
error: function() {
var text = this.expandArgumentsForLog(arguments);
Cu.reportError('tabcandy error: ' + text);
Cu.reportError("tabview error: " + text);
},
// ----------
@ -503,7 +503,7 @@ let Utils = {
if (typeof(label) == 'undefined')
text = 'badly formed assert';
else
text = 'tabcandy assert: ' + label;
text = "tabview assert: " + label;
this.trace(text);
}
@ -518,7 +518,7 @@ let Utils = {
if (typeof(label) == 'undefined')
text = 'badly formed assert';
else
text = 'tabcandy assert: ' + label;
text = "tabview assert: " + label;
// cut off the first two lines of the stack trace, because they're just this function.
text += Error().stack.replace(/^.*?\n.*?\n/, "");

Просмотреть файл

@ -40,13 +40,13 @@
// ##########
// Class: Storage
// Singleton for permanent storage of TabCandy data.
// Singleton for permanent storage of TabView data.
Storage = {
GROUP_DATA_IDENTIFIER: "tabcandy-group",
GROUPS_DATA_IDENTIFIER: "tabcandy-groups",
TAB_DATA_IDENTIFIER: "tabcandy-tab",
UI_DATA_IDENTIFIER: "tabcandy-ui",
VISIBILITY_DATA_IDENTIFIER: "tabcandy-visibility",
GROUP_DATA_IDENTIFIER: "tabview-group",
GROUPS_DATA_IDENTIFIER: "tabview-groups",
TAB_DATA_IDENTIFIER: "tabview-tab",
UI_DATA_IDENTIFIER: "tabview-ui",
VISIBILITY_DATA_IDENTIFIER: "tabview-visibility",
// ----------
// Function: onReady

Просмотреть файл

@ -384,7 +384,7 @@ window.TabItem.prototype = Utils.extend(new Item(), new Subscribable(), {
TabItems.pausePainting();
$container.animate(css, {
duration: 200,
easing: 'tabcandyBounce',
easing: "tabviewBounce",
complete: function() {
TabItems.resumePainting();
}
@ -609,7 +609,7 @@ window.TabItem.prototype = Utils.extend(new Item(), new Subscribable(), {
// ----------
// Function: zoomOut
// Handles the zoom down animation after returning to TabCandy.
// Handles the zoom down animation after returning to TabView.
// It is expected that this routine will be called from the chrome thread
// (in response to Tabs.onFocus()).
//

Просмотреть файл

@ -277,7 +277,7 @@ body {
position: absolute !important;
cursor: pointer;
opacity: .3;
background-image: url(chrome://browser/skin/tabcandy/new-tab.png);
background-image: url(chrome://browser/skin/tabview/new-tab.png);
z-index: 99999;
}
@ -360,7 +360,7 @@ input.name {
color: #999;
margin: 3px 0px 0px 3px;
padding: 1px;
background-image: url(chrome://browser/skin/tabcandy/edit-light.png);
background-image: url(chrome://browser/skin/tabview/edit-light.png);
padding-left: 20px;
}

Просмотреть файл

@ -5,8 +5,8 @@
<head>
<title>&nbsp;</title>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
<link rel="stylesheet" href="tabcandy.css" type="text/css"/>
<link rel="stylesheet" href="chrome://browser/skin/tabcandy/platform.css" type="text/css"/>
<link rel="stylesheet" href="tabview.css" type="text/css"/>
<link rel="stylesheet" href="chrome://browser/skin/tabview/platform.css" type="text/css"/>
</head>
<body style="background-color: transparent !important;-moz-appearance: none !important;" transparent="true">
@ -15,7 +15,7 @@
<div id="bg" />
</div>
<script type="text/javascript;version=1.8" src="tabcandy.js"></script>
<script type="text/javascript;version=1.8" src="tabview.js"></script>
</body>
</html>

Просмотреть файл

@ -12,23 +12,24 @@ XPCOMUtils.defineLazyGetter(this, "gWindow", function() {
XPCOMUtils.defineLazyGetter(this, "gBrowser", function() gWindow.gBrowser);
XPCOMUtils.defineLazyGetter(this, "gTabViewDeck", function() {
return gWindow.document.getElementById("tab-candy-deck");
return gWindow.document.getElementById("tab-view-deck");
});
XPCOMUtils.defineLazyGetter(this, "gTabViewFrame", function() {
return gWindow.document.getElementById("tab-candy");
return gWindow.document.getElementById("tab-view");
});
# NB: Certain files need to evaluate before others
#include core/profile.js
#include core/iq.js
#include app/storage.js
#include app/items.js
#include app/groups.js
#include app/tabitems.js
#include profile.js
#include iq.js
#include app/drag.js
#include app/trench.js
#include app/infoitems.js
#include app/ui.js
#include storage.js
#include items.js
#include groups.js
#include tabitems.js
#include drag.js
#include trench.js
#include infoitems.js
#include ui.js

Просмотреть файл

@ -62,9 +62,9 @@ var UIManager = {
// If true, the last visible tab has just been closed in the tab strip.
_closedLastVisibleTab : false,
// Variable: _closedSelectedTabInTabCandy
// If true, a select tab has just been closed in tab candy.
_closedSelectedTabInTabCandy : false,
// Variable: _closedSelectedTabInTabView
// If true, a select tab has just been closed in TabView.
_closedSelectedTabInTabView : false,
// Variable: _stopZoomPreparation
// If true, prevent the next zoom preparation.
@ -72,12 +72,12 @@ var UIManager = {
// Variable: _reorderTabItemsOnShow
// Keeps track of the <Group>s which their tab items' tabs have been moved
// and re-orders the tab items when switching to Tab Candy.
// and re-orders the tab items when switching to TabView.
_reorderTabItemsOnShow : [],
// Variable: _reorderTabsOnHide
// Keeps track of the <Group>s which their tab items have been moved in Tab
// Candy UI and re-orders the tabs when switcing back to main browser.
// Keeps track of the <Group>s which their tab items have been moved in
// TabView UI and re-orders the tabs when switcing back to main browser.
_reorderTabsOnHide : [],
// Variable: _currentTab
@ -106,7 +106,7 @@ var UIManager = {
self._reset();
});
// When you click on the background/empty part of TabCandy,
// When you click on the background/empty part of TabView,
// we create a new group.
iQ(gTabViewFrame.contentDocument).mousedown(function(e){
if ( e.originalTarget.id == "content" )
@ -119,11 +119,11 @@ var UIManager = {
});
});
gWindow.addEventListener("tabcandyshow", function() {
self.showTabCandy(true);
gWindow.addEventListener("tabviewshow", function() {
self.showTabView(true);
}, false);
gWindow.addEventListener("tabcandyhide", function() {
gWindow.addEventListener("tabviewhide", function() {
var activeTab = self.getActiveTab();
if (activeTab)
activeTab.zoomIn();
@ -214,8 +214,8 @@ var UIManager = {
self._resize();
});
// ___ show Tab Candy at startup based on last session.
if (data.tabCandyVisible) {
// ___ show TabView at startup based on last session.
if (data.tabViewVisible) {
var currentTab = self._currentTab;
if (currentTab && currentTab.tabItem)
@ -223,7 +223,7 @@ var UIManager = {
else
self._stopZoomPreparation = true;
self.showTabCandy();
self.showTabView();
// ensure the tabs in the tab strip are in the same order as the tab
// items in groups when switching back to main browser UI for the first
// time.
@ -231,9 +231,9 @@ var UIManager = {
self._reorderTabsOnHide.push(group);
});
} else {
self.hideTabCandy();
self.hideTabView();
// ensure the tab items in groups are in the same order as tabs in tab
// strip when going into Tab Candy for the first time.
// strip when going into TabView for the first time.
Groups.groups.forEach(function(group) {
self._reorderTabItemsOnShow.push(group);
});
@ -244,7 +244,7 @@ var UIManager = {
var observer = {
observe : function(subject, topic, data) {
if (topic == "quit-application-requested") {
if (self._isTabCandyVisible())
if (self._isTabViewVisible())
TabItems.saveAll(true);
self._save();
}
@ -298,18 +298,18 @@ var UIManager = {
},
// ----------
// Function: _isTabCandyVisible
// Returns true if the TabCandy UI is currently shown.
_isTabCandyVisible: function() {
// Function: _isTabViewVisible
// Returns true if the TabView UI is currently shown.
_isTabViewVisible: function() {
return gTabViewDeck.selectedIndex == 1;
},
// ----------
// Function: showTabCandy
// Shows TabCandy and hides the main browser UI.
// Function: showTabView
// Shows TabView and hides the main browser UI.
// Parameters:
// zoomOut - true for zoom out animation, false for nothing.
showTabCandy: function(zoomOut) {
showTabView: function(zoomOut) {
var self = this;
var currentTab = this._currentTab;
var item = null;
@ -351,9 +351,9 @@ var UIManager = {
},
// ----------
// Function: hideTabCandy
// Hides Tab candy and shows the main browser UI .
hideTabCandy: function() {
// Function: hideTabView
// Hides TabView and shows the main browser UI.
hideTabView: function() {
this._reorderTabsOnHide.forEach(function(group) {
group.reorderTabsBasedOnTabItemOrder();
});
@ -377,10 +377,10 @@ var UIManager = {
// ----------
// Function: _setActiveTitleColor
// Used on the Mac to make the title bar match the gradient in the rest of the
// TabCandy UI.
// TabView UI.
//
// Parameters:
// set - true for the special TabCandy color, false for the normal color.
// set - true for the special TabView color, false for the normal color.
_setActiveTitleColor: function(set) {
// Mac Only
var mainWindow = gWindow.document.getElementById("main-window");
@ -401,22 +401,22 @@ var UIManager = {
if (this.ownerDocument.defaultView != gWindow)
return;
if (self._isTabCandyVisible()) {
// just closed the selected tab in the tab candy interface.
if (self._isTabViewVisible()) {
// just closed the selected tab in the TabView interface.
if (self._currentTab == this)
self._closedSelectedTabInTabCandy = true;
self._closedSelectedTabInTabView = true;
} else {
// if not closing the last tab
if (gBrowser.tabs.length > 1) {
var group = Groups.getActiveGroup();
// 1) Only go back to the TabCandy tab when there you close the last
// 1) Only go back to the TabView tab when there you close the last
// tab of a group.
// 2) Take care of the case where you've closed the last tab in
// an un-named group, which means that the group is gone (null) and
// there are no visible tabs.
// Can't use timeout here because user would see a flicker of
// switching to another tab before the tab candy interface shows up.
// switching to another tab before the TabView interface shows up.
if ((group && group._children.length == 1) ||
(group == null && gBrowser.visibleTabs.length == 1)) {
// for the tab focus event to pick up.
@ -424,7 +424,7 @@ var UIManager = {
// remove the zoom prep.
if (this && this.tabItem)
this.tabItem.setZoomPrep(false);
self.showTabCandy();
self.showTabView();
}
// ToDo: When running unit tests, everything happens so quick so
// new tabs might be added after a tab is closing. Therefore, this
@ -432,7 +432,7 @@ var UIManager = {
Utils.timeout(function() { // Marshal event from chrome thread to DOM thread
if ((group && group._children.length > 0) ||
(group == null && gBrowser.visibleTabs.length > 0))
self.hideTabCandy();
self.hideTabView();
}, 1);
}
}
@ -444,7 +444,7 @@ var UIManager = {
return;
Utils.timeout(function() { // Marshal event from chrome thread to DOM thread
if (!self._isTabCandyVisible()) {
if (!self._isTabViewVisible()) {
var activeGroup = Groups.getActiveGroup();
if (activeGroup) {
var index = self._reorderTabItemsOnShow.indexOf(activeGroup);
@ -465,7 +465,7 @@ var UIManager = {
// ----------
// Function: tabOnFocus
// Called when the user switches from one tab to another outside of the TabCandy UI.
// Called when the user switches from one tab to another outside of the TabView UI.
tabOnFocus: function(tab) {
var self = this;
var focusTab = tab;
@ -473,24 +473,24 @@ var UIManager = {
this._currentTab = focusTab;
// if the last visible tab has just been closed, don't show the chrome UI.
if (this._isTabCandyVisible() &&
(this._closedLastVisibleTab || this._closedSelectedTabInTabCandy)) {
if (this._isTabViewVisible() &&
(this._closedLastVisibleTab || this._closedSelectedTabInTabView)) {
this._closedLastVisibleTab = false;
this._closedSelectedTabInTabCandy = false;
this._closedSelectedTabInTabView = false;
return;
}
// if TabCandy is visible but we didn't just close the last tab or
// if TabView is visible but we didn't just close the last tab or
// selected tab, show chrome.
if (this._isTabCandyVisible())
this.hideTabCandy();
if (this._isTabViewVisible())
this.hideTabView();
// reset these vars, just in case.
this._closedLastVisibleTab = false;
this._closedSelectedTabInTabCandy = false;
this._closedSelectedTabInTabView = false;
Utils.timeout(function() { // Marshal event from chrome thread to DOM thread
// this value is true when tabcandy is open at browser startup.
// this value is true when TabView is open at browser startup.
if (self._stopZoomPreparation) {
self._stopZoomPreparation = false;
if (focusTab && focusTab.tabItem)
@ -511,7 +511,7 @@ var UIManager = {
Groups.setActiveGroup(newItem.parent);
}
// ___ prepare for when we return to TabCandy
// ___ prepare for when we return to TabView
var oldItem = null;
if (currentTab && currentTab.tabItem)
oldItem = currentTab.tabItem;
@ -521,14 +521,14 @@ var UIManager = {
oldItem.setZoomPrep(false);
// if the last visible tab is removed, don't set zoom prep because
// we shoud be in the Tab Candy interface.
if (visibleTabCount > 0 && newItem && !self._isTabCandyVisible())
// we shoud be in the TabView interface.
if (visibleTabCount > 0 && newItem && !self._isTabViewVisible())
newItem.setZoomPrep(true);
} else {
// the tab is already focused so the new and old items are the
// same.
if (oldItem)
oldItem.setZoomPrep(!self._isTabCandyVisible());
oldItem.setZoomPrep(!self._isTabViewVisible());
}
}, 1);
},
@ -540,7 +540,7 @@ var UIManager = {
// Parameters:
// group - the group which would be used for re-ordering tabs.
setReorderTabsOnHide: function(group) {
if (this._isTabCandyVisible()) {
if (this._isTabViewVisible()) {
var index = this._reorderTabsOnHide.indexOf(group);
if (index == -1)
this._reorderTabsOnHide.push(group);
@ -550,12 +550,12 @@ var UIManager = {
// ----------
// Function: _setBrowserKeyHandlers
// Overrides the browser's keys for navigating between tab (outside of the
// TabCandy UI) so they do the right thing in respect to groups.
// TabView UI) so they do the right thing in respect to groups.
_setBrowserKeyHandlers : function() {
var self = this;
gWindow.addEventListener("keypress", function(event) {
if (self._isTabCandyVisible())
if (self._isTabViewVisible())
return;
var charCode = event.charCode;
@ -570,7 +570,7 @@ var UIManager = {
#endif
event.stopPropagation();
event.preventDefault();
self.showTabCandy(true);
self.showTabView(true);
return;
}
@ -588,7 +588,7 @@ var UIManager = {
// ----------
// Function: _setTabViewFrameKeyHandlers
// Sets up the key handlers for navigating between tabs within the TabCandy UI.
// Sets up the key handlers for navigating between tabs within the TabView UI.
_setTabViewFrameKeyHandlers: function(){
var self = this;
@ -702,7 +702,7 @@ var UIManager = {
// ----------
// Function: _createGroupOnDrag
// Called in response to a mousedown in empty space in the TabCandy UI;
// Called in response to a mousedown in empty space in the TabView UI;
// creates a new group based on the user's drag.
_createGroupOnDrag: function(e){
const minSize = 60;
@ -821,7 +821,7 @@ var UIManager = {
// ----------
// Function: _resize
// Update the TabCandy UI contents in response to a window size change.
// Update the TabView UI contents in response to a window size change.
// Won't do anything if it doesn't deem the resize necessary.
// Parameters:
// force - true to update even when "unnecessary"; default false
@ -829,9 +829,9 @@ var UIManager = {
if (typeof(force) == "undefined")
force = false;
// If TabCandy isn't focused and is not showing, don't perform a resize.
// If TabView isn't focused and is not showing, don't perform a resize.
// This resize really slows things down.
if (!force && !this._isTabCandyVisible())
if (!force && !this._isTabViewVisible())
return;
var oldPageBounds = new Rect(this._pageBounds);
@ -911,7 +911,7 @@ var UIManager = {
// ----------
// Function: _addDevMenu
// Fills out the "dev menu" in the TabCandy UI.
// Fills out the "dev menu" in the TabView UI.
_addDevMenu: function() {
try {
var self = this;
@ -947,7 +947,7 @@ var UIManager = {
}, {
name: "refresh",
code: function() {
location.href = "tabcandy.html";
location.href = "tabview.html";
}
}, {
name: "reset",
@ -981,7 +981,7 @@ var UIManager = {
// -----------
// Function: _reset
// Wipes all TabCandy storage and refreshes, giving you the "first-run" state.
// Wipes all TabView storage and refreshes, giving you the "first-run" state.
_reset: function() {
Storage.wipe();
location.href = "";
@ -1011,7 +1011,7 @@ var UIManager = {
return;
var data = {
tabCandyVisible: this._isTabCandyVisible(),
tabViewVisible: this._isTabViewVisible(),
pageBounds: this._pageBounds
};
@ -1021,7 +1021,7 @@ var UIManager = {
// ----------
// Function: _saveAll
// Saves all data associated with TabCandy.
// Saves all data associated with TabView.
// TODO: Save info items
_saveAll: function() {
this._save();

Просмотреть файл

@ -46,9 +46,9 @@ browser.jar:
content/browser/sanitizeDialog.css (content/sanitizeDialog.css)
* content/browser/tabbrowser.css (content/tabbrowser.css)
* content/browser/tabbrowser.xml (content/tabbrowser.xml)
content/browser/tabcandy.css (content/tabcandy/tabcandy.css)
* content/browser/tabcandy.js (content/tabcandy/tabcandy.js)
content/browser/tabcandy.html (content/tabcandy/tabcandy.html)
content/browser/tabview.css (content/tabview/tabview.css)
* content/browser/tabview.js (content/tabview/tabview.js)
content/browser/tabview.html (content/tabview/tabview.html)
* content/browser/urlbarBindings.xml (content/urlbarBindings.xml)
* content/browser/utilityOverlay.js (content/utilityOverlay.js)
* content/browser/web-panels.js (content/web-panels.js)

Просмотреть файл

@ -1939,7 +1939,7 @@ SessionStoreService.prototype = {
tabbrowser.tabs[t] :
tabbrowser.addTab("about:blank", {skipAnimation: true}));
// collapse all unselected tabs to prevent flickering when showing the
// tabs in the active group by tabcandy
// tabs in the active group by TabView
if (!tabs[t].selected) {
tabs[t].hidden = true;
}

Просмотреть файл

@ -126,8 +126,8 @@
<!-- Toolbar items -->
<!ENTITY homeButton.label "Home">
<!ENTITY tabCandyButton.label "TabCandy">
<!ENTITY tabCandyButton.tooltip "Open a visual tab interface">
<!ENTITY tabViewButton.label "TabView">
<!ENTITY tabViewButton.tooltip "Open a visual tab interface">
<!ENTITY bookmarksButton.label "Bookmarks">
<!ENTITY bookmarksButton.tooltip "Display your bookmarks">
@ -233,7 +233,7 @@
<!ENTITY viewMenu.label "View">
<!ENTITY viewMenu.accesskey "V">
<!ENTITY showTabCandy.label "TabCandy">
<!ENTITY showTabView.label "TabView">
<!ENTITY viewToolbarsMenu.label "Toolbars">
<!ENTITY viewToolbarsMenu.accesskey "T">
<!ENTITY viewSidebarMenu.label "Sidebar">

Просмотреть файл

@ -268,8 +268,8 @@ ctrlTab.showAll.label=;Show all #1 tabs
# Used as the bookmark name when saving a keyword for a search field.
addKeywordTitleAutoFill=Search %S
# Tab Candy
tabCandy.title=%S Tab Sets
# TabView
tabView.title=%S Tab Sets
extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default
extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme.

Просмотреть файл

@ -563,8 +563,8 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
list-style-image: url("moz-icon://stock/gtk-home?size=toolbar&state=disabled");
}
#tabcandy-button {
list-style-image: url(chrome://browser/skin/tabcandy/tabcandy.png);
#tabview-button {
list-style-image: url(chrome://browser/skin/tabview/tabview.png);
}
#downloads-button {

Просмотреть файл

@ -65,9 +65,9 @@ browser.jar:
skin/classic/browser/tabbrowser/progress.png (tabbrowser/progress.png)
skin/classic/browser/tabbrowser/progress-pulsing.png (tabbrowser/progress-pulsing.png)
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/tabcandy/edit-light.png (tabcandy/edit-light.png)
skin/classic/browser/tabcandy/edit.png (tabcandy/edit.png)
skin/classic/browser/tabcandy/new-tab.png (tabcandy/new-tab.png)
skin/classic/browser/tabcandy/platform.css (tabcandy/platform.css)
skin/classic/browser/tabcandy/stack-expander.png (tabcandy/stack-expander.png)
skin/classic/browser/tabcandy/tabcandy.png (tabcandy/tabcandy.png)
skin/classic/browser/tabview/edit-light.png (tabview/edit-light.png)
skin/classic/browser/tabview/edit.png (tabview/edit.png)
skin/classic/browser/tabview/new-tab.png (tabview/new-tab.png)
skin/classic/browser/tabview/platform.css (tabview/platform.css)
skin/classic/browser/tabview/stack-expander.png (tabview/stack-expander.png)
skin/classic/browser/tabview/tabview.png (tabview/tabview.png)

Просмотреть файл

@ -1,7 +0,0 @@
/* This file is for platform-specific CSS for TabCandy, and is loaded after the
platform-independent tabcandy.css, to allow overwriting.
*/
.close {
background: url("moz-icon://stock/gtk-close?size=menu") no-repeat;
}

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 46 KiB

После

Ширина:  |  Высота:  |  Размер: 46 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 46 KiB

После

Ширина:  |  Высота:  |  Размер: 46 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 466 B

После

Ширина:  |  Высота:  |  Размер: 466 B

Просмотреть файл

@ -0,0 +1,7 @@
/* This file is for platform-specific CSS for TabView, and is loaded after the
platform-independent tabview.css, to allow overwriting.
*/
.close {
background: url("moz-icon://stock/gtk-close?size=menu") no-repeat;
}

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 49 KiB

После

Ширина:  |  Высота:  |  Размер: 49 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 397 B

После

Ширина:  |  Высота:  |  Размер: 397 B

Просмотреть файл

@ -531,10 +531,10 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
-moz-margin-end: 3px;
}
/* tabcandy button */
/* tabview button */
#tabcandy-button {
list-style-image: url(chrome://browser/skin/tabcandy/tabcandy.png);
#tabview-button {
list-style-image: url(chrome://browser/skin/tabview/tabview.png);
}
/* download manager button */

Просмотреть файл

@ -107,9 +107,9 @@ browser.jar:
skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png (tabbrowser/tabbrowser-tabs-bkgnd.png)
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/tabbrowser/tab-bkgnd.png (tabbrowser/tab-bkgnd.png)
skin/classic/browser/tabcandy/edit-light.png (tabcandy/edit-light.png)
skin/classic/browser/tabcandy/edit.png (tabcandy/edit.png)
skin/classic/browser/tabcandy/new-tab.png (tabcandy/new-tab.png)
skin/classic/browser/tabcandy/platform.css (tabcandy/platform.css)
skin/classic/browser/tabcandy/stack-expander.png (tabcandy/stack-expander.png)
skin/classic/browser/tabcandy/tabcandy.png (tabcandy/tabcandy.png)
skin/classic/browser/tabview/edit-light.png (tabview/edit-light.png)
skin/classic/browser/tabview/edit.png (tabview/edit.png)
skin/classic/browser/tabview/new-tab.png (tabview/new-tab.png)
skin/classic/browser/tabview/platform.css (tabview/platform.css)
skin/classic/browser/tabview/stack-expander.png (tabview/stack-expander.png)
skin/classic/browser/tabview/tabview.png (tabview/tabview.png)

Просмотреть файл

@ -1,7 +0,0 @@
/* This file is for platform-specific CSS for TabCandy, and is loaded after the
platform-independent tabcandy.css, to allow overwriting.
*/
.close {
background: url(chrome://global/skin/icons/closetab.png) no-repeat;
}

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 46 KiB

После

Ширина:  |  Высота:  |  Размер: 46 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 46 KiB

После

Ширина:  |  Высота:  |  Размер: 46 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 466 B

После

Ширина:  |  Высота:  |  Размер: 466 B

Просмотреть файл

@ -0,0 +1,7 @@
/* This file is for platform-specific CSS for TabView, and is loaded after the
platform-independent tabview.css, to allow overwriting.
*/
.close {
background: url(chrome://global/skin/icons/closetab.png) no-repeat;
}

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 49 KiB

После

Ширина:  |  Высота:  |  Размер: 49 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 397 B

После

Ширина:  |  Высота:  |  Размер: 397 B

Просмотреть файл

@ -590,10 +590,10 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
-moz-image-region: rect(0, 90px, 18px, 72px);
}
/* tabcandy button */
/* tabview button */
#tabcandy-button {
list-style-image: url(chrome://browser/skin/tabcandy/tabcandy.png);
#tabview-button {
list-style-image: url(chrome://browser/skin/tabview/tabview.png);
}
/* download manager button */

Просмотреть файл

@ -84,12 +84,12 @@ browser.jar:
skin/classic/browser/tabbrowser/tab.png (tabbrowser/tab.png)
skin/classic/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png)
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/tabcandy/edit-light.png (tabcandy/edit-light.png)
skin/classic/browser/tabcandy/edit.png (tabcandy/edit.png)
skin/classic/browser/tabcandy/new-tab.png (tabcandy/new-tab.png)
skin/classic/browser/tabcandy/platform.css (tabcandy/platform.css)
skin/classic/browser/tabcandy/stack-expander.png (tabcandy/stack-expander.png)
skin/classic/browser/tabcandy/tabcandy.png (tabcandy/tabcandy.png)
skin/classic/browser/tabview/edit-light.png (tabview/edit-light.png)
skin/classic/browser/tabview/edit.png (tabview/edit.png)
skin/classic/browser/tabview/new-tab.png (tabview/new-tab.png)
skin/classic/browser/tabview/platform.css (tabview/platform.css)
skin/classic/browser/tabview/stack-expander.png (tabview/stack-expander.png)
skin/classic/browser/tabview/tabview.png (tabview/tabview.png)
#ifdef XP_WIN
browser.jar:
@ -177,10 +177,10 @@ browser.jar:
skin/classic/aero/browser/tabbrowser/tab.png (tabbrowser/tab.png)
skin/classic/aero/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png)
skin/classic/aero/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/aero/browser/tabcandy/edit-light.png (tabcandy/edit-light.png)
skin/classic/aero/browser/tabcandy/edit.png (tabcandy/edit.png)
skin/classic/aero/browser/tabcandy/new-tab.png (tabcandy/new-tab.png)
skin/classic/aero/browser/tabcandy/platform.css (tabcandy/platform.css)
skin/classic/aero/browser/tabcandy/stack-expander.png (tabcandy/stack-expander.png)
skin/classic/aero/browser/tabcandy/tabcandy.png (tabcandy/tabcandy.png)
skin/classic/aero/browser/tabview/edit-light.png (tabview/edit-light.png)
skin/classic/aero/browser/tabview/edit.png (tabview/edit.png)
skin/classic/aero/browser/tabview/new-tab.png (tabview/new-tab.png)
skin/classic/aero/browser/tabview/platform.css (tabview/platform.css)
skin/classic/aero/browser/tabview/stack-expander.png (tabview/stack-expander.png)
skin/classic/aero/browser/tabview/tabview.png (tabview/tabview.png)
#endif

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 46 KiB

После

Ширина:  |  Высота:  |  Размер: 46 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 46 KiB

После

Ширина:  |  Высота:  |  Размер: 46 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 466 B

После

Ширина:  |  Высота:  |  Размер: 466 B

Просмотреть файл

@ -1,5 +1,5 @@
/* This file is for platform-specific CSS for TabCandy, and is loaded after the
platform-independent tabcandy.css, to allow overwriting.
/* This file is for platform-specific CSS for TabView, and is loaded after the
platform-independent tabview.css, to allow overwriting.
*/
.close {

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 49 KiB

После

Ширина:  |  Высота:  |  Размер: 49 KiB

Просмотреть файл

До

Ширина:  |  Высота:  |  Размер: 397 B

После

Ширина:  |  Высота:  |  Размер: 397 B