Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out zeniko's patch from bug 386228 due to Ts/Txul regressions.

Browse Source
This commit is contained in:
reed@reedloden.com 2008-01-28 11:04:27 -08:00
parent 2ee3c4a31f
commit 0aaafe014a
4 changed files with 6 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
browser/base/content/bindings.xml
View File

@ -1,80 +0,0 @@
<?xml version="1.0"?>
# -*- Mode: HTML -*-
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org browser.
#
# The Initial Developer of the Original Code is
# Simon Bünzli <zeniko@gmail.com>
# Portions created by the Initial Developer are Copyright (C) 2007 - 2008
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
<!DOCTYPE bindings SYSTEM "chrome://global/locale/global.dtd">
<bindings xmlns="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl"
>
<binding id="unified-back-forward-button-wrapper" display="xul:menu"
extends="chrome://global/content/bindings/toolbarbutton.xml#menu">
<content>
<children includes="toolbarbutton|observes|template|menupopup|tooltip"/>
<xul:dropmarker type="menu-button"
class="toolbarbutton-menubutton-dropmarker"
chromedir="&locale.dir;"
xbl:inherits="align,dir,pack,orient,disabled,toolbarmode,buttonstyle"
/>
</content>
<implementation>
<constructor><![CDATA[
this._updateUnifiedState();
]]></constructor>
<method name="_updateUnifiedState">
<body><![CDATA[
var canGoBack = !document.getElementById("Browser:Back").hasAttribute("disabled");
var canGoForward = !document.getElementById("Browser:Forward").hasAttribute("disabled");
if (canGoBack || canGoForward)
this.removeAttribute("disabled");
else
this.setAttribute("disabled", "true");
]]></body>
</method>
</implementation>
<handlers>
<!-- observing state changes of the child buttons -->
<handler event="broadcast" action="this._updateUnifiedState();"/>
</handlers>
</binding>
</bindings>

11
browser/base/content/browser.css
View File

@ -23,17 +23,6 @@ toolbar[printpreview="true"] {
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup");
}
/* ::::: Unified Back-/Forward Button ::::: */
#unified-back-forward-button {
-moz-binding: url("chrome://browser/content/bindings.xml#unified-back-forward-button-wrapper");
}
#unified-back-forward-button > toolbarbutton > dropmarker {
display: none; /* we provide our own */
}
.unified-nav-current {
font-weight: bold;
}
menuitem.spell-suggestion {
font-weight: bold;
}

93
browser/base/content/browser.js
View File

@ -181,45 +181,6 @@ function UpdateBackForwardCommands(aWebNavigation)
}
}
var UnifiedBackForwardButton = {
unify: function() {
var backButton = document.getElementById("back-button");
if (!backButton || !backButton.nextSibling || backButton.nextSibling.id != "forward-button")
return; // back and forward buttons aren't adjacent
var wrapper = document.createElement("toolbaritem");
wrapper.id = "unified-back-forward-button";
wrapper.className = "chromeclass-toolbar-additional";
wrapper.setAttribute("context", "backMenu");
var toolbar = backButton.parentNode;
toolbar.insertBefore(wrapper, backButton);
var forwardButton = backButton.nextSibling;
wrapper.appendChild(backButton);
wrapper.appendChild(forwardButton);
var popup = backButton.getElementsByTagName("menupopup")[0].cloneNode(true);
wrapper.appendChild(popup);
this._unified = true;
},
separate: function() {
if (!this._unified)
return;
var wrapper = document.getElementById("unified-back-forward-button");
var toolbar = wrapper.parentNode;
toolbar.insertBefore(wrapper.firstChild, wrapper); // Back button
toolbar.insertBefore(wrapper.firstChild, wrapper); // Forward button
toolbar.removeChild(wrapper);
this._unified = false;
}
};
#ifdef XP_MACOSX
/**
* Click-and-Hold implementation for the Back and Forward buttons
@ -959,7 +920,6 @@ function delayedStartup()
sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
}
UnifiedBackForwardButton.unify();
UpdateUrlbarSearchSplitterState();
try {
@ -1484,14 +1444,12 @@ function BrowserHandleShiftBackspace()
function BrowserBackMenu(event)
{
var menuType = UnifiedBackForwardButton._unified ? "unified" : "back";
return FillHistoryMenu(event.target, menuType);
return FillHistoryMenu(event.target, "back");
}
function BrowserForwardMenu(event)
{
var menuType = UnifiedBackForwardButton._unified ? "unified" : "forward";
return FillHistoryMenu(event.target, menuType);
return FillHistoryMenu(event.target, "forward");
}
function BrowserStop()
@ -2976,7 +2934,6 @@ function FillHistoryMenu(aParent, aMenu)
var webNav = getWebNavigation();
var sessionHistory = webNav.sessionHistory;
var bundle_browser = document.getElementById("bundle_browser");
var count = sessionHistory.count;
var index = sessionHistory.index;
@ -2993,8 +2950,7 @@ function FillHistoryMenu(aParent, aMenu)
{
entry = sessionHistory.getEntryAtIndex(j, false);
if (entry)
createMenuItem(aParent, j, entry.title || entry.URI.spec,
bundle_browser.getString("tabHistory.goBack"));
createMenuItem(aParent, j, entry.title);
}
break;
case "forward":
@ -3004,39 +2960,9 @@ function FillHistoryMenu(aParent, aMenu)
{
entry = sessionHistory.getEntryAtIndex(j, false);
if (entry)
createMenuItem(aParent, j, entry.title || entry.URI.spec,
bundle_browser.getString("tabHistory.goForward"));
createMenuItem(aParent, j, entry.title);
}
break;
case "unified":
if (count <= 1) // don't display the popup for a single item
return false;
var half_length = Math.floor(MAX_HISTORY_MENU_ITEMS / 2);
var start = Math.max(index - half_length, 0);
end = Math.min(start == 0 ? MAX_HISTORY_MENU_ITEMS : index + half_length + 1, count);
if (end == count)
start = Math.max(count - MAX_HISTORY_MENU_ITEMS, 0);
var tooltips = [
bundle_browser.getString("tabHistory.goBack"),
bundle_browser.getString("tabHistory.current"),
bundle_browser.getString("tabHistory.goForward")
];
var classNames = ["unified-nav-back", "unified-nav-current", "unified-nav-forward"];
for (var j = end - 1; j >= start; j--) {
entry = sessionHistory.getEntryAtIndex(j, false);
var tooltip = tooltips[j < index ? 0 : j == index ? 1 : 2];
var className = classNames[j < index ? 0 : j == index ? 1 : 2];
var item = createMenuItem(aParent, j, entry.title || entry.URI.spec, tooltip, className);
if (j == index) { // mark the current history item
item.setAttribute("type", "radio");
item.setAttribute("checked", "true");
}
}
break;
}
return true;
@ -3058,16 +2984,12 @@ function addToUrlbarHistory(aUrlToAdd)
}
}
function createMenuItem(aParent, aIndex, aLabel, aTooltipText, aClassName)
function createMenuItem( aParent, aIndex, aLabel)
{
var menuitem = document.createElement( "menuitem" );
menuitem.setAttribute( "label", aLabel );
menuitem.setAttribute( "index", aIndex );
if (aTooltipText)
menuitem.setAttribute("tooltiptext", aTooltipText);
if (aClassName)
menuitem.className = aClassName;
return aParent.appendChild(menuitem);
aParent.appendChild( menuitem );
}
function deleteHistoryItems(aParent)
@ -3166,8 +3088,6 @@ function BrowserCustomizeToolbar()
var cmd = document.getElementById("cmd_CustomizeToolbars");
cmd.setAttribute("disabled", "true");
UnifiedBackForwardButton.separate();
var splitter = document.getElementById("urlbar-search-splitter");
if (splitter)
splitter.parentNode.removeChild(splitter);
@ -3210,7 +3130,6 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
#endif
}
UnifiedBackForwardButton.unify();
UpdateUrlbarSearchSplitterState();
// Update the urlbar

1
browser/base/jar.mn
View File

@ -13,7 +13,6 @@ browser.jar:
* content/browser/aboutDialog.xul (content/aboutDialog.xul)
* content/browser/aboutDialog.js (content/aboutDialog.js)
content/browser/aboutDialog.css (content/aboutDialog.css)
* content/browser/bindings.xml (content/bindings.xml)
* content/browser/browser.css (content/browser.css)
* content/browser/browser.js (content/browser.js)
* content/browser/browser.xul (content/browser.xul)