зеркало из https://github.com/mozilla/gecko-dev.git
Bug 354805 - regression: readers menulist no longer shows the selected reader's icon. r=gavin.
This commit is contained in:
Родитель
12d6fb4141
Коммит
ab8c0ab781
|
@ -40,7 +40,7 @@
|
|||
|
||||
<!-- XXXmano this has to be in one line. Otherwise you would see
|
||||
how much XUL-in-XHTML sucks, see bug 348830 -->
|
||||
<div id="feedSubscribeLine"><xul:vbox><xul:hbox align="center"><xul:description id="subscribeUsingDescription">&subscribeUsing;</xul:description><xul:menulist id="handlersMenuList" aaa:labelledby="subscribeUsingDescription"><xul:menupopup menugenerated="true" id="handlersMenuPopup"><xul:menuitem id="liveBookmarksMenuItem" label="&feedLiveBookmarks;" class="menuitem-iconic" src="chrome://browser/skin/page-livemarks.png" selected="true"/><xul:menuseparator/></xul:menupopup></xul:menulist></xul:hbox><xul:hbox><xul:checkbox id="alwaysUse" checked="false"/></xul:hbox><xul:hbox align="center"><xul:spacer flex="1"/><span><xul:button label="&feedSubscribeNow;" id="subscribeButton"/></span></xul:hbox></xul:vbox></div></div>
|
||||
<div id="feedSubscribeLine"><xul:vbox><xul:hbox align="center"><xul:description id="subscribeUsingDescription">&subscribeUsing;</xul:description><xul:menulist id="handlersMenuList" aaa:labelledby="subscribeUsingDescription"><xul:menupopup menugenerated="true" id="handlersMenuPopup"><xul:menuitem id="liveBookmarksMenuItem" label="&feedLiveBookmarks;" class="menuitem-iconic" image="chrome://browser/skin/page-livemarks.png" selected="true"/><xul:menuseparator/></xul:menupopup></xul:menulist></xul:hbox><xul:hbox><xul:checkbox id="alwaysUse" checked="false"/></xul:hbox><xul:hbox align="center"><xul:spacer flex="1"/><span><xul:button label="&feedSubscribeNow;" id="subscribeButton"/></span></xul:hbox></xul:vbox></div></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
@ -357,7 +357,7 @@ FeedWriter.prototype = {
|
|||
*/
|
||||
_initMenuItemWithFile: function(aMenuItem, aFile) {
|
||||
aMenuItem.setAttribute("label", this._getFileDisplayName(aFile));
|
||||
aMenuItem.setAttribute("src", this._getFileIconURL(aFile));
|
||||
aMenuItem.setAttribute("image", this._getFileIconURL(aFile));
|
||||
aMenuItem.wrappedJSObject.file = aFile;
|
||||
},
|
||||
|
||||
|
@ -638,7 +638,7 @@ FeedWriter.prototype = {
|
|||
menuItem.setAttribute("webhandlerurl", handlers[i].uri);
|
||||
|
||||
var uri = ios.newURI(handlers[i].uri, null, null);
|
||||
menuItem.setAttribute("src", uri.prePath + "/favicon.ico");
|
||||
menuItem.setAttribute("image", uri.prePath + "/favicon.ico");
|
||||
|
||||
handlersMenuPopup.appendChild(menuItem);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче