wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge f-t to m-c.

Browse Source
This commit is contained in:
Ms2ger 2014-02-09 10:20:59 +01:00
commit d9f44b0752
18 changed files with 168 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,10 +280,6 @@ toolbarpaletteitem > #personal-bookmarks > #bookmarks-toolbar-placeholder,
direction: rtl;
}
#panelMenu_bookmarksMenu {
overflow-x: hidden;
overflow-y: auto;
}
#panelMenu_bookmarksMenu > .bookmark-item {
max-width: none;
}
@ -894,14 +890,14 @@ chatbox:-moz-full-screen-ancestor > .chat-titlebar {
}
/* Customize mode */
#navigator-toolbox > toolbar:not(#TabsToolbar),
#navigator-toolbox > toolbar,
#content-deck {
transition-property: margin-left, margin-right;
transition-duration: 150ms;
transition-timing-function: ease-out;
}
#tab-view-deck[fastcustomizeanimation] #navigator-toolbox > toolbar:not(#TabsToolbar),
#tab-view-deck[fastcustomizeanimation] #navigator-toolbox > toolbar,
#tab-view-deck[fastcustomizeanimation] #content-deck {
transition-duration: 1ms;
transition-timing-function: linear;

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

@ -5281,9 +5281,12 @@ function FoldCharset(charset) {
// for the purpose of the check mark.
if (charset == "ISO-8859-8-I") {
return "windows-1255";
} else if (charset == "gb18030") {
}
if (charset == "gb18030") {
return "gbk";
}
return charset;
}

9
browser/components/customizableui/content/panelUI.inc.xul
View File

@ -52,6 +52,7 @@
<panelview id="PanelUI-history" flex="1">
<label value="&appMenuHistory.label;" class="panel-subview-header"/>
<vbox class="panel-subview-body">
<toolbarbutton id="appMenuViewHistorySidebar"
label="&appMenuHistory.viewSidebar.label;"
type="checkbox"
@ -80,6 +81,7 @@
<vbox id="PanelUI-recentlyClosedWindows" tooltip="bhTooltip"/>
<menuseparator id="PanelUI-historyItems-separator"/>
<vbox id="PanelUI-historyItems" tooltip="bhTooltip"/>
</vbox>
<toolbarbutton id="PanelUI-historyMore"
class="panel-subview-footer subviewbutton"
label="&appMenuHistory.showAll.label;"
@ -88,6 +90,7 @@
<panelview id="PanelUI-bookmarks" flex="1" class="PanelUI-subView">
<label value="&bookmarksMenu.label;" class="panel-subview-header"/>
<vbox class="panel-subview-body">
<toolbarbutton id="panelMenuBookmarkThisPage"
class="subviewbutton"
observes="bookmarkThisPageBroadcaster"
@ -126,6 +129,7 @@
tooltip="bhTooltip">
<!-- bookmarks menu items will go here -->
</toolbaritem>
</vbox>
<toolbarbutton id="panelMenu_showAllBookmarks"
label="&showAllBookmarks2.label;"
class="subviewbutton panel-subview-footer"
@ -146,12 +150,12 @@
<panelview id="PanelUI-developer" flex="1">
<label value="&webDeveloperMenu.label;" class="panel-subview-header"/>
<vbox id="PanelUI-developerItems"/>
<vbox id="PanelUI-developerItems" class="panel-subview-body"/>
</panelview>
<panelview id="PanelUI-characterEncodingView" flex="1">
<label value="&charsetMenu.label;" class="panel-subview-header"/>
<vbox class="panel-subview-body">
<vbox id="PanelUI-characterEncodingView-pinned"
class="PanelUI-characterEncodingView-list"/>
<toolbarseparator/>
@ -163,6 +167,7 @@
<vbox id="PanelUI-characterEncodingView-autodetect"
class="PanelUI-characterEncodingView-list"/>
</vbox>
</vbox>
</panelview>
</panelmultiview>

1
browser/components/customizableui/content/panelUI.js
View File

@ -295,7 +295,6 @@ const PanelUI = {
tempPanel.setAttribute("type", "arrow");
tempPanel.setAttribute("id", "customizationui-widget-panel");
tempPanel.setAttribute("class", "cui-widget-panel");
tempPanel.setAttribute("level", "top");
tempPanel.setAttribute("context", "");
document.getElementById(CustomizableUI.AREA_NAVBAR).appendChild(tempPanel);
// If the view has a footer, set a convenience class on the panel.

28
browser/components/customizableui/content/panelUI.xml
View File

@ -200,8 +200,7 @@
this._currentSubView = viewNode;
// Now we have to transition to transition the panel. There are a few parts
// to this:
// Now we have to transition the panel. There are a few parts to this:
//
// 1) The main view content gets shifted so that the center of the anchor
// node is at the left-most edge of the panel.
@ -222,7 +221,9 @@
this._viewContainer.removeEventListener("transitionend", trans);
this._transitioning = false;
}.bind(this));
this._viewContainer.style.height = this._subViews.scrollHeight + "px";
let newHeight = this._heightOfSubview(viewNode);
this._viewContainer.style.height = newHeight + "px";
this._subViewObserver.observe(viewNode, {
attributes: true,
@ -293,7 +294,7 @@
break;
case "popuphidden":
this.removeAttribute("panelopen");
this._mainView.style.height = "";
this._mainView.style.removeProperty("height");
this.showMainView();
break;
}
@ -313,8 +314,8 @@
<method name="_syncContainerWithSubView">
<body><![CDATA[
if (!this.ignoreMutations && this.showingSubView) {
this._viewContainer.style.height =
this._subViews.scrollHeight + "px";
let newHeight = this._heightOfSubview(this._currentSubView);
this._viewContainer.style.height = newHeight + "px";
}
]]></body>
</method>
@ -327,6 +328,21 @@
]]></body>
</method>
<method name="_heightOfSubview">
<parameter name="aSubview"/>
<body><![CDATA[
let body = aSubview.querySelector(".panel-subview-body");
let height = body ? body.scrollHeight : aSubview.scrollHeight;
if (body) {
let header = aSubview.querySelector(".panel-subview-header");
let footer = aSubview.querySelector(".panel-subview-footer");
height += (header ? header.scrollHeight : 0) +
(footer ? footer.scrollHeight : 0);
}
return height;
]]></body>
</method>
</implementation>
</binding>

12
browser/components/preferences/connection.js
View File

@ -68,6 +68,16 @@ var gConnectionsDialog = {
this.updateReloadButton();
},
updateDNSPref: function ()
{
var socksVersionPref = document.getElementById("network.proxy.socks_version");
var socksDNSPref = document.getElementById("network.proxy.socks_remote_dns");
var proxyTypePref = document.getElementById("network.proxy.type");
var isDefinitelySocks4 = !socksVersionPref.disabled && socksVersionPref.value == 4;
socksDNSPref.disabled = (isDefinitelySocks4 || proxyTypePref.value == 0);
return undefined;
},
updateReloadButton: function ()
{
// Disable the "Reload PAC" button if the selected proxy type is not PAC or
@ -126,7 +136,7 @@ var gConnectionsDialog = {
}
var socksVersionPref = document.getElementById("network.proxy.socks_version");
socksVersionPref.disabled = proxyTypePref.value != 1 || shareProxiesPref.value;
this.updateDNSPref();
return undefined;
},

6
browser/components/preferences/connection.xul
View File

@ -37,7 +37,8 @@
<preference id="network.proxy.ssl_port" name="network.proxy.ssl_port" type="int"/>
<preference id="network.proxy.socks" name="network.proxy.socks" type="string"/>
<preference id="network.proxy.socks_port" name="network.proxy.socks_port" type="int"/>
<preference id="network.proxy.socks_version" name="network.proxy.socks_version" type="int"/>
<preference id="network.proxy.socks_version" name="network.proxy.socks_version" type="int" onchange="gConnectionsDialog.updateDNSPref();"/>
<preference id="network.proxy.socks_remote_dns" name="network.proxy.socks_remote_dns" type="bool"/>
<preference id="network.proxy.no_proxies_on" name="network.proxy.no_proxies_on" type="string"/>
<preference id="network.proxy.autoconfig_url" name="network.proxy.autoconfig_url" type="string"/>
<preference id="network.proxy.share_proxy_settings"
@ -133,11 +134,14 @@
</row>
<row>
<spacer/>
<box pack="start">
<radiogroup id="networkProxySOCKSVersion" orient="horizontal"
preference="network.proxy.socks_version">
<radio id="networkProxySOCKSVersion4" value="4" label="&socks4.label;" accesskey="&socks4.accesskey;" />
<radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" accesskey="&socks5.accesskey;" />
</radiogroup>
<checkbox id="networkProxySOCKSRemoteDNS" preference="network.proxy.socks_remote_dns" label="&socksRemoteDNS.label;" accesskey="&socksRemoteDNS.accesskey;" />
</box>
</row>
<label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
<textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>

5
browser/devtools/scratchpad/scratchpad.xul
View File

@ -191,6 +191,11 @@
accesskey="&gotoLineCmd.accesskey;"
key="key_gotoLine"
command="cmd_gotoLine"/>
<menuitem id="sp-menu-pprint"
label="&pprint.label;"
accesskey="&pprint.accesskey;"
key="sp-key-pprint"
command="sp-cmd-pprint"/>
</menupopup>
</menu>

1
browser/devtools/scratchpad/test/browser_scratchpad_ui.js
View File

@ -32,6 +32,7 @@ function runTests()
"sp-text-reloadAndRun" : "reloadAndRun",
"sp-menu-content": "setContentContext",
"sp-menu-browser": "setBrowserContext",
"sp-menu-pprint":"prettyPrint",
};
let lastMethodCalled = null;

2
browser/locales/en-US/chrome/browser/devtools/debugger.properties
View File

@ -79,7 +79,7 @@ noSourcesText=This page has no sources.
# LOCALIZATION NOTE (loadingSourcesText): The text to display in the sources menu
# when waiting for scripts to load.
loadingSourcesText=Waiting for sources...
loadingSourcesText=Waiting for sources…
# LOCALIZATION NOTE (noEventListenersText): The text to display in the events tab
# when there are no events.

4
browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd
View File

@ -114,7 +114,7 @@
<!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
- in the network details footer for the performance analysis button. -->
<!ENTITY netmonitorUI.footer.perf "Toggle performance analysis...">
<!ENTITY netmonitorUI.footer.perf "Toggle performance analysis…">
<!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
- the button that toggles the panes visible or hidden in the netmonitor UI. -->
@ -188,7 +188,7 @@
<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
- on the context menu that shows the performance analysis tools -->
<!ENTITY netmonitorUI.context.perfTools "Start Performance Analysis...">
<!ENTITY netmonitorUI.context.perfTools "Start Performance Analysis…">
<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
- for the performance analysis menu item displayed in the context menu for a request -->

1
browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
View File

@ -67,6 +67,7 @@
<!ENTITY pprint.label "Pretty Print">
<!ENTITY pprint.key "p">
<!ENTITY pprint.accesskey "P">
<!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
- renamed from "Context" to avoid confusion with the right-click context

2
browser/locales/en-US/chrome/browser/preferences/connection.dtd
View File

@ -32,6 +32,8 @@
<!ENTITY socks4.accesskey "K">
<!ENTITY socks5.label "SOCKS v5">
<!ENTITY socks5.accesskey "v">
<!ENTITY socksRemoteDNS.label "Remote DNS">
<!ENTITY socksRemoteDNS.accesskey "d">
<!ENTITY port.label "Port:">
<!ENTITY HTTPport.accesskey "P">
<!ENTITY SSLport.accesskey "o">

11
browser/themes/linux/browser.css
View File

@ -29,7 +29,14 @@
-moz-appearance: none;
background-color: transparent;
border-top: none;
border-bottom: 1px solid ThreeDShadow;
}
#navigator-toolbox::after {
content: "";
display: -moz-box;
-moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
height: 1px;
background-color: ThreeDShadow;
}
#navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
@ -2008,7 +2015,7 @@ chatbox {
border-left: 3px solid transparent;
}
#main-window[customizing] #TabsToolbar::after {
#main-window[customizing] #navigator-toolbox::after {
margin-left: 2em;
margin-right: 2em;
}

3
browser/themes/osx/browser.css
View File

@ -4185,8 +4185,7 @@ window > chatbox {
}
}
#main-window[customizing] #navigator-toolbox::after,
#main-window[customize-entered] #TabsToolbar::after {
#main-window[customizing] #navigator-toolbox::after {
margin-left: 2em;
margin-right: 2em;
}

2
browser/themes/shared/customizableui/customizeMode.inc.css
View File

@ -8,7 +8,7 @@
margin: 0 2em 2em;
}
#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox > toolbar:not(#TabsToolbar) {
#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox > toolbar {
margin-left: 2em;
margin-right: 2em;
}

10
browser/themes/shared/customizableui/panelUIOverlay.inc.css
View File

@ -54,6 +54,16 @@
-moz-box-flex: 1;
}
.panel-subview-body {
overflow-y: auto;
overflow-x: hidden;
-moz-box-flex: 1;
}
#PanelUI-popup .panel-subview-body {
margin: -4px;
}
.panel-subview-header,
.subviewbutton.panel-subview-footer {
padding: 12px;

20
mobile/android/modules/Home.jsm
View File

@ -48,7 +48,7 @@ function BannerMessage(options) {
this.onclick = options.onclick;
}
let HomeBanner = {
let HomeBanner = Object.freeze({
// Holds the messages that will rotate through the banner.
_messages: {},
@ -135,7 +135,7 @@ let HomeBanner = {
Services.obs.removeObserver(this, "HomeBanner:Click");
}
}
};
});
function Panel(options) {
if ("id" in options)
@ -151,17 +151,17 @@ function Panel(options) {
this.views = options.views;
}
let HomePanels = {
let HomePanels = Object.freeze({
// Valid layouts for a panel.
Layout: {
Layout: Object.freeze({
FRAME: "frame"
},
}),
// Valid types of views for a dataset.
View: {
View: Object.freeze({
LIST: "list",
GRID: "grid"
},
}),
// Holds the currrent set of registered panels.
_panels: {},
@ -254,10 +254,10 @@ let HomePanels = {
}
return false;
}
};
});
// Public API
this.Home = {
this.Home = Object.freeze({
banner: HomeBanner,
panels: HomePanels,
@ -269,4 +269,4 @@ this.Home = {
break;
}
}
}
});