antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Pedal back from previous commit.

Browse source 
Fixes http://helma.org/bugs/show_bug.cgi?id=501
This commit is contained in:
hns 2007-02-25 15:44:33 +00:00
parent c3499a347b
commit 60c118cae9
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/helma/scripting/rhino/HopObject.java
View file

@ -121,24 +121,6 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
return toString(); return toString();
} }
/**
* Define a JavaScript property. We override this in order to redirect the
* "constructor" property with the scripted constructor function as its value
* to "__constructor__"
*
* @param propertyName the name of the property to define.
* @param value the initial value of the property
* @param attributes the attributes of the JavaScript property
*/ public void defineProperty(String propertyName, Object value, int attributes) {
// redirect the scripted constructor to __constructor__,
// constructor is set to the native constructor method.
if (node == null && "constructor".equals(propertyName) &&
value instanceof NativeFunction) {
propertyName = "__constructor__";
}
super.defineProperty(propertyName, value, attributes);
}
/** /**
* Return the INode wrapped by this HopObject. * Return the INode wrapped by this HopObject.
* *
@ -286,7 +268,6 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
throws UnsupportedEncodingException, IOException { throws UnsupportedEncodingException, IOException {
RhinoEngine engine = RhinoEngine.getRhinoEngine(); RhinoEngine engine = RhinoEngine.getRhinoEngine();
Skin skin = engine.toSkin(skinobj, className); Skin skin = engine.toSkin(skinobj, className);
Object param = paramobj == Undefined.instance ? null : paramobj;
checkNode(); checkNode();
if (skin != null) { if (skin != null) {
@ -694,6 +675,11 @@ public class HopObject extends ScriptableObject implements Wrapper, PropertyReco
*/ */
public void put(String name, Scriptable start, Object value) { public void put(String name, Scriptable start, Object value) {
if (node == null) { if (node == null) {
// redirect the scripted constructor to __constructor__,
// constructor is set to the native constructor method.
if ("constructor".equals(name) && value instanceof NativeFunction) {
name = "__constructor__";
}
// register property for PropertyRecorder interface // register property for PropertyRecorder interface
if (isRecording) { if (isRecording) {
changedProperties.add(name); changedProperties.add(name);