diff options
| author | lihaoyi <haoyi.sg@gmail.com> | 2013-10-28 00:48:21 -0700 |
|---|---|---|
| committer | lihaoyi <haoyi.sg@gmail.com> | 2013-10-28 00:48:21 -0700 |
| commit | 14c889e632716a1e86c055e2c396179d6d3426df (patch) | |
| tree | 6e034d7e61d0aadc734a7b1d597fb5ab61ea758c /runtime | |
| parent | 680216d364b760e0f41c25c4f69fc061150a0341 (diff) | |
| download | workbench-14c889e632716a1e86c055e2c396179d6d3426df.tar.gz workbench-14c889e632716a1e86c055e2c396179d6d3426df.tar.bz2 workbench-14c889e632716a1e86c055e2c396179d6d3426df.zip | |
stuff works
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/build.sbt | 1 | ||||
| -rw-r--r-- | runtime/project/Build.scala | 11 | ||||
| -rw-r--r-- | runtime/project/build.properties | 1 | ||||
| -rw-r--r-- | runtime/project/build.sbt | 5 | ||||
| -rw-r--r-- | runtime/project/plugins.sbt | 1 | ||||
| -rw-r--r-- | runtime/src/main/scala/scala/js/Resource.scala (renamed from runtime/src/main/scala/scala/js/Resources.scala) | 3 |
6 files changed, 4 insertions, 18 deletions
diff --git a/runtime/build.sbt b/runtime/build.sbt new file mode 100644 index 0000000..fa2803f --- /dev/null +++ b/runtime/build.sbt @@ -0,0 +1 @@ +scalaJSSettings
\ No newline at end of file diff --git a/runtime/project/Build.scala b/runtime/project/Build.scala deleted file mode 100644 index b7d4ecc..0000000 --- a/runtime/project/Build.scala +++ /dev/null @@ -1,11 +0,0 @@ -import sbt._ -import Keys._ -import ch.epfl.lamp.sbtscalajs.ScalaJSPlugin._ -import ScalaJSKeys._ - -object Build extends sbt.Build { - lazy val resource = - project.in(file(".")) - .settings(scalaJSSettings: _*) - .settings(name := "resources") -}
\ No newline at end of file diff --git a/runtime/project/build.properties b/runtime/project/build.properties deleted file mode 100644 index 1ebc8a2..0000000 --- a/runtime/project/build.properties +++ /dev/null @@ -1 +0,0 @@ - sbt.version=0.13.0 diff --git a/runtime/project/build.sbt b/runtime/project/build.sbt deleted file mode 100644 index 3407493..0000000 --- a/runtime/project/build.sbt +++ /dev/null @@ -1,5 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT") - -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1") - - diff --git a/runtime/project/plugins.sbt b/runtime/project/plugins.sbt new file mode 100644 index 0000000..d872618 --- /dev/null +++ b/runtime/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("ch.epfl.lamp" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
\ No newline at end of file diff --git a/runtime/src/main/scala/scala/js/Resources.scala b/runtime/src/main/scala/scala/js/Resource.scala index 7bf344c..4cb2aac 100644 --- a/runtime/src/main/scala/scala/js/Resources.scala +++ b/runtime/src/main/scala/scala/js/Resource.scala @@ -3,8 +3,9 @@ package scala.js object Resource { def apply(path: String) = { - Dynamic.global.ScalaJS.resources(path) + Dynamic.global.ScalaJS.resources.asInstanceOf[js.Dictionary].apply(path) } + def create(value: String) = new Resource(value) } class Resource(base64: String){ |