scope handling fix (wip)

Author: rbri

src/main/java/org/htmlunit/javascript/host/intl/Intl.java

@@ -92,14 +92,14 @@ private void define(final TopLevel scope, final Class<? extends HtmlUnitScriptab
             final HtmlUnitScriptable prototype = JavaScriptEngine.configureClass(config, scope);
             final FunctionObject constructorFn = new FunctionObject(config.getJsConstructor().getKey(),
                     config.getJsConstructor().getValue(), scope);
-            // constructorFn.addAsConstructor(scope, prototype, ScriptableObject.DONTENUM);
+
             ScriptRuntime.setFunctionProtoAndParent(constructorFn, Context.getCurrentContext(), scope);
             constructorFn.setImmunePrototypeProperty(prototype);
             prototype.setParentScope(scope);
-            constructorFn.defineProperty(prototype, "constructor", this, ScriptableObject.DONTENUM);
+            ScriptableObject.defineProperty(prototype, "constructor", constructorFn, ScriptableObject.DONTENUM);
             constructorFn.setParentScope(scope);
 
-            defineProperty(this, prototype.getClassName(), constructorFn, ScriptableObject.DONTENUM);
+            ScriptableObject.defineProperty(this, prototype.getClassName(), constructorFn, ScriptableObject.DONTENUM);
 
             defineStaticFunctions(config, scope, constructorFn);
         }