зеркало из https://github.com/mozilla/pjs.git
Bug 387392 - Remove overrides from extensions.xml. r=dtownsend
This commit is contained in:
Родитель
692f748626
Коммит
c718a023ab
|
@ -1108,15 +1108,6 @@ function onViewDoubleClick(aEvent)
|
|||
}
|
||||
}
|
||||
|
||||
function onViewGroupKeypress(aEvent) {
|
||||
// prevent focus from being taken over by the richlistbox
|
||||
gExtensionsView.suppressFocus = true;
|
||||
}
|
||||
|
||||
function onViewGroupClick(aEvent) {
|
||||
gExtensionsView.suppressFocus = false;
|
||||
}
|
||||
|
||||
function onAddonSelect(aEvent)
|
||||
{
|
||||
var viewButton = document.getElementById("viewGroup").selectedItem;
|
||||
|
|
|
@ -80,42 +80,7 @@
|
|||
return this._appVersion;
|
||||
</body>
|
||||
</method>
|
||||
|
||||
<field name="suppressFocus">false</field>
|
||||
|
||||
<!-- Override of richlistbox's _setItemSelection. Allows us to prevent focus
|
||||
when using the keyboard to navigate views and to ensure an element is
|
||||
visible after it has had a chance to reflow. -->
|
||||
<method name="_setItemSelection">
|
||||
<parameter name="aItem"/>
|
||||
<body>
|
||||
<![CDATA[
|
||||
// unselect current item
|
||||
if (this._selectedItem)
|
||||
this._selectedItem.selected = false
|
||||
|
||||
this._selectedItem = aItem;
|
||||
this._selectedIndex = this.getIndexOf(aItem);
|
||||
|
||||
if (aItem) {
|
||||
aItem.selected = true;
|
||||
if (!this.suppressFocus)
|
||||
aItem.focus();
|
||||
}
|
||||
]]>
|
||||
</body>
|
||||
</method>
|
||||
</implementation>
|
||||
<handlers>
|
||||
<handler event="focus">
|
||||
if (!this.hasAttribute("focused"))
|
||||
this.setAttribute("focused", "true");
|
||||
</handler>
|
||||
<handler event="blur">
|
||||
if (this.hasAttribute("focused"))
|
||||
this.removeAttribute("focused");
|
||||
</handler>
|
||||
</handlers>
|
||||
</binding>
|
||||
|
||||
<binding id="addon-base" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
|
||||
|
@ -400,13 +365,6 @@
|
|||
</implementation>
|
||||
|
||||
<handlers>
|
||||
<handler event="focus">
|
||||
<![CDATA[
|
||||
if (this.parentNode.suppressFocus)
|
||||
event.preventDefault();
|
||||
]]>
|
||||
</handler>
|
||||
|
||||
<!-- When an add-on displays a status messages the element may extend below the
|
||||
bottom of the list This will ensure that the element is visible for the
|
||||
most common cases. -->
|
||||
|
|
|
@ -151,8 +151,7 @@
|
|||
|
||||
<stack id="topStackBar">
|
||||
<radiogroup id="viewGroup" xhtml2:role="wairole:list" persist="last-selected"
|
||||
class="viewSelector chromeclass-toolbar" orient="horizontal"
|
||||
onkeypress="onViewGroupKeypress();" onclick="onViewGroupClick();">
|
||||
class="viewSelector chromeclass-toolbar" orient="horizontal">
|
||||
<radio id="extensions-view" label="&extensions.label;" oncommand="showView('extensions');" persist="last-selected"/>
|
||||
<radio id="themes-view" label="&themes.label;" oncommand="showView('themes');" persist="last-selected"/>
|
||||
<radio id="locales-view" label="&locales.label;" oncommand="showView('locales');" persist="last-selected"/>
|
||||
|
|
|
@ -54,12 +54,12 @@ richlistitem[selected="true"] {
|
|||
color: -moz-DialogText;
|
||||
}
|
||||
|
||||
richlistbox[focused] richlistitem[selected="true"] {
|
||||
richlistbox:focus richlistitem[selected="true"] {
|
||||
background-color: Highlight;
|
||||
color: HighlightText;
|
||||
}
|
||||
|
||||
richlistbox[focused] richlistitem[selected="true"][isDisabled="true"] {
|
||||
richlistbox:focus richlistitem[selected="true"][isDisabled="true"] {
|
||||
background-image: url("chrome://mozapps/skin/extensions/itemDisabledFader.png");
|
||||
}
|
||||
|
||||
|
|
|
@ -111,13 +111,13 @@ richlistitem[selected="true"] {
|
|||
color: -moz-DialogText;
|
||||
}
|
||||
|
||||
richlistbox[focused] richlistitem[selected="true"] {
|
||||
richlistbox:focus richlistitem[selected="true"] {
|
||||
background-image: url("chrome://mozapps/skin/extensions/itemEnabledFader.png");
|
||||
background-color: Highlight;
|
||||
color: HighlightText;
|
||||
}
|
||||
|
||||
richlistbox[focused] richlistitem[selected="true"][isDisabled="true"] {
|
||||
richlistbox:focus richlistitem[selected="true"][isDisabled="true"] {
|
||||
background-image: url("chrome://mozapps/skin/extensions/itemDisabledFader.png");
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче