Fixed disabling of 'Create Table' context menuitem. b=157095, r=brade, sr=alecf

git-svn-id: svn://10.0.0.236/trunk@126866 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com
2002-08-09 01:55:26 +00:00
parent 42626dc442
commit 5f531f8cd0

View File

@@ -2045,30 +2045,12 @@ var nsFindNextCommand =
doCommand: function(aCommand)
{
var prefs = GetPrefs();
var newfind;
if (prefs) {
try {
newfind = prefs.getBoolPref("editor.new_find");
}
catch (ex) {
newfind = false;
}
}
if (newfind)
{
try {
var editorXUL = document.getElementById("content-frame");
var findInst = editorXUL.webBrowserFind;
findInst.findNext();
}
catch (ex) {
nsFindCommand.doCommand();
}
}
else {
window.editorShell.FindNext();
try {
var editorXUL = document.getElementById("content-frame");
var findInst = editorXUL.webBrowserFind;
findInst.findNext();
}
catch (ex) {}
}
};
@@ -3279,10 +3261,15 @@ var nsConvertToTable =
{
// Don't allow if table or cell is the selection
var element = gEditor.getSelectedElement("");
if (element && (element.nodeName == "td" ||
element.nodeName == "table"))
return false;
if (element)
{
var name = element.nodeName.toLowerCase();
if (name == "td" ||
name == "th" ||
name == "caption" ||
name == "table")
return false;
}
// Selection start and end must be in the same cell
// in same cell or both are NOT in a cell