mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 05:45:37 +00:00
XUL fixes for 51263. r=ben
This commit is contained in:
parent
c203defc05
commit
a3ccbff982
@ -600,21 +600,20 @@ function FolderPaneOnClick(event)
|
||||
{
|
||||
debug("in FolderPaneClick()\n");
|
||||
|
||||
var targetclass = event.target.getAttribute('class');
|
||||
debug('targetclass = ' + targetclass + '\n');
|
||||
var t = event.originalTarget;
|
||||
|
||||
if (targetclass == 'tree-cell-twisty') {
|
||||
if (t.getAttribute('twisty') == 'true') {
|
||||
// The twisty is nested three below the treeitem:
|
||||
// <treeitem>
|
||||
// <treerow>
|
||||
// <treecell>
|
||||
// <titledbutton class="tree-cell-twisty"> <!-- anonymous -->
|
||||
var treeitem = event.target.parentNode.parentNode.parentNode;
|
||||
var treeitem = t.parentNode.parentNode.parentNode;
|
||||
var open = treeitem.getAttribute('open');
|
||||
if(open == "true") {
|
||||
//dump("twisty open\n");
|
||||
|
||||
var item = event.target.parentNode.parentNode.parentNode;
|
||||
var item = t.parentNode.parentNode.parentNode;
|
||||
if (item.localName == "treeitem") {
|
||||
var isServer = (treeitem.getAttribute('IsServer') == "true");
|
||||
if (isServer) {
|
||||
@ -642,7 +641,7 @@ function FolderPaneOnClick(event)
|
||||
}
|
||||
else if(event.detail == 2)
|
||||
{
|
||||
var item = event.target.parentNode.parentNode;
|
||||
var item = t.parentNode.parentNode;
|
||||
if (item.localName == "treeitem")
|
||||
FolderPaneDoubleClick(item);
|
||||
}
|
||||
|
@ -326,13 +326,14 @@ function ReverseState(uri)
|
||||
|
||||
function SubscribeOnClick(event)
|
||||
{
|
||||
var t = event.originalTarget;
|
||||
|
||||
if (event.detail == 2) {
|
||||
ReverseStateFromNode(event.target.parentNode.parentNode);
|
||||
ReverseStateFromNode(t.parentNode.parentNode);
|
||||
}
|
||||
else {
|
||||
var targetclass = event.target.getAttribute('class');
|
||||
if (targetclass == 'tree-cell-twisty') {
|
||||
var treeitem = event.target.parentNode.parentNode.parentNode;
|
||||
if (t.getAttribute('twisty') == 'true') {
|
||||
var treeitem = t.parentNode.parentNode.parentNode;
|
||||
var open = treeitem.getAttribute('open');
|
||||
if(open == "true") {
|
||||
var uri = treeitem.getAttribute("id");
|
||||
@ -347,7 +348,7 @@ function SubscribeOnClick(event)
|
||||
}
|
||||
}
|
||||
else {
|
||||
var name = event.target.parentNode.parentNode.getAttribute('name');
|
||||
var name = t.parentNode.parentNode.getAttribute('name');
|
||||
if (name && (name.length > 0)) {
|
||||
gNameField.setAttribute('value',name);
|
||||
}
|
||||
|
@ -95,7 +95,7 @@ Rights Reserved.
|
||||
<treeitem uri="..." name="rdf:http://home.netscape.com/NC-rdf#Name" Subscribed="rdf:http://home.netscape.com/NC-rdf#Subscribed">
|
||||
<treerow>
|
||||
<treecell indent="true" class="treecell-indent" value="rdf:http://home.netscape.com/NC-rdf#LeafName"/>
|
||||
<treecell class="treecell-image subscribedcol" allowevents="true" onclick="return top.ReverseStateFromNode(event.target.parentNode.parentNode.parentNode)" value="rdf:http://home.netscape.com/NC-rdf#Subscribed"/>
|
||||
<treecell class="treecell-image subscribedcol" allowevents="true" onclick="return top.ReverseStateFromNode(event.originalTarget.parentNode.parentNode.parentNode)" value="rdf:http://home.netscape.com/NC-rdf#Subscribed"/>
|
||||
<treecell value="rdf:http://home.netscape.com/NC-rdf#TotalMessages"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
@ -21,33 +21,35 @@
|
||||
var gOldNumSelected = 0;
|
||||
function ThreadPaneOnClick(event)
|
||||
{
|
||||
if (event.target.localName != "treecell" &&
|
||||
event.target.localName != "treeitem" &&
|
||||
event.target.localName != "image")
|
||||
var t = event.originalTarget;
|
||||
|
||||
if (t.localName != "treecell" &&
|
||||
t.localName != "treeitem" &&
|
||||
t.localName != "image")
|
||||
return;
|
||||
|
||||
var targetclass = event.target.getAttribute('class');
|
||||
|
||||
if (event.target.localName == "image" && targetclass != 'tree-cell-twisty')
|
||||
targetclass = event.target.parentNode.getAttribute('class');
|
||||
var targetclass = "";
|
||||
|
||||
if (t.localName == "image" && (t.getAttribute('twisty') != 'true'))
|
||||
targetclass = t.parentNode.getAttribute('class');
|
||||
|
||||
//dump('targetclass = ' + targetclass + '\n');
|
||||
|
||||
if(targetclass.indexOf('unreadcol') != -1)
|
||||
{
|
||||
ToggleMessageRead(event.target.parentNode.parentNode.parentNode);
|
||||
ToggleMessageRead(t.parentNode.parentNode.parentNode);
|
||||
}
|
||||
if(targetclass.indexOf('flagcol') != -1)
|
||||
{
|
||||
ToggleMessageFlagged(event.target.parentNode.parentNode.parentNode);
|
||||
ToggleMessageFlagged(t.parentNode.parentNode.parentNode);
|
||||
}
|
||||
else if (targetclass == 'tree-cell-twisty') {
|
||||
else if (t.getAttribute('twisty') == 'true') {
|
||||
// The twisty is nested three below the treeitem:
|
||||
// <treeitem>
|
||||
// <treerow>
|
||||
// <treecell>
|
||||
// <titledbutton class="tree-cell-twisty"> <!-- anonymous -->
|
||||
var treeitem = event.target.parentNode.parentNode.parentNode;
|
||||
var treeitem = t.parentNode.parentNode.parentNode;
|
||||
var open = treeitem.getAttribute('open');
|
||||
if(open == "true")
|
||||
{
|
||||
@ -57,7 +59,7 @@ function ThreadPaneOnClick(event)
|
||||
}
|
||||
else if(event.detail == 2)
|
||||
{
|
||||
ThreadPaneDoubleClick(event.target.parentNode.parentNode);
|
||||
ThreadPaneDoubleClick(t.parentNode.parentNode);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -183,23 +183,24 @@ function ClickOnOtherPanels(event)
|
||||
{
|
||||
debug("ClickOnOtherPanels(...)");
|
||||
|
||||
var targetclass = event.target.getAttribute('class');
|
||||
var t = event.originalTarget;
|
||||
|
||||
var treeitem = null;
|
||||
var force_open = true;
|
||||
if (targetclass == 'tree-cell-twisty') {
|
||||
if (t.getAttribute('twisty') == 'true') {
|
||||
// The twisty is nested three below the treeitem:
|
||||
// <treeitem>
|
||||
// <treerow>
|
||||
// <treecell>
|
||||
// <titledbutton class="tree-cell-twisty"> <!-- anonymous -->
|
||||
treeitem = event.target.parentNode.parentNode.parentNode;
|
||||
// <image class="tree-cell-twisty"> <!-- anonymous -->
|
||||
treeitem = t.parentNode.parentNode.parentNode;
|
||||
force_open = false;
|
||||
} else {
|
||||
if (event.target.localName != "treecell" &&
|
||||
event.target.localName != "treeitem")
|
||||
if (t.localName != "treecell" &&
|
||||
t.localName != "treeitem")
|
||||
return;
|
||||
|
||||
treeitem = event.target;
|
||||
treeitem = t;
|
||||
while (treeitem && treeitem.nodeName != 'treeitem') {
|
||||
treeitem = treeitem.parentNode;
|
||||
}
|
||||
|
@ -310,12 +310,12 @@
|
||||
click, so that drags work correctly. -->
|
||||
<handler event="mousedown">
|
||||
<![CDATA[
|
||||
if (event.target.localName == 'treecell' && !event.ctrlKey && !event.shiftKey && !event.metaKey) {
|
||||
if (event.originalTarget.localName == 'treecell' && !event.ctrlKey && !event.shiftKey && !event.metaKey) {
|
||||
var isSelected = event.target.parentNode.parentNode.getAttribute("selected");
|
||||
if (!isSelected) {
|
||||
parentNode.selectItem(event.target.parentNode.parentNode);
|
||||
parentNode.selectItem(event.originalTarget.parentNode.parentNode);
|
||||
}
|
||||
parentNode.currentItem = event.target.parentNode.parentNode;
|
||||
parentNode.currentItem = event.originalTarget.parentNode.parentNode;
|
||||
}
|
||||
]]>
|
||||
</handler>
|
||||
@ -324,21 +324,22 @@
|
||||
except this item. -->
|
||||
<handler event="click">
|
||||
<![CDATA[
|
||||
if (event.target.localName == 'treecell') {
|
||||
var t = event.originalTarget;
|
||||
if (t.localName == 'treecell') {
|
||||
if (event.ctrlKey || event.metaKey) {
|
||||
parentNode.toggleItemSelection(event.target.parentNode.parentNode);
|
||||
parentNode.currentItem = event.target.parentNode.parentNode;
|
||||
parentNode.toggleItemSelection(t.parentNode.parentNode);
|
||||
parentNode.currentItem = t.parentNode.parentNode;
|
||||
}
|
||||
else if (event.shiftKey) {
|
||||
parentNode.selectItemRange(null, event.target.parentNode.parentNode);
|
||||
parentNode.currentItem = event.target.parentNode.parentNode;
|
||||
parentNode.selectItemRange(null, t.parentNode.parentNode);
|
||||
parentNode.currentItem = t.parentNode.parentNode;
|
||||
}
|
||||
else {
|
||||
parentNode.suppressOnSelect = true;
|
||||
var selectedItems = parentNode.selectedItems;
|
||||
var i = 0;
|
||||
while (i < selectedItems.length) {
|
||||
if (selectedItems[i] != event.target.parentNode.parentNode)
|
||||
if (selectedItems[i] != t.parentNode.parentNode)
|
||||
parentNode.removeItemFromSelection(selectedItems[i]);
|
||||
else
|
||||
i++;
|
||||
@ -352,7 +353,7 @@
|
||||
<!-- double-click -->
|
||||
<handler event="click" clickcount="2">
|
||||
<![CDATA[
|
||||
if (event.target.localName == 'treecell') {
|
||||
if (event.originalTarget.localName == 'treecell') {
|
||||
var n = event.target.parentNode.parentNode;
|
||||
n.toggleOpenState();
|
||||
}
|
||||
@ -362,8 +363,8 @@
|
||||
<!-- normal, single click -->
|
||||
<handler event="click">
|
||||
<![CDATA[
|
||||
if (event.target.getAttribute('twisty') == 'true') {
|
||||
var n = event.target.parentNode.parentNode.parentNode;
|
||||
if (event.originalTarget.getAttribute('twisty') == 'true') {
|
||||
var n = event.originalTarget.parentNode.parentNode.parentNode;
|
||||
n.toggleOpenState();
|
||||
}
|
||||
]]>
|
||||
|
Loading…
Reference in New Issue
Block a user