зеркало из https://github.com/mozilla/gecko-dev.git
Bug 400745 - Re-remove favicon cache. r+a=mconnor
This commit is contained in:
rflint@ryanflint.com
Родитель
9b94d27295
Коммит
d7267dc63d
|
|
@ -58,7 +58,7 @@
|
|||
# All DTD information is stored in a separate file so that it can be shared by
|
||||
# hiddenWindow.xul.
|
||||
#include browser-doctype.inc
|
||||
|
||||
|
||||
<window id="main-window"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
<!-- bookmarks toolbar tooltip -->
|
||||
<tooltip id="btTooltip" noautohide="true"
|
||||
onpopupshowing="return BookmarksEventHandler.fillInBTTooltip(document.tooltipNode)">
|
||||
<vbox id="btTooltipTextBox" flex="1">
|
||||
<vbox id="btTooltipTextBox" flex="1">
|
||||
<label id="btTitleText" />
|
||||
<label id="btUrlText" />
|
||||
</vbox>
|
||||
|
|
@ -212,7 +212,7 @@
|
|||
oncommand="gotoHistoryIndex(event); event.stopPropagation();"
|
||||
onclick="checkForMiddleClick(this, event);"/>
|
||||
</toolbarbutton>
|
||||
|
||||
|
||||
<toolbarbutton id="forward-button" type="menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
chromedir="&locale.dir;"
|
||||
label="&forwardCmd.label;"
|
||||
|
|
@ -226,12 +226,12 @@
|
|||
oncommand="gotoHistoryIndex(event); event.stopPropagation()"
|
||||
onclick="checkForMiddleClick(this, event);"/>
|
||||
</toolbarbutton>
|
||||
|
||||
|
||||
<toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
label="&reloadCmd.label;"
|
||||
command="Browser:Reload"
|
||||
tooltiptext="&reloadButton.tooltip;"/>
|
||||
|
||||
|
||||
<toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
label="&stopCmd.label;"
|
||||
command="Browser:Stop"
|
||||
|
|
@ -250,12 +250,12 @@
|
|||
<textbox id="urlbar" flex="1"
|
||||
chromedir="&locale.dir;"
|
||||
type="autocomplete"
|
||||
autocompletesearch="history"
|
||||
autocompletesearch="history"
|
||||
autocompletepopup="PopupAutoComplete"
|
||||
completeselectedindex="true"
|
||||
tabscrolling="true"
|
||||
showcommentcolumn="true"
|
||||
showimagecolumn="true"
|
||||
showimagecolumn="true"
|
||||
enablehistory="true"
|
||||
maxrows="10"
|
||||
newlines="stripsurroundingwhitespace"
|
||||
|
|
@ -274,8 +274,7 @@
|
|||
ondraggesture="PageProxyDragGesture(event);"
|
||||
onload="this.parentNode.selectedIndex = 1;
|
||||
event.stopPropagation();"
|
||||
onerror="gBrowser.addToMissedIconCache(this.src);
|
||||
this.removeAttribute('src');
|
||||
onerror="this.removeAttribute('src');
|
||||
this.parentNode.selectedIndex = 0;"
|
||||
tooltiptext="&proxyIcon.tooltip;"/>
|
||||
</deck>
|
||||
|
|
@ -317,7 +316,7 @@
|
|||
</hbox>
|
||||
</toolbaritem>
|
||||
|
||||
<toolbaritem id="search-container" title="&searchItem.title;"
|
||||
<toolbaritem id="search-container" title="&searchItem.title;"
|
||||
align="center" class="chromeclass-toolbar-additional"
|
||||
flex="100" persist="width">
|
||||
<searchbar id="searchbar" flex="1" chromedir="&locale.dir;"
|
||||
|
|
@ -334,7 +333,7 @@
|
|||
|
||||
<toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;">
|
||||
<hbox id="bookmarksBarContent" flex="1" type="places"
|
||||
context="placesContext" asyncinit="true"
|
||||
context="placesContext" asyncinit="true"
|
||||
onclick="BookmarksEventHandler.onClick(event);"
|
||||
oncommand="BookmarksEventHandler.onCommand(event);"
|
||||
onpopupshowing="BookmarksEventHandler.onPopupShowing(event);"
|
||||
|
|
@ -368,7 +367,7 @@
|
|||
tooltiptext="&newTabButton.tooltip;"
|
||||
ondragover="nsDragAndDrop.dragOver(event, newTabButtonObserver);"
|
||||
ondragdrop="nsDragAndDrop.drop(event, newTabButtonObserver);"
|
||||
ondragexit="nsDragAndDrop.dragExit(event, newTabButtonObserver);"/>
|
||||
ondragexit="nsDragAndDrop.dragExit(event, newTabButtonObserver);"/>
|
||||
|
||||
<toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
label="&newNavigatorCmd.label;"
|
||||
|
|
@ -397,7 +396,7 @@
|
|||
|
||||
<toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
|
||||
toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
|
||||
fullscreentoolbar="true" mode="icons"
|
||||
fullscreentoolbar="true" mode="icons"
|
||||
customizable="true"
|
||||
#ifdef XP_MACOSX
|
||||
defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,splitter,search-container,throbber-box"
|
||||
|
|
@ -422,28 +421,28 @@
|
|||
</hbox>
|
||||
#endif
|
||||
</toolbar>
|
||||
|
||||
|
||||
<toolbarset id="customToolbars" context="toolbar-context-menu"/>
|
||||
|
||||
<toolbar id="PersonalToolbar" mode="icons" iconsize="small"
|
||||
<toolbar id="PersonalToolbar" mode="icons" iconsize="small"
|
||||
class="chromeclass-directories"
|
||||
context="toolbar-context-menu"
|
||||
context="toolbar-context-menu"
|
||||
defaultset="bookmarksBarShowPlaces,personal-bookmarks"
|
||||
toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
|
||||
customizable="true"/>
|
||||
</toolbox>
|
||||
|
||||
|
||||
<hbox flex="1" id="browser">
|
||||
<vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
|
||||
<sidebarheader align="center">
|
||||
<label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
|
||||
<image id="sidebar-throbber"/>
|
||||
<toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
|
||||
</sidebarheader>
|
||||
</sidebarheader>
|
||||
<browser id="sidebar" flex="1" autoscroll="false"
|
||||
style="min-width: 14em; width: 18em; max-width: 36em;"/>
|
||||
</vbox>
|
||||
|
||||
</vbox>
|
||||
|
||||
<splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
|
||||
<vbox id="appcontent" flex="1">
|
||||
<tabbrowser id="content" disablehistory="true"
|
||||
|
|
@ -465,7 +464,7 @@
|
|||
#endif
|
||||
|
||||
<findbar browserid="content" id="FindToolbar"/>
|
||||
|
||||
|
||||
<statusbar class="chromeclass-status" id="status-bar"
|
||||
ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
|
||||
<statusbarpanel id="statusbar-display" label="" flex="1"/>
|
||||
|
|
@ -474,8 +473,8 @@
|
|||
</statusbarpanel>
|
||||
<statusbarpanel id="security-button" class="statusbarpanel-iconic-text"
|
||||
ondblclick="if (event.button == 0) displaySecurityInfo();"/>
|
||||
<statusbarpanel id="page-report-button" type="menu"
|
||||
class="statusbarpanel-menu-iconic"
|
||||
<statusbarpanel id="page-report-button" type="menu"
|
||||
class="statusbarpanel-menu-iconic"
|
||||
tooltiptext="&pageReportIcon.tooltip;">
|
||||
<menupopup onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
|
||||
<menuitem observes="blockedPopupAllowSite"/>
|
||||
|
|
@ -486,4 +485,4 @@
|
|||
</statusbarpanel>
|
||||
</statusbar>
|
||||
</window>
|
||||
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче