Player and Runtime are now mostly drop-in compatible.

Author: jabbany

.idea/workspace.xml

@@ -6,8 +6,8 @@ clean:
 
 compile:
 	tsc --target ES5 src/api/Display/Display.ts --out build/api/Display.js
+	tsc --target ES5 src/api/Runtime/Runtime.ts --out build/api/Runtime.js
+	tsc --target ES5 src/api/Player/Player.ts --out build/api/Player.js
 	cp src/*.js build/
 	cp src/api/*.js build/api/
-	cp src/api/Player/Player.js build/api/
 	cp src/api/Tween/Tween.js build/api/
-	cp src/api/Runtime/Runtime.js build/api/

src/scripting/Makefile

@@ -12,13 +12,6 @@ var CCLScripting = function(workerUrl){
 			console.warn(m);
 		};
 	};
-	this.toRGB = function(number){
-		var string = parseInt(number).toString(16);
-		while(string.length < 6){
-			string = "0" + string;
-		}
-		return "#" + string;
-	};
 	this.getWorker = function(){
 		return new Worker(this.workerUrl);
 	};
@@ -427,7 +420,13 @@ var CCLScripting = function(workerUrl){
 			fill:"none",
 			alpha:1
 		};
-		
+		var toRGB = function(number){
+			var string = parseInt(number).toString(16);
+			while(string.length < 6){
+				string = "0" + string;
+			}
+			return "#" + string;
+		};
 		var applyStroke = function(p, ref){
 			__(p, {
 				"stroke": ref.line.color,
@@ -508,7 +507,7 @@ var CCLScripting = function(workerUrl){
 			if(params.length < 3)
 				return;
 			this.line.width = params[0];
-			this.line.color = CCLScripting.toRGB(params[1]);
+			this.line.color = toRGB(params[1]);
 			this.line.alpha = params[2];
 			if(params[3]){
 				this.line.caps = params[3];
@@ -526,7 +525,7 @@ var CCLScripting = function(workerUrl){
 		this.beginFill = function(params){
 			if(params.length === 0)
 				return;
-			this.fill.fill = CCLScripting.toRGB(params[0]);
+			this.fill.fill = toRGB(params[0]);
 			if(params.length > 1){
 				this.fill.alpha = params[1];
 			}

src/scripting/build/Host.js

@@ -446,12 +446,16 @@ var Display;
             }
         };
 
+        /**
+        * Removes the object from a parent if exists.
+        */
         DisplayObject.prototype.remove = function () {
             // Remove itself
             if (this._parent !== null) {
                 this._parent.removeChild(this);
+            } else {
+                this.root.removeChild(this);
             }
-            this.unload();
         };
 
         /** Common Functions **/
@@ -471,6 +475,7 @@ var Display;
 
         DisplayObject.prototype.unload = function () {
             this._visible = false;
+            this.remove();
             __pchannel("Runtime:CallMethod", {
                 "id": this._id,
                 "method": "unload",
@@ -1048,6 +1053,11 @@ var Display;
             __pchannel("Display:SetFrameRate", value);
         }
     });
+
+    function toString() {
+        return "[display Display]";
+    }
+    Display.toString = toString;
 })(Display || (Display = {}));
 
 var $ = Display;