Bug 956657 Share more charset menu code between the view source window and the browser r=Unfocused

2014-02-21 00:17:13 +00:00
parent b66c4a3b03
commit 16b51b9c2f
5 changed files with 101 additions and 229 deletions
--- a/toolkit/components/viewsource/content/viewSource.xul
+++ b/toolkit/components/viewsource/content/viewSource.xul
@@ -201,11 +201,10 @@
          <menu id="charsetMenu"
                label="&charsetMenu.label;"
                accesskey="&charsetMenu.accesskey;"
-                oncommand="MultiplexHandler(event);"
+                oncommand="BrowserSetCharacterSet(event);"
                onpopupshowing="CharsetMenu.build(event.target);"
-                onpopupshown="UpdateMenus();">
-            <menupopup>
-            </menupopup>
+                onpopupshown="CharsetMenu.update(event, content.document.characterSet);">
+            <menupopup/>
          </menu>
          <menuseparator/>
          <menuitem id="menu_wrapLongLines" type="checkbox" command="cmd_wrapLongLines"