зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1172357 - Use new tree-container class for about:welcomeback tree. r=jaws
--HG-- extra : commitid : 1hojpt41k2e extra : rebase_source : 6ddfe723a1d259a2ce820d6c057a416578eafd59
This commit is contained in:
Tim Nguyen
Родитель
7a0a967dcb
Коммит
ab0f949f17
|
|
@ -15,7 +15,7 @@
|
|||
%restorepageDTD;
|
||||
]>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
<head>
|
||||
<title>&restorepage.tabtitle;</title>
|
||||
<link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css" media="all"/>
|
||||
|
|
@ -52,29 +52,31 @@
|
|||
<label class="radioRestoreLabel" for="radioRestoreChoose">&welcomeback2.label.restoreSome;</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<tree xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
id="tabList" flex="1" seltype="single" hidecolumnpicker="true"
|
||||
onclick="onListClick(event);" onkeydown="onListKeyDown(event);"
|
||||
_window_label="&restorepage.windowLabel;">
|
||||
<treecols>
|
||||
<treecol cycler="true" id="restore" type="checkbox" label="&restorepage.restoreHeader;"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol primary="true" id="title" label="&restorepage.listHeader;" flex="1"/>
|
||||
</treecols>
|
||||
<treechildren flex="1"/>
|
||||
</tree>
|
||||
|
||||
<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="button-container">
|
||||
<button class="primary"
|
||||
id="errorTryAgain"
|
||||
label="&welcomeback2.restoreButton;"
|
||||
accesskey="&welcomeback2.restoreButton.access;"
|
||||
oncommand="restoreSession();"/>
|
||||
</hbox>
|
||||
|
||||
<input type="text" id="sessionData" style="display: none;"/>
|
||||
</div>
|
||||
|
||||
<div class="tree-container">
|
||||
<xul:tree id="tabList" flex="1" seltype="single" hidecolumnpicker="true"
|
||||
onclick="onListClick(event);" onkeydown="onListKeyDown(event);"
|
||||
_window_label="&restorepage.windowLabel;">
|
||||
<xul:treecols>
|
||||
<xul:treecol cycler="true" id="restore" type="checkbox" label="&restorepage.restoreHeader;"/>
|
||||
<xul:splitter class="tree-splitter"/>
|
||||
<xul:treecol primary="true" id="title" label="&restorepage.listHeader;" flex="1"/>
|
||||
</xul:treecols>
|
||||
<xul:treechildren flex="1"/>
|
||||
</xul:tree>
|
||||
</div>
|
||||
|
||||
<div class="button-container">
|
||||
<xul:button class="primary"
|
||||
id="errorTryAgain"
|
||||
label="&welcomeback2.restoreButton;"
|
||||
accesskey="&welcomeback2.restoreButton.access;"
|
||||
oncommand="restoreSession();"/>
|
||||
</div>
|
||||
|
||||
<input type="text" id="sessionData" style="display: none;"/>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ window.onload = function() {
|
|||
};
|
||||
|
||||
function isTreeViewVisible() {
|
||||
let tabList = document.getElementById("tabList");
|
||||
let tabList = document.querySelector(".tree-container");
|
||||
return tabList.hasAttribute("available");
|
||||
}
|
||||
|
||||
|
|
@ -99,11 +99,14 @@ function initTreeView() {
|
|||
|
||||
// User actions
|
||||
function updateTabListVisibility() {
|
||||
let tabList = document.getElementById("tabList");
|
||||
let tabList = document.querySelector(".tree-container");
|
||||
let container = document.querySelector(".container");
|
||||
if (document.getElementById("radioRestoreChoose").checked) {
|
||||
tabList.setAttribute("available", "true");
|
||||
container.classList.add("restore-chosen");
|
||||
} else {
|
||||
tabList.removeAttribute("available");
|
||||
container.classList.remove("restore-chosen");
|
||||
}
|
||||
initTreeView();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
<body dir="&locale.dir;">
|
||||
|
||||
<div class="container flex">
|
||||
<div class="container restore-chosen">
|
||||
|
||||
<div class="title">
|
||||
<h1 class="title-text">&restorepage.errorTitle;</h1>
|
||||
|
|
@ -43,10 +43,10 @@
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tree-container">
|
||||
<div class="tree-container" available="true">
|
||||
<xul:tree id="tabList" seltype="single" hidecolumnpicker="true"
|
||||
onclick="onListClick(event);" onkeydown="onListKeyDown(event);"
|
||||
available="true" _window_label="&restorepage.windowLabel;">
|
||||
_window_label="&restorepage.windowLabel;">
|
||||
<xul:treecols>
|
||||
<xul:treecol cycler="true" id="restore" type="checkbox" label="&restorepage.restoreHeader;"/>
|
||||
<xul:splitter class="tree-splitter"/>
|
||||
|
|
|
|||
|
|
@ -13,14 +13,10 @@
|
|||
/* tablist starts out hidden, but JS may make it visible in response to
|
||||
clicks on the radio buttons by setting an "available" attribute.
|
||||
*/
|
||||
#tabList {
|
||||
.tree-container:not([available]) {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#tabList[available] {
|
||||
display: -moz-box;
|
||||
}
|
||||
|
||||
treechildren::-moz-tree-image(icon),
|
||||
treechildren::-moz-tree-image(noicon) {
|
||||
padding-right: 2px;
|
||||
|
|
@ -48,4 +44,4 @@ treechildren::-moz-tree-image(partial) {
|
|||
}
|
||||
treechildren::-moz-tree-image(partial, selected) {
|
||||
list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial-inverted");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ body {
|
|||
max-width: 52em;
|
||||
}
|
||||
|
||||
.container.flex {
|
||||
.container.restore-chosen {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-grow: 1;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче