зеркало из https://github.com/mozilla/pjs.git
Bug 230779 View/Character Coding/Customize should not load into existing Preferences dialog r=timeless sr=alecf
This commit is contained in:
Родитель
891119fe45
Коммит
df4f01acbf
|
@ -12,7 +12,13 @@ function MultiplexHandler(event)
|
|||
SetForcedCharset(charset);
|
||||
SetDefaultCharacterSet(charset);
|
||||
} else if (name == 'charsetCustomize') {
|
||||
//do nothing - please remove this else statement, once the charset prefs moves to the pref window
|
||||
// please remove this else statement, once the charset prefs moves to the pref window
|
||||
window.openDialog("chrome://communicator/content/pref/pref-charset.xul",
|
||||
"_blank", "chrome,modal,resizable", "browser");
|
||||
} else if (name == 'charsetCustomizeMail') {
|
||||
// please remove this else statement, once the charset prefs moves to the pref window
|
||||
window.openDialog("chrome://communicator/content/pref/pref-charset.xul",
|
||||
"_blank", "chrome,modal,resizable", "mailedit");
|
||||
} else {
|
||||
SetForcedCharset(node.getAttribute('id'));
|
||||
SetDefaultCharacterSet(node.getAttribute('id'));
|
||||
|
|
|
@ -102,7 +102,8 @@
|
|||
<menuseparator />
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://communicator/content/pref/pref-charset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
|
||||
<menuitem name="charsetCustomize" label="&charsetCustomize.label;"
|
||||
accesskey="&charsetCustomize.accesskey;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
|
||||
|
@ -200,7 +201,8 @@
|
|||
<menuseparator />
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://communicator/content/pref/pref-charset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
|
||||
<menuitem name="charsetCustomize" label="&charsetCustomize.label;"
|
||||
accesskey="&charsetCustomize.accesskey;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
|
||||
|
@ -215,7 +217,8 @@
|
|||
</template>
|
||||
|
||||
<menupopup>
|
||||
<menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://communicator/content/pref/pref-charset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'mailedit')"/>
|
||||
<menuitem name="charsetCustomizeMail" label="&charsetCustomize.label;"
|
||||
accesskey="&charsetCustomize.accesskey;"/>
|
||||
<menuseparator />
|
||||
</menupopup>
|
||||
</menu>
|
||||
|
@ -314,7 +317,8 @@
|
|||
<menuseparator />
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://communicator/content/pref/pref-charset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
|
||||
<menuitem name="charsetCustomize" label="&charsetCustomize.label;"
|
||||
accesskey="&charsetCustomize.accesskey;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче