mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-23 19:09:49 +00:00
Fixed problems in Advanced Edit dialog, b=67918, r=brade, sr=kin
This commit is contained in:
parent
f96d7e2a61
commit
286885f612
@ -56,7 +56,7 @@ function onAddCSSAttribute()
|
||||
function doCSSEnabling()
|
||||
{
|
||||
var name = TrimString(dialog.AddCSSAttributeNameInput.value).toLowerCase();
|
||||
if( name == "" || !CheckAttributeNameSimilarity(name,CSSAttrs))
|
||||
if( !name || !CheckAttributeNameSimilarity(name,CSSAttrs))
|
||||
dialog.AddCSSAttribute.setAttribute("disabled","true");
|
||||
else
|
||||
dialog.AddCSSAttribute.removeAttribute("disabled");
|
||||
|
@ -12,7 +12,7 @@ function BuildJSEAttributeTable()
|
||||
continue; // attribute isn't an event handler.
|
||||
var name = nodeMap[i].nodeName.toLowerCase();
|
||||
var value = element.getAttribute(nodeMap[i].nodeName);
|
||||
AddTreeItem( name, value, "JSEATree", JSEAttrs ); // add item to tree
|
||||
AddTreeItem( name, value, "JSEAList", JSEAttrs ); // add item to tree
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -31,7 +31,7 @@ function IsEventHandler( which )
|
||||
// add an attribute to the tree widget
|
||||
function onAddJSEAttribute()
|
||||
{
|
||||
var which = document.getElementById("AddJSAttribute");
|
||||
var which = document.getElementById("AddJSEAttribute");
|
||||
if(!which || which.getAttribute ( "disabled" ) )
|
||||
return;
|
||||
|
||||
@ -58,8 +58,8 @@ function doJSEEnabling()
|
||||
|
||||
if ( name.substring(0,2) != "on" )
|
||||
name = "on" + name; // user has entered event without "on" prefix, add it
|
||||
|
||||
if( name == "" || !CheckAttributeNameSimilarity(name, JSEAttrs))
|
||||
|
||||
if( name == "on" || !CheckAttributeNameSimilarity(name, JSEAttrs))
|
||||
dialog.AddJSEAttribute.setAttribute("disabled","true");
|
||||
else
|
||||
dialog.AddJSEAttribute.removeAttribute("disabled");
|
||||
@ -85,7 +85,8 @@ function UpdateJSEAttributes()
|
||||
var item = JSEAList.childNodes[i];
|
||||
name = TrimString(item.firstChild.firstChild.getAttribute("value"));
|
||||
value = TrimString(item.firstChild.lastChild.firstChild.value);
|
||||
|
||||
// set the event handler
|
||||
element.setAttribute(name,value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -139,7 +139,7 @@ function CheckAttributeNameSimilarity(attName, attArray)
|
||||
{
|
||||
for(var i = 0; i < attArray.length; i++)
|
||||
{
|
||||
if(attName == attArray[i])
|
||||
if(attName.toLowerCase() == attArray[i].toLowerCase())
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@ -156,7 +156,7 @@ function CheckAttributeNotRemoved( attName, attArray )
|
||||
{
|
||||
for( var i = 0; i < attArray.length; i++ )
|
||||
{
|
||||
if( attName == attArray[i] )
|
||||
if(attName.toLowerCase() == attArray[i].toLowerCase())
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@ -189,20 +189,20 @@ function RemoveAttribute( treeId )
|
||||
HTMLRAttrs[HTMLRAttrs.length] = attr;
|
||||
if (newIndex >= (HTMLAttrs.length-1))
|
||||
newIndex--;
|
||||
RemoveNameFromAttArray(HTMLAttrs, attr);
|
||||
RemoveNameFromAttArray(attr, HTMLAttrs);
|
||||
break;
|
||||
case "CSSATree":
|
||||
// We write a completely new "style" string, so we don't need "remove" array
|
||||
//CSSRAttrs[CSSRAttrs.length] = attr;
|
||||
if (newIndex >= (CSSAttrs.length-1))
|
||||
newIndex--;
|
||||
RemoveNameFromAttArray(CSSAttrs, attr);
|
||||
RemoveNameFromAttArray(attr, CSSAttrs);
|
||||
break;
|
||||
case "JSEATree":
|
||||
JSERAttrs[JSERAttrs.length] = attr;
|
||||
if (newIndex >= (JSEAttrs.length-1))
|
||||
newIndex--;
|
||||
RemoveNameFromAttArray(JSEAttrs, attr);
|
||||
RemoveNameFromAttArray(attr, JSEAttrs);
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
@ -215,11 +215,11 @@ function RemoveAttribute( treeId )
|
||||
SelectTreeItem(tree);
|
||||
}
|
||||
}
|
||||
function RemoveNameFromAttArray(attArray, name)
|
||||
function RemoveNameFromAttArray(attName, attArray)
|
||||
{
|
||||
for (var i=0; i < attArray.length; i++)
|
||||
{
|
||||
if (attArray[i] == name)
|
||||
if(attName.toLowerCase() == attArray[i].toLowerCase())
|
||||
{
|
||||
// Remove 1 array item
|
||||
attArray.splice(i,1);
|
||||
@ -262,7 +262,7 @@ function AddTreeItem ( name, value, treekidsId, attArray, valueCaseFunc )
|
||||
var treerow = document.createElementNS ( XUL_NS, "treerow" );
|
||||
var attrcell = document.createElementNS ( XUL_NS, "treecell" );
|
||||
attrcell.setAttribute( "class", "propertylist" );
|
||||
attrcell.setAttribute( "value", name.toLowerCase() );
|
||||
attrcell.setAttribute( "value", name );
|
||||
// Modify treerow selection to better show focus in textfield
|
||||
treeitem.setAttribute( "class", "ae-selection");
|
||||
|
||||
|
@ -182,9 +182,9 @@
|
||||
<title value="&AddJSEAttributeLabel.label;"/>
|
||||
<box autostretch="never">
|
||||
<text class="label" for="AddJSEAttributeNameInput" value="&AttName.label;"/>
|
||||
<textfield flex="1" id="AddJSEAttributeNameInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/>
|
||||
<textfield flex="1" id="AddJSEAttributeNameInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/>
|
||||
<text class="label" for="AddJSEAttributeValueInput" value="&AttValue.label;"/>
|
||||
<textfield flex="1" id="AddJSEAttributeValueInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/>
|
||||
<textfield flex="1" id="AddJSEAttributeValueInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/>
|
||||
<button class="dialog" id="AddJSEAttribute" oncommand="onAddJSEAttribute()" value="&AddAttributeButton.label;" disabled="true"/>
|
||||
</box>
|
||||
</titledbox>
|
||||
|
Loading…
x
Reference in New Issue
Block a user