moved calling of Resource constructor into Scala

1 files changed, 18 insertions, 2 deletions

diff --git a/runtime/src/main/scala/scala/js/Resource.scala b/runtime/src/main/scala/scala/js/Resource.scala
index 4cb2aac..8cc3a49 100644
--- a/runtime/src/main/scala/scala/js/Resource.scala
+++ b/runtime/src/main/scala/scala/js/Resource.scala
@@ -2,12 +2,28 @@ package scala.js
 
 
 object Resource {
+  println("Resource")
+  val fileDict = {
+    val fileDict = Dynamic.global.ScalaJS.resources.asInstanceOf[js.Object]
+    for(key <- Object.keys(fileDict)){
+      val data = fileDict.asInstanceOf[js.Dictionary](key).asInstanceOf[String]
+      fileDict.asInstanceOf[js.Dictionary](key) = new Resource(data).asInstanceOf[js.Any]
+    }
+    fileDict
+  }
+
+  println("Resource Initialized")
   def apply(path: String) = {
-    Dynamic.global.ScalaJS.resources.asInstanceOf[js.Dictionary].apply(path)
+    Dynamic.global
+           .ScalaJS
+           .resources
+           .asInstanceOf[js.Dictionary]
+           .apply(path)
+           .asInstanceOf[scala.js.Resource]
   }
   def create(value: String) = new Resource(value)
 }
 
 class Resource(base64: String){
-  lazy val string = Dynamic.global.atob(base64)
+  lazy val string = Dynamic.global.atob(base64).asInstanceOf[js.String]
 }
\ No newline at end of file