diff --git a/.github/commands/dox.hxml b/.github/commands/dox.hxml
index 3d99cfcce..8804fa0b7 100644
--- a/.github/commands/dox.hxml
+++ b/.github/commands/dox.hxml
@@ -1,7 +1,4 @@
--lib hscript
-#-lib actuate
-lib haxeui-blank
-#-lib yaml
#-main haxe.ui.Dox
-cp .
diff --git a/cli/src/installs/kha/KhaInstall.hx b/cli/src/installs/kha/KhaInstall.hx
index 730ad0277..4806bc4da 100644
--- a/cli/src/installs/kha/KhaInstall.hx
+++ b/cli/src/installs/kha/KhaInstall.hx
@@ -6,8 +6,7 @@ class KhaInstall extends HaxeLibInstall {
public function new() {
super([
"haxeui-core",
- "haxeui-kha",
- "hscript"
+ "haxeui-kha"
]);
}
diff --git a/cli/src/updates/kha/KhaUpdate.hx b/cli/src/updates/kha/KhaUpdate.hx
index d23761102..3a1a3aa8c 100644
--- a/cli/src/updates/kha/KhaUpdate.hx
+++ b/cli/src/updates/kha/KhaUpdate.hx
@@ -4,8 +4,7 @@ class KhaUpdate extends HaxeLibUpdate {
public function new() {
super([
"haxeui-core",
- "haxeui-kha",
- "hscript"
+ "haxeui-kha"
]);
}
diff --git a/cli/templates/android/android.hxml b/cli/templates/android/android.hxml
index 0599722b7..558d06a22 100644
--- a/cli/templates/android/android.hxml
+++ b/cli/templates/android/android.hxml
@@ -7,7 +7,6 @@
-lib haxeui-core
-lib haxeui-android
--lib hscript
-java-lib ::ANDROID_HOME::\platforms\android-21\android.jar
diff --git a/cli/templates/electron-shared/electron.hxml b/cli/templates/electron-shared/electron.hxml
index 317797a41..acdb16b50 100644
--- a/cli/templates/electron-shared/electron.hxml
+++ b/cli/templates/electron-shared/electron.hxml
@@ -14,6 +14,5 @@
-lib haxeui-core
-lib haxeui-html5
--lib hscript
-js build/electron/::output::.js
diff --git a/cli/templates/flixel-flash-develop/_flixel.hxproj b/cli/templates/flixel-flash-develop/_flixel.hxproj
deleted file mode 100644
index f8b481a43..000000000
--- a/cli/templates/flixel-flash-develop/_flixel.hxproj
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- "$(CompilerPath)/haxelib" run lime build "$(OutputFile)" $(TargetBuild) -$(BuildConfig) -Dfdb
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cli/templates/flixel-flash-develop/flixel.hxproj b/cli/templates/flixel-flash-develop/flixel.hxproj
index 06603082f..653878ee3 100644
--- a/cli/templates/flixel-flash-develop/flixel.hxproj
+++ b/cli/templates/flixel-flash-develop/flixel.hxproj
@@ -19,7 +19,7 @@
-
+
@@ -28,7 +28,6 @@
-
diff --git a/cli/templates/flixel-shared/project.xml b/cli/templates/flixel-shared/project.xml
index 6765ec37f..588bcef04 100644
--- a/cli/templates/flixel-shared/project.xml
+++ b/cli/templates/flixel-shared/project.xml
@@ -46,7 +46,6 @@
-
diff --git a/cli/templates/heaps/heaps-hl.hxml b/cli/templates/heaps/heaps-hl.hxml
index 3caa3e0e1..87099fa5d 100644
--- a/cli/templates/heaps/heaps-hl.hxml
+++ b/cli/templates/heaps/heaps-hl.hxml
@@ -5,7 +5,6 @@
-lib hlsdl
-lib haxeui-core
-lib haxeui-heaps
--lib hscript
-D resourcesPath=assets
diff --git a/cli/templates/heaps/heaps-js.hxml b/cli/templates/heaps/heaps-js.hxml
index 3217cd63a..4085da1ed 100644
--- a/cli/templates/heaps/heaps-js.hxml
+++ b/cli/templates/heaps/heaps-js.hxml
@@ -4,7 +4,6 @@
-lib heaps
-lib haxeui-core
-lib haxeui-heaps
--lib hscript
-D resourcesPath=assets
diff --git a/cli/templates/html5/html5.hxml b/cli/templates/html5/html5.hxml
index 61997a8d8..00a54775d 100644
--- a/cli/templates/html5/html5.hxml
+++ b/cli/templates/html5/html5.hxml
@@ -3,6 +3,5 @@
-lib haxeui-core
-lib haxeui-html5
--lib hscript
-js build/html5/::output::.js
diff --git a/cli/templates/hxwidgets-flash-develop/hxwidgets.hxproj b/cli/templates/hxwidgets-flash-develop/hxwidgets.hxproj
index 837e34e97..e6a27cdcd 100644
--- a/cli/templates/hxwidgets-flash-develop/hxwidgets.hxproj
+++ b/cli/templates/hxwidgets-flash-develop/hxwidgets.hxproj
@@ -29,7 +29,6 @@
-
diff --git a/cli/templates/hxwidgets/hxwidgets.hxml b/cli/templates/hxwidgets/hxwidgets.hxml
index 33d713b8a..26bc052d6 100644
--- a/cli/templates/hxwidgets/hxwidgets.hxml
+++ b/cli/templates/hxwidgets/hxwidgets.hxml
@@ -4,7 +4,6 @@
-lib haxeui-core
-lib haxeui-hxwidgets
-lib hxWidgets
--lib hscript
-D ABI=-MD
-D WXSTATIC
diff --git a/cli/templates/kha-shared/khafile.js b/cli/templates/kha-shared/khafile.js
index 51c869375..96eda2831 100644
--- a/cli/templates/kha-shared/khafile.js
+++ b/cli/templates/kha-shared/khafile.js
@@ -5,6 +5,5 @@ project.addSources('./src');
project.addLibrary('haxeui-core');
project.addLibrary('haxeui-kha');
-project.addLibrary('hscript');
resolve(project);
diff --git a/cli/templates/nme-shared/project.nmml b/cli/templates/nme-shared/project.nmml
index 56c09dc6c..4024cd456 100644
--- a/cli/templates/nme-shared/project.nmml
+++ b/cli/templates/nme-shared/project.nmml
@@ -11,7 +11,6 @@
-
diff --git a/cli/templates/openfl-flash-develop/openfl.hxproj b/cli/templates/openfl-flash-develop/openfl.hxproj
index f9f7b3705..a930ba2c0 100644
--- a/cli/templates/openfl-flash-develop/openfl.hxproj
+++ b/cli/templates/openfl-flash-develop/openfl.hxproj
@@ -28,7 +28,6 @@
-
diff --git a/cli/templates/pdcurses-flash-develop/pdcurses.hxproj b/cli/templates/pdcurses-flash-develop/pdcurses.hxproj
index ed8745f60..cbe90f1e7 100644
--- a/cli/templates/pdcurses-flash-develop/pdcurses.hxproj
+++ b/cli/templates/pdcurses-flash-develop/pdcurses.hxproj
@@ -28,7 +28,6 @@
-
diff --git a/cli/templates/pdcurses/pdcurses.hxml b/cli/templates/pdcurses/pdcurses.hxml
index 8fdbd9d80..9b81e0291 100644
--- a/cli/templates/pdcurses/pdcurses.hxml
+++ b/cli/templates/pdcurses/pdcurses.hxml
@@ -3,6 +3,5 @@
-lib haxeui-core
-lib haxeui-pdcurses
--lib hscript
-cpp build/pdcurses
diff --git a/cli/templates/pixijs-flash-develop/pixijs.hxproj b/cli/templates/pixijs-flash-develop/pixijs.hxproj
index 3f00f0196..e2c692fa3 100644
--- a/cli/templates/pixijs-flash-develop/pixijs.hxproj
+++ b/cli/templates/pixijs-flash-develop/pixijs.hxproj
@@ -31,7 +31,6 @@
-
diff --git a/cli/templates/pixijs/pixijs.hxml b/cli/templates/pixijs/pixijs.hxml
index a07f08517..c0f85d664 100644
--- a/cli/templates/pixijs/pixijs.hxml
+++ b/cli/templates/pixijs/pixijs.hxml
@@ -3,7 +3,6 @@
-lib haxeui-core
-lib haxeui-pixijs
--lib hscript
-lib pixijs
-js build/pixijs/::output::.js
diff --git a/cli/templates/qt-flash-develop/qt.hxproj b/cli/templates/qt-flash-develop/qt.hxproj
index f98f92bfc..b987fbe95 100644
--- a/cli/templates/qt-flash-develop/qt.hxproj
+++ b/cli/templates/qt-flash-develop/qt.hxproj
@@ -29,7 +29,6 @@
-
diff --git a/cli/templates/qt/qt.hxml b/cli/templates/qt/qt.hxml
index b7d99d651..98be8d4ac 100644
--- a/cli/templates/qt/qt.hxml
+++ b/cli/templates/qt/qt.hxml
@@ -4,7 +4,6 @@
-lib haxeui-core
-lib haxeui-qt
-lib hxQt
--lib hscript
-D HXCPP_M64
diff --git a/cli/templates/raylib-flash-develop/raylib.hxproj b/cli/templates/raylib-flash-develop/raylib.hxproj
index b865b6115..a500f931c 100644
--- a/cli/templates/raylib-flash-develop/raylib.hxproj
+++ b/cli/templates/raylib-flash-develop/raylib.hxproj
@@ -29,7 +29,6 @@
-
diff --git a/cli/templates/raylib/raylib.hxml b/cli/templates/raylib/raylib.hxml
index 315a71dfb..419b7be54 100644
--- a/cli/templates/raylib/raylib.hxml
+++ b/cli/templates/raylib/raylib.hxml
@@ -4,6 +4,5 @@
-lib haxeui-core
-lib haxeui-raylib
-lib raylib-haxe
--lib hscript
-cpp build/raylib
diff --git a/cli/templates/winforms-flash-develop/winforms.hxproj b/cli/templates/winforms-flash-develop/winforms.hxproj
index a5da056c8..126eb4ce4 100644
--- a/cli/templates/winforms-flash-develop/winforms.hxproj
+++ b/cli/templates/winforms-flash-develop/winforms.hxproj
@@ -28,7 +28,6 @@
-
diff --git a/cli/templates/winforms/winforms.hxml b/cli/templates/winforms/winforms.hxml
index 14b96a4a5..a4c61ecaa 100644
--- a/cli/templates/winforms/winforms.hxml
+++ b/cli/templates/winforms/winforms.hxml
@@ -3,6 +3,5 @@
-lib haxeui-core
-lib haxeui-winforms
--lib hscript
-cs build/winforms
diff --git a/extraParams.hxml b/extraParams.hxml
index 7f33a5942..e69de29bb 100644
--- a/extraParams.hxml
+++ b/extraParams.hxml
@@ -1 +0,0 @@
--lib hscript
diff --git a/haxe/ui/Toolkit.hx b/haxe/ui/Toolkit.hx
index 6ad3529d3..bd2899dde 100644
--- a/haxe/ui/Toolkit.hx
+++ b/haxe/ui/Toolkit.hx
@@ -197,7 +197,7 @@ class Toolkit {
fullScript += scriptString;
}
- component.script = fullScript;
+ //component.script = fullScript;
return component;
}
@@ -246,7 +246,7 @@ class Toolkit {
var propValue:Dynamic = c.properties.get(propName);
propName = ComponentFieldMap.mapField(propName);
if (StringTools.startsWith(propName, "on")) {
- component.addScriptEvent(propName, propValue);
+ //component.addScriptEvent(propName, propValue);
} else {
propValue = TypeConverter.convertFrom(propValue);
Reflect.setProperty(component, propName, propValue);
diff --git a/haxe/ui/core/Component.hx b/haxe/ui/core/Component.hx
index cf4269d1a..aebf60a54 100644
--- a/haxe/ui/core/Component.hx
+++ b/haxe/ui/core/Component.hx
@@ -11,7 +11,6 @@ import haxe.ui.layouts.DefaultLayout;
import haxe.ui.layouts.DelegateLayout;
import haxe.ui.layouts.Layout;
import haxe.ui.locale.LocaleManager;
-import haxe.ui.scripting.ScriptInterp;
import haxe.ui.styles.Parser;
import haxe.ui.styles.Style;
import haxe.ui.styles.StyleSheet;
@@ -1282,8 +1281,6 @@ class Component extends ComponentImpl implements IComponentBase implements IVali
_ready = true;
handleReady();
- initScript();
-
if (childComponents != null) {
for (child in childComponents) {
child.ready();
@@ -1365,138 +1362,6 @@ class Component extends ComponentImpl implements IComponentBase implements IVali
@:dox(group = "Script related properties and methods")
public var scriptAccess:Bool = true;
- private var _interp:ScriptInterp;
- private var _script:String;
- /**
- A script string to associate with this component
-
- *Note*: setting this to non-null will cause this component to create and maintain its own script interpreter during initialsation
- **/
- @:dox(group = "Script related properties and methods")
- public var script(null, set):String;
- private function set_script(value:String):String {
- _script = value;
- return value;
- }
-
- /**
- Execute a script call
-
- *Note*: this component will first attempt to use its own script interpreter if its avialable otherwise it will scan its parents until it finds one
- **/
- @:dox(group = "Script related properties and methods")
- public function executeScriptCall(expr:String, variables:Map = null) {
- try {
- var parser = new hscript.Parser();
- var line = parser.parseString(expr);
- var interp:ScriptInterp = findScriptInterp();
- interp.variables.set("this", this);
- if (variables != null) {
- for (k in variables.keys()) {
- interp.variables.set(k, variables.get(k));
- }
- }
- interp.expr(line);
- interp.variables.remove("this");
- if (variables != null) {
- for (k in variables.keys()) {
- interp.variables.remove(k);
- }
- }
- } catch (e:Dynamic) {
- #if !allow_script_errors
- trace("Problem executing scriptlet: " + e);
- #end
- }
- }
-
- private function findScriptInterp(refreshNamedComponents:Bool = true):ScriptInterp {
- var interp:ScriptInterp = null;
- var c:Component = this;
- while (c != null && interp == null) {
- if (c._interp != null) {
- interp = c._interp;
- break;
- }
- c = c.parentComponent;
- }
-
- if (interp == null) {
- c = rootComponent;
- c._interp = new ScriptInterp();
- interp = c._interp;
- }
-
- if (refreshNamedComponents == true && c != null) {
- var comps:Array = c.namedComponents;
- for (comp in comps) {
- var safeId = StringUtil.capitalizeHyphens(comp.id);
- interp.variables.set(safeId, comp);
- }
- }
-
- return interp;
- }
-
- private function initScript() {
- if (_script != null) {
- try {
- var parser = new hscript.Parser();
- var program = parser.parseString(_script);
- _interp = new ScriptInterp();
-
- var comps:Array = namedComponents;
- for (comp in comps) {
- if (comp.scriptAccess == true) {
- var safeId = StringUtil.capitalizeHyphens(comp.id);
- _interp.variables.set(safeId, comp);
- }
- }
-
- _interp.execute(program);
- } catch (e:Dynamic) {
- #if neko
- trace("Problem initializing script");
- #else
- trace("Problem initializing script: " + e);
- #end
- }
- }
- }
-
- private var _scriptEvents:Map;
-
- public var scriptEvents(get, null):Map;
- private function get_scriptEvents():Map {
- return _scriptEvents;
- }
-
- /**
- Registers a piece of hscript to be execute when a certain `UIEvent` is fired
- **/
- @:dox(group = "Script related properties and methods")
- public function addScriptEvent(event:String, script:String) {
- event = event.toLowerCase();
- var eventName = StringTools.startsWith(event, "on") ? event.substring(2, event.length) : event;
- if (_scriptEvents == null) {
- _scriptEvents = new Map();
- }
- _scriptEvents.set(event, script);
- registerEvent(eventName, _onScriptEvent.bind(event, _));
- }
-
- private function _onScriptEvent(eventId:String, event:UIEvent) {
- if (_scriptEvents != null) {
- var script:String = _scriptEvents.get(eventId);
- if (script != null) {
- event.cancel();
- var variables = new Map();
- variables.set("event", event);
- executeScriptCall(script, variables);
- }
- }
- }
-
/**
Recursively generates list of all child components that have specified an `id`
**/
@@ -1960,11 +1825,6 @@ class Component extends ComponentImpl implements IComponentBase implements IVali
if (autoHeight == false && this.height > 0) {
c.height = this.height;
}
- if (_scriptEvents != null) {
- for (k in _scriptEvents.keys()) {
- c.addScriptEvent(k, _scriptEvents.get(k));
- }
- }
if (customStyle != null) {
if (c.customStyle == null) {
c.customStyle = {};
diff --git a/haxe/ui/macros/ModuleMacros.hx b/haxe/ui/macros/ModuleMacros.hx
index 9584f97d8..f19a6386a 100644
--- a/haxe/ui/macros/ModuleMacros.hx
+++ b/haxe/ui/macros/ModuleMacros.hx
@@ -90,16 +90,6 @@ class ModuleMacros {
continue;
}
- builder.add(macro
- haxe.ui.scripting.ScriptInterp.addClassAlias($v{classAlias}, $v{resolvedClass})
- );
-
- if (s.staticClass == true || s.keep == true) {
- builder.add(macro
- haxe.ui.scripting.ScriptInterp.addStaticClass($v{classAlias}, $p{resolvedClass.split(".")})
- );
- }
-
if (skipRest == true) {
break;
}
diff --git a/haxe/ui/module.xml b/haxe/ui/module.xml
index df6026d3d..202bd1c7c 100644
--- a/haxe/ui/module.xml
+++ b/haxe/ui/module.xml
@@ -30,18 +30,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/haxe/ui/scripting/ScriptInterp.hx b/haxe/ui/scripting/ScriptInterp.hx
deleted file mode 100644
index 93f6fa668..000000000
--- a/haxe/ui/scripting/ScriptInterp.hx
+++ /dev/null
@@ -1,95 +0,0 @@
-package haxe.ui.scripting;
-
-#if !macro
-import haxe.ui.core.Component;
-#end
-import hscript.Interp;
-
-class ScriptInterp extends Interp {
- private static var _classAliases:Map;
- private static var _staticClasses:Map;
-
- public function new() {
- super();
- if (_staticClasses != null) {
- for (name in _staticClasses.keys()) {
- var c:Dynamic = _staticClasses.get(name);
- variables.set(name, c);
- }
- }
- variables.set("isVar", isVar);
- }
-
- private function isVar(varName:String):Bool {
- return variables.exists(varName);
- }
-
- override function cnew( cl : String, args : Array ) : Dynamic {
- if (_classAliases != null && _classAliases.exists(cl)) {
- cl = _classAliases.get(cl);
- }
- return super.cnew(cl, args);
- }
-
- override function get( o : Dynamic, f : String ) : Dynamic {
- if ( o == null ) {
- throw error(EInvalidAccess(f));
- }
- var v = Reflect.getProperty(o, f);
- return parseResult(v);
- }
-
- private function parseResult(v):Dynamic {
- if (v == null) {
- return v;
- }
- #if !macro
- if ((v is Component) || (v is Array)) {
- return v;
- }
- #end
- var temp = Std.string(v);
- var regexp:EReg = new EReg("^_?(Bool|Float|Int|String)\\((.*)\\)", "g");
- if (regexp.match(temp) == false) {
- return v;
- }
-
- var m1 = regexp.matched(1);
- var m2 = regexp.matched(2);
- switch (m1) {
- case "Bool":
- return Std.parseFloat(m2);
- case "Float":
- return Std.parseFloat(m2);
- case "Int":
- return Std.parseInt(m2);
- case "String":
- return Std.string(m2);
- case _:
- }
- return v;
- }
-
- override function set( o : Dynamic, f : String, v : Dynamic ) : Dynamic {
- if ( o == null ) {
- throw error(EInvalidAccess(f));
- }
- Reflect.setProperty(o, f, v);
- return v;
- }
-
- public static function addClassAlias(alias:String, classPath:String) {
- if (_classAliases == null) {
- _classAliases = new Map();
- }
-
- _classAliases.set(alias, classPath);
- }
-
- public static function addStaticClass(alias:String, c:Dynamic) {
- if (_staticClasses == null) {
- _staticClasses = new Map();
- }
- _staticClasses.set(alias, c);
- }
-}
\ No newline at end of file
diff --git a/haxelib.json b/haxelib.json
index 4ca577ab0..ea92b1e4a 100644
--- a/haxelib.json
+++ b/haxelib.json
@@ -13,7 +13,6 @@
],
"releasenote": "Tweaks and fixes",
"dependencies": {
- "hscript": ""
},
"name": "haxeui-core",
"description": "The core library of the HaxeUI framework",
diff --git a/run.n b/run.n
index 5c6bfeb9e..85da3196c 100644
Binary files a/run.n and b/run.n differ