Improve HTML5 loaderInfo.url

openfl · Feb 16, 2015 · 178fe3f · 178fe3f
1 parent 950f9e1
commit 178fe3f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/openfl/display/LoaderInfo.hx b/openfl/display/LoaderInfo.hx
@@ -6,6 +6,10 @@ import openfl.events.UncaughtErrorEvents;
 import openfl.system.ApplicationDomain;
 import openfl.utils.ByteArray;
 
+#if (js && html5)
+import js.Browser;
+#end
+
 
 /**
  * The LoaderInfo class provides information about a loaded SWF file or a
@@ -107,6 +111,8 @@ import openfl.utils.ByteArray;
 class LoaderInfo extends EventDispatcher {
 
 
+	private static var __rootURL = #if (js && html5) Browser.document.URL #else "" #end;
+
 	/**
 	 * When an external SWF file is loaded, all ActionScript 3.0 definitions
 	 * contained in the loaded class are stored in the
@@ -399,7 +405,7 @@ class LoaderInfo extends EventDispatcher {
 
 		} else {
 
-			loaderInfo.url = "";
+			loaderInfo.url = __rootURL;
 
 		}
 

diff --git a/openfl/display/MovieClip.hx b/openfl/display/MovieClip.hx
@@ -130,8 +130,6 @@ class MovieClip extends Sprite {
 		__totalFrames = 0;
 		enabled = true;
 
-		loaderInfo = LoaderInfo.create (null);
-
 	}
 
 

diff --git a/openfl/display/Sprite.hx b/openfl/display/Sprite.hx
@@ -105,6 +105,7 @@ class Sprite extends DisplayObjectContainer {
 
 		buttonMode = false;
 		useHandCursor = true;
+		loaderInfo = LoaderInfo.create (null);
 
 	}