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

Bug 1187219 - Remove _visuallySelected, _logicallySelected from tabbox.xml, avoid code duplication with tabbrowser.xml. r=mconley

Browse Source
This commit is contained in:
Dão Gottwald 2015-07-29 17:33:31 +02:00
parent bd0403d5b8
commit 33b623059d
2 changed files with 43 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
browser/base/content/tabbrowser.xml
View File

@ -5668,11 +5668,6 @@
<implementation>
<!--
This code is the same as in toolkit/content/widgets/tabbox.xml,
except for the _tabAttrModified call. If you modify it, tabbox.xml
might also need to be modified.
-->
<property name="_visuallySelected">
<setter>
<![CDATA[
@ -5680,27 +5675,23 @@
this.setAttribute("visuallyselected", "true");
else
this.removeAttribute("visuallyselected");
gBrowser._tabAttrModified(this, ["visuallyselected"]);
this.parentNode.tabbrowser._tabAttrModified(this, ["visuallyselected"]);
if (this.previousSibling && this.previousSibling.localName == "tab") {
if (val)
this.previousSibling.setAttribute("beforeselected", "true");
else
this.previousSibling.removeAttribute("beforeselected");
this.removeAttribute("first-tab");
}
else
this.setAttribute("first-tab", "true");
this._setPositionAttributes(val);
if (this.nextSibling && this.nextSibling.localName == "tab") {
if (val)
this.nextSibling.setAttribute("afterselected", "true");
else
this.nextSibling.removeAttribute("afterselected");
this.removeAttribute("last-tab");
}
return val;
]]>
</setter>
</property>
<property name="_logicallySelected">
<setter>
<![CDATA[
if (val)
this.setAttribute("selected", "true");
else
this.setAttribute("last-tab", "true");
this.removeAttribute("selected");
return val;
]]>
</setter>

81
toolkit/content/widgets/tabbox.xml
View File

@ -727,66 +727,43 @@
<property name="selected" readonly="true"
onget="return this.getAttribute('selected') == 'true';"/>
<!--
This code is the same as in browser/base/content/tabbrowser.xml,
except for the _tabAttrModified call. If you modify it, tabbrowser.xml
should probably also be modified.
-->
<property name="_visuallySelected">
<setter>
<![CDATA[
if (val)
this.setAttribute("visuallyselected", "true");
else
this.removeAttribute("visuallyselected");
if (this.previousSibling && this.previousSibling.localName == "tab") {
if (val)
this.previousSibling.setAttribute("beforeselected", "true");
else
this.previousSibling.removeAttribute("beforeselected");
this.removeAttribute("first-tab");
}
else
this.setAttribute("first-tab", "true");
if (this.nextSibling && this.nextSibling.localName == "tab") {
if (val)
this.nextSibling.setAttribute("afterselected", "true");
else
this.nextSibling.removeAttribute("afterselected");
this.removeAttribute("last-tab");
}
else
this.setAttribute("last-tab", "true");
return val;
]]>
</setter>
</property>
<property name="_logicallySelected">
<setter>
<![CDATA[
<property name="_selected">
<setter><![CDATA[
if (val)
this.setAttribute("selected", "true");
else
this.removeAttribute("selected");
this._setPositionAttributes(val);
return val;
]]>
</setter>
]]></setter>
</property>
<property name="_selected">
<setter>
<![CDATA[
// If our tab switching is synchronous, then logical selection = visual selection
this._logicallySelected = val;
this._visuallySelected = val;
return val;
]]>
</setter>
</property>
<method name="_setPositionAttributes">
<parameter name="aSelected"/>
<body><![CDATA[
if (this.previousSibling && this.previousSibling.localName == "tab") {
if (aSelected)
this.previousSibling.setAttribute("beforeselected", "true");
else
this.previousSibling.removeAttribute("beforeselected");
this.removeAttribute("first-tab");
} else {
this.setAttribute("first-tab", "true");
}
if (this.nextSibling && this.nextSibling.localName == "tab") {
if (aSelected)
this.nextSibling.setAttribute("afterselected", "true");
else
this.nextSibling.removeAttribute("afterselected");
this.removeAttribute("last-tab");
} else {
this.setAttribute("last-tab", "true");
}
]]></body>
</method>
<property name="linkedPanel" onget="return this.getAttribute('linkedpanel')"
onset="this.setAttribute('linkedpanel', val); return val;"/>