Bug 1471542 - Remove support for tree[seltype=cell] and tree[seltype=text]. r=Paolo

MozReview-Commit-ID: BW9u3CvvP1p

--HG--
extra : rebase_source : bf0895ac41708fa62125109a480f6dd172a03798
This commit is contained in:
Tim Nguyen 2018-06-27 18:35:18 +01:00
parent a895c895dc
commit 73ad4c957d
11 changed files with 8 additions and 562 deletions

View File

@ -50,7 +50,7 @@
var isTreeMultiSelectable = false;
var seltype = this.DOMNode.getAttribute("seltype");
if (seltype != "single" && seltype != "cell" && seltype != "text")
if (seltype != "single")
isTreeMultiSelectable = true;
// selectAll
@ -110,8 +110,6 @@
gQueue = new eventQueue(EVENT_REORDER);
gQueue.push(new statesChecker("tree", new nsTreeTreeView()));
gQueue.push(new statesChecker("treesingle", new nsTreeTreeView()));
gQueue.push(new statesChecker("treecell", new nsTreeTreeView()));
gQueue.push(new statesChecker("treetext", new nsTreeTreeView()));
gQueue.push(new statesChecker("tabletree", new nsTreeTreeView()));
gQueue.invoke(); // Will call SimpleTest.finish();
@ -156,20 +154,6 @@
<treechildren/>
</tree>
<tree id="treecell" flex="1" seltype="cell">
<treecols>
<treecol id="col_cell" flex="1" primary="true" label="column"/>
</treecols>
<treechildren/>
</tree>
<tree id="treetext" flex="1" seltype="text">
<treecols>
<treecol id="col_text" flex="1" primary="true" label="column"/>
</treecols>
<treechildren/>
</tree>
<tree id="tabletree" flex="1" editable="true">
<treecols>
<treecol id="tabletree_col1" cycler="true" label="cycler"/>

View File

@ -1,50 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait" onload="setTimeout(boom, 30);">
<script>
function boom()
{
var tree = document.getElementById("thetree");
var selection = tree.view.selection;
var treecolumn0 = tree.columns[0];
var treecolumn1 = tree.columns[1];
selection.select(0);
selection.currentColumn = treecolumn0;
tree.parentNode.removeChild(tree);
// This is expected to throw an error (it used to crash).
try {
selection.currentColumn = treecolumn1;
}
catch (ex) {}
document.documentElement.removeAttribute("class");
}
</script>
<tree flex="1" id="thetree" seltype="cell">
<treecols>
<treecol label="Name"/>
<treecol label="Test"/>
</treecols>
<treechildren id="TC">
<treeitem id="TI1">
<treerow>
<treecell label="First treecell"/>
<treecell label="Second treecell"/>
</treerow>
</treeitem>
<treeitem id="TI2">
<treerow>
<treecell label="Third treecell"/>
<treecell label="Fourth treecell"/>
</treerow>
</treeitem>
</treechildren>
</tree>
</window>

View File

@ -8,7 +8,6 @@ load 391178-1.xhtml
load 391178-2.xul
load 393665-1.xul
load 399227-1.xul
load 399227-2.xul
load 399692-1.xhtml
load 399715-1.xhtml
load 409807-1.xul

View File

@ -97,7 +97,7 @@ toolkit.jar:
content/global/bindings/timepicker.js (widgets/timepicker.js)
content/global/bindings/toolbar.xml (widgets/toolbar.xml)
content/global/bindings/toolbarbutton.xml (widgets/toolbarbutton.xml)
* content/global/bindings/tree.xml (widgets/tree.xml)
content/global/bindings/tree.xml (widgets/tree.xml)
content/global/bindings/videocontrols.xml (widgets/videocontrols.xml)
* content/global/bindings/wizard.xml (widgets/wizard.xml)
content/global/elements/general.js (widgets/general.js)

View File

@ -186,7 +186,6 @@ skip-if = (os == 'mac' && os_version == '10.10') || (os == 'win') # Bug 1141245,
[test_tooltip_noautohide.xul]
[test_tree.xul]
[test_tree_hier.xul]
[test_tree_hier_cell.xul]
[test_tree_single.xul]
[test_tree_view.xul]
[test_window_intrinsic_size.xul]

View File

@ -1,136 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<!--
XUL Widget Test for cell selection tree
-->
<window title="Cell Selection Tree" width="500" height="600"
onload="setTimeout(testtag_tree, 0, 'tree-cell', 'treechildren-cell', 'cell', '', 'cell selection tree');"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<script src="tree_shared.js"/>
<tree id="tree-cell" rows="4" seltype="cell">
<treecols>
<treecol id="name" label="Name" primary="true"
sort="label" properties="one two" flex="1"/>
<treecol id="address" label="Address" flex="2"/>
<treecol id="planet" label="Planet" flex="1"/>
<treecol id="gender" label="Gender" flex="1" cycler="true"/>
</treecols>
<treechildren id="treechildren-cell">
<treeitem>
<treerow properties="firstrow">
<treecell label="Mary" value="mary" properties="firstname"/>
<treecell label="206 Garden Avenue" value="206ga"/>
<treecell label="Earth"/>
<treecell label="Female" value="f"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell/>
<treecell value="19ms"/>
<treecell label="Earth"/>
<treecell label="Male" value="m"/>
</treerow>
</treeitem>
<treeitem container="true">
<treerow>
<treecell label="Sarah"/>
<treecell label="702 Fern Avenue" editable="false"/>
<treecell label="Saturn"/>
<treecell label="Female" value="f"/>
</treerow>
<treechildren>
<treeitem>
<treerow>
<treecell label="Mary"/>
<treecell label="206 Garden Avenue"/>
<treecell label="Female" value="f"/>
<treecell label="Neptune"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell label="Chris"/>
<treecell label="19 Marion Street"/>
<treecell label="Omicron Persei 8"/>
<treecell label="Male" value="m"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell label="Sarah"/>
<treecell label="702 Fern Avenue" editable="false"/>
<treecell label="Earth"/>
<treecell label="Female" value="f"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell label="John"/>
<treecell label="99 Westminster Avenue"/>
<treecell label="Neptune"/>
<treecell label="Male" value="m"/>
</treerow>
</treeitem>
</treechildren>
</treeitem>
<treeitem>
<treerow>
<treecell label="John"/>
<treecell label="99 Westminster Avenue"/>
<treecell/>
<treecell label="Male" value="m"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell label="Mary"/>
<treecell label="206 Garden Avenue" selectable="false"/>
<treecell label=""/>
<treecell label="Female" value="f"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell label="Chris"/>
<treecell label="19 Marion Street"/>
<treecell label="Neptune"/>
<treecell label="Male" value="m"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell label="Sarah"/>
<treecell label="702 Fern Avenue"/>
<treecell label="Earth"/>
<treecell label="Female" value="f"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell label="John"/>
<treecell label="99 Westminster Avenue"/>
<treecell label="Mars"/>
<treecell label="Male" value="m"/>
</treerow>
</treeitem>
</treechildren>
</tree>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
<!-- test code goes here -->
<script type="application/javascript"><![CDATA[
SimpleTest.waitForExplicitFinish();
]]>
</script>
</window>

View File

@ -49,17 +49,9 @@ function testtag_tree(treeid, treerowinfoid, seltype, columnstype, testid) {
// note: the functions below should be in this order due to changes made in later tests
// select the first column in cell selection mode so that the selection
// functions can be tested
if (seltype == "cell")
tree.view.selection.currentColumn = tree.columns[0];
testtag_tree_columns(tree, columnInfo, testid);
testtag_tree_TreeSelection(tree, testid, multiple);
testtag_tree_TreeSelection_UI(tree, testid, multiple);
if (seltype == "cell")
testtag_tree_TreeSelection_UI_cell(tree, testid, rowInfo);
testtag_tree_TreeView(tree, testid, rowInfo);
is(tree.editable, false, "tree should not be editable");
@ -606,8 +598,7 @@ function testtag_tree_TreeSelection_UI(tree, testid, multiple) {
selection.currentIndex = 2;
if (0) { // XXXndeakin disable these tests for now
mouseOnCell(tree, 1, tree.columns[1], "mouse on row");
testtag_tree_TreeSelection_State(tree, testid + "mouse on row", 1, [1], 0,
tree.selType == "cell" ? tree.columns[1] : null);
testtag_tree_TreeSelection_State(tree, testid + "mouse on row", 1, [1], 0, null);
}
// restore the scroll position to the start of the page
@ -637,23 +628,6 @@ function testtag_tree_UI_editing(tree, testid, rowInfo) {
if (tree.view.isContainer(row))
wasOpen = tree.view.isContainerOpen(row);
// Test whether a keystroke can enter text entry, and another can exit.
if (tree.selType == "cell") {
tree.stopEditing(false);
ok(!tree.editingColumn, "Should not be editing tree cell now");
tree.view.selection.currentColumn = ecolumn;
tree.currentIndex = rowIndex;
const isMac = (navigator.platform.includes("Mac"));
const StartEditingKey = isMac ? "RETURN" : "F2";
sendKey(StartEditingKey);
is(tree.editingColumn, ecolumn, "Should be editing tree cell now");
sendKey("ESCAPE");
ok(!tree.editingColumn, "Should not be editing tree cell now");
is(tree.currentIndex, rowIndex, "Current index should not have changed");
is(tree.view.selection.currentColumn, ecolumn, "Current column should not have changed");
}
mouseDblClickOnCell(tree, rowIndex, ecolumn, testid + "edit on double click");
is(tree.editingColumn, ecolumn, testid + "editing column");
is(tree.editingRow, rowIndex, testid + "editing row");
@ -1044,18 +1018,13 @@ function testtag_tree_TreeView_rows_sort(tree, testid, rowInfo) {
// checks if the current and selected rows are correct
// current is the index of the current row
// selected is an array of the indicies of the selected rows
// column is the selected column
// viewidx is the row that should be visible at the top of the tree
function testtag_tree_TreeSelection_State(tree, testid, current, selected, viewidx, column) {
function testtag_tree_TreeSelection_State(tree, testid, current, selected, viewidx) {
var selection = tree.view.selection;
if (!column)
column = (tree.selType == "cell") ? tree.columns[0] : null;
is(selection.count, selected.length, testid + " count");
is(tree.currentIndex, current, testid + " currentIndex");
is(selection.currentIndex, current, testid + " TreeSelection currentIndex");
is(selection.currentColumn, column, testid + " currentColumn");
if (viewidx !== null && viewidx !== undefined)
is(tree.treeBoxObject.getFirstVisibleRow(), viewidx, testid + " first visible row");

View File

@ -256,17 +256,6 @@
]]></body>
</method>
<property name="_cellSelType">
<getter>
<![CDATA[
var seltype = this.selType;
if (seltype == "cell" || seltype == "text")
return seltype;
return null;
]]>
</getter>
</property>
<method name="_getNextColumn">
<parameter name="row"/>
<parameter name="left"/>
@ -444,18 +433,6 @@
c = edge;
}
var cellSelType = this._cellSelType;
if (cellSelType) {
var column = this.view.selection.currentColumn;
if (!column)
return;
while ((offset > 0 ? c <= edge : c >= edge) && !this.view.isSelectable(c, column))
c += offset;
if (offset > 0 ? c > edge : c < edge)
return;
}
if (!this._isAccelPressed(event))
this.view.selection.timedSelect(c, this._selectDelay);
else // Ctrl+Up/Down moves the anchor without selecting
@ -670,16 +647,6 @@
return true;
}
if (/Mac/.test(navigator.platform)) {
// See if we can edit the cell.
var row = this.currentIndex;
if (this._cellSelType) {
var column = this.view.selection.currentColumn;
var startedEditing = this.startEditing(row, column);
if (startedEditing)
return true;
}
}
return this.changeOpenState(this.currentIndex);
]]></body>
</method>
@ -778,10 +745,6 @@
if (this.currentIndex == -1 && this.view.rowCount > 0) {
this.currentIndex = this.treeBoxObject.getFirstVisibleRow();
}
if (this._cellSelType && !this.view.selection.currentColumn) {
var col = this._getNextColumn(this.currentIndex, false);
this.view.selection.currentColumn = col;
}
]]>
</handler>
<handler event="blur" action="this.treeBoxObject.focused = false;"/>
@ -793,20 +756,6 @@
event.preventDefault();
}
</handler>
#ifndef XP_MACOSX
<!-- Use F2 key to enter text editing. -->
<handler event="keydown" keycode="VK_F2">
<![CDATA[
if (!this._cellSelType)
return;
var row = this.currentIndex;
var column = this.view.selection.currentColumn;
if (this.startEditing(row, column))
event.preventDefault();
]]>
</handler>
#endif // XP_MACOSX
<handler event="keydown" keycode="VK_ESCAPE">
<![CDATA[
if (this._editingColumn) {
@ -826,16 +775,7 @@
if (row < 0)
return;
var cellSelType = this._cellSelType;
var checkContainers = true;
var currentColumn;
if (cellSelType) {
currentColumn = this.view.selection.currentColumn;
if (currentColumn && !currentColumn.primary)
checkContainers = false;
}
if (checkContainers) {
if (this.changeOpenState(this.currentIndex, false)) {
event.preventDefault();
@ -843,22 +783,9 @@
}
var parentIndex = this.view.getParentIndex(this.currentIndex);
if (parentIndex >= 0) {
if (cellSelType && !this.view.isSelectable(parentIndex, currentColumn)) {
return;
}
this.view.selection.select(parentIndex);
this.treeBoxObject.ensureRowIsVisible(parentIndex);
event.preventDefault();
return;
}
}
if (cellSelType) {
var col = this._getNextColumn(row, true);
if (col) {
this.view.selection.currentColumn = col;
this.treeBoxObject.ensureCellIsVisible(row, col);
event.preventDefault();
}
}
]]>
@ -872,16 +799,7 @@
if (row < 0)
return;
var cellSelType = this._cellSelType;
var checkContainers = true;
var currentColumn;
if (cellSelType) {
currentColumn = this.view.selection.currentColumn;
if (currentColumn && !currentColumn.primary)
checkContainers = false;
}
if (checkContainers) {
if (this.changeOpenState(row, true)) {
event.preventDefault();
@ -894,25 +812,9 @@
// If already opened, select the first child.
// The getParentIndex test above ensures that the children
// are already populated and ready.
if (cellSelType && !this.view.isSelectable(c, currentColumn)) {
let col = this._getNextColumn(c, false);
if (col) {
this.view.selection.currentColumn = col;
}
}
this.view.selection.timedSelect(c, this._selectDelay);
this.treeBoxObject.ensureRowIsVisible(c);
event.preventDefault();
return;
}
}
if (cellSelType) {
let col = this._getNextColumn(row, false);
if (col) {
this.view.selection.currentColumn = col;
this.treeBoxObject.ensureCellIsVisible(row, col);
event.preventDefault();
}
}
]]>
@ -1139,25 +1041,10 @@
}
}
var cellSelType = this.parentNode._cellSelType;
if (cellSelType == "text" && cell.childElt != "text" && cell.childElt != "image")
return;
if (cellSelType) {
if (!cell.col.selectable ||
!view.isSelectable(cell.row, cell.col)) {
return;
}
}
if (!view.selection.isSelected(cell.row)) {
view.selection.select(cell.row);
b.ensureRowIsVisible(cell.row);
}
if (cellSelType) {
view.selection.currentColumn = cell.col;
}
}
]]>
</handler>
@ -1183,11 +1070,6 @@
parentIndex = view.getParentIndex(parentIndex);
if (parentIndex == cell.row) {
var parentSelectable = true;
if (this.parentNode._cellSelType) {
var currentColumn = view.selection.currentColumn;
if (!view.isSelectable(parentIndex, currentColumn))
parentSelectable = false;
}
if (parentSelectable)
view.selection.select(parentIndex);
}
@ -1223,24 +1105,8 @@
// see bug #92366
if (!cell.col.cycler && this._lastSelectedRow == cell.row &&
cell.col.type != window.TreeColumn.TYPE_CHECKBOX) {
var cellSelType = this.parentNode._cellSelType;
if (cellSelType == "text" && cell.childElt != "text" && cell.childElt != "image")
return;
if (cellSelType) {
if (!cell.col.selectable ||
!view.isSelectable(cell.row, cell.col)) {
return;
}
}
view.selection.select(cell.row);
b.ensureRowIsVisible(cell.row);
if (cellSelType) {
view.selection.currentColumn = cell.col;
}
}
]]>
</handler>

View File

@ -56,20 +56,12 @@ treechildren::-moz-tree-row(selected, current, focus) {
border: 1px dotted #F3D982;
}
tree[seltype="cell"] > treechildren::-moz-tree-row,
tree[seltype="text"] > treechildren::-moz-tree-row {
border: none;
background-color: transparent;
}
/* ::::: tree cells ::::: */
treechildren::-moz-tree-cell {
padding: 0 2px;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text,
tree[seltype="text"] > treechildren::-moz-tree-cell-text,
treechildren::-moz-tree-cell-text {
color: inherit;
}
@ -78,73 +70,16 @@ treechildren::-moz-tree-cell-text(selected) {
color: -moz-cellhighlighttext;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell {
border: 1px solid transparent;
padding: 0 1px;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text {
border: 1px solid transparent;
padding: 0 1px 1px;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) {
background-color: -moz-cellhighlight;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) {
color: -moz-cellhighlighttext;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) {
background-color: -moz-cellhighlight;
color: -moz-cellhighlighttext;
}
treechildren::-moz-tree-cell-text(selected, focus) {
color: HighlightText;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus) {
background-color: Highlight;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
background-color: Highlight;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
color: HighlightText;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
color: HighlightText;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, current, focus) {
border: 1px dotted #000000;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, current, focus) {
border: 1px dotted #000000;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, current, focus) {
border: 1px dotted #C0C0C0;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, current, focus) {
border: 1px dotted #C0C0C0;
}
/* ::::: lines connecting cells ::::: */
tree[seltype="cell"] > treechildren::-moz-tree-line,
tree[seltype="text"] > treechildren::-moz-tree-line,
treechildren::-moz-tree-line {
border: 1px dotted ThreeDShadow;
}
tree[seltype="cell"] > treechildren::-moz-tree-line(active, selected, focus),
treechildren::-moz-tree-line(selected, focus) {
border: 1px dotted HighlightText;
}
@ -160,8 +95,6 @@ treechildren::-moz-tree-separator {
/* ::::: drop feedback ::::: */
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn),
tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn),
treechildren::-moz-tree-cell-text(primary, dropOn) {
background-color: Highlight;
color: HighlightText;
@ -258,9 +191,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
color: inherit;
}
treechildren::-moz-tree-cell(active, selected, focus, editing),
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus, editing),
tree[seltype="text"] > treechildren::-moz-tree-cell(active, selected, focus, editing) {
treechildren::-moz-tree-cell(active, selected, focus, editing) {
background-color: transparent;
border: none;
}

View File

@ -44,65 +44,24 @@ treechildren::-moz-tree-row(selected, focus) {
color: HighlightText;
}
tree[seltype="cell"] > treechildren::-moz-tree-row,
tree[seltype="text"] > treechildren::-moz-tree-row {
border-top: none;
background-color: transparent;
}
/* ::::: tree cells ::::: */
treechildren::-moz-tree-cell {
padding: 0px 2px 0px 2px;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text,
tree[seltype="text"] > treechildren::-moz-tree-cell-text,
treechildren::-moz-tree-cell-text {
color: inherit;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell {
padding: 0px 1px 0px 1px;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text {
padding: 0px 1px 1px 1px;
}
treechildren::-moz-tree-cell-text(selected) {
color: -moz-DialogText;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) {
background-color: -moz-mac-secondaryhighlight;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) {
color: -moz-DialogText;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) {
background-color: -moz-mac-secondaryhighlight;
color: -moz-DialogText;
}
treechildren::-moz-tree-cell-text(selected, focus) {
color: HighlightText;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus) {
background-color: Highlight;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
color: HighlightText;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
background-color: Highlight;
color: HighlightText;
}
/* ::::: lines connecting cells ::::: */
treechildren::-moz-tree-line {
@ -124,15 +83,12 @@ treechildren::-moz-tree-separator {
/* ::::: drop feedback ::::: */
tree[seltype="cell"] > treechildren::-moz-tree-cell(primary, dropOn),
tree[seltype="text"] > treechildren::-moz-tree-cell(primary, dropOn),
treechildren::-moz-tree-cell(primary, dropOn) {
background-color: #A1A1A1 !important;
color: #FFF !important;
background-image: none;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn),
tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn),
treechildren::-moz-tree-cell-text(primary, dropOn) {
color: #FFF !important;
}
@ -220,9 +176,7 @@ treechildren::-moz-tree-indentation {
padding: 2px 1px 1px;
}
treechildren::-moz-tree-cell(active, selected, focus, editing),
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus, editing),
tree[seltype="text"] > treechildren::-moz-tree-cell(active, selected, focus, editing) {
treechildren::-moz-tree-cell(active, selected, focus, editing) {
background-color: transparent;
border: none;
}

View File

@ -52,21 +52,12 @@ treechildren::-moz-tree-row(selected, current, focus) {
border: 1px dotted #F3D982;
}
tree[seltype="cell"] > treechildren::-moz-tree-row,
tree[seltype="text"] > treechildren::-moz-tree-row {
border: none;
background-color: transparent;
background-image: none;
}
/* ::::: tree cells ::::: */
treechildren::-moz-tree-cell {
padding: 0 2px;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text,
tree[seltype="text"] > treechildren::-moz-tree-cell-text,
treechildren::-moz-tree-cell-text {
color: inherit;
}
@ -75,73 +66,16 @@ treechildren::-moz-tree-cell-text(selected) {
color: -moz-cellhighlighttext;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell {
border: 1px solid transparent;
padding: 0px 1px 0px 1px;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text {
border: 1px solid transparent;
padding: 0px 1px 1px 1px;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) {
background-color: -moz-cellhighlight;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) {
color: -moz-cellhighlighttext;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) {
background-color: -moz-cellhighlight;
color: -moz-cellhighlighttext;
}
treechildren::-moz-tree-cell-text(selected, focus) {
color: HighlightText;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus) {
background-color: Highlight;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
background-color: Highlight;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
color: HighlightText;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
color: HighlightText;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, current, focus) {
border: 1px dotted #000000;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, current, focus) {
border: 1px dotted #000000;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, current, focus) {
border: 1px dotted #C0C0C0;
}
tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, current, focus) {
border: 1px dotted #C0C0C0;
}
/* ::::: lines connecting cells ::::: */
tree[seltype="cell"] > treechildren::-moz-tree-line,
tree[seltype="text"] > treechildren::-moz-tree-line,
treechildren::-moz-tree-line {
border: 1px dotted ThreeDShadow;
}
tree[seltype="cell"] > treechildren::-moz-tree-line(active, selected, focus),
treechildren::-moz-tree-line(selected, focus) {
border: 1px dotted HighlightText;
}
@ -160,8 +94,6 @@ treechildren::-moz-tree-row(dropOn) {
background-color: Highlight;
}
tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn),
tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn),
treechildren::-moz-tree-cell-text(primary, dropOn) {
color: HighlightText;
}
@ -299,9 +231,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
color: inherit;
}
treechildren::-moz-tree-cell(active, selected, focus, editing),
tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus, editing),
tree[seltype="text"] > treechildren::-moz-tree-cell(active, selected, focus, editing) {
treechildren::-moz-tree-cell(active, selected, focus, editing) {
background-color: transparent;
border: none;
}