Skip to content

GitLab

Commit 81e05f6a authored by Mathieu Leclaire's avatar Mathieu Leclaire
Browse files

To scala-js 0.6

parent a0b6c6c5
Hide whitespace changes
Inline Side-by-side
libraries/project/Build.scala
View file @ 81e05f6a
......@@ -13,8 +13,8 @@ object Root extends Defaults(OSGi) {
resolvers += DefaultMavenRepository,
resolvers += "openmole-public" at "http://maven.openmole.org/public",
resolvers += Resolver.sonatypeRepo("snapshots"),
resolvers += Resolver.sonatypeRepo("releases"),
resolvers += Resolver.url("scala-js-releases",
resolvers += Resolver.sonatypeRepo("releases")
/* resolvers += Resolver.url("scala-js-releases",
url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(
Resolver.ivyStylePatterns))
Resolver.ivyStylePatterns)*/)
}
libraries/project/plugins.sbt
View file @ 81e05f6a
......@@ -7,11 +7,6 @@ resolvers += "openmole-public" at "http://maven.openmole.org/public"
resolvers += "Typesafe repository" at
"http://repo.typesafe.com/typesafe/releases/"
resolvers ++= Seq(Resolver.sonatypeRepo("snapshots"),
Resolver.url("scala-js-releases",
url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(
Resolver.ivyStylePatterns))
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.0")
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
......@@ -20,5 +15,4 @@ addSbtPlugin("org.openmole" % "openmole-buildsystem-plugin" % "1.3-SNAPSHOT")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.0")
addSbtPlugin("fr.iscpif" %% "jsmanager" % "0.7.0-SNAPSHOT")
//addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0")
libraries/project/src/main/scala/OSGi.scala
View file @ 81e05f6a
......@@ -6,7 +6,8 @@ import com.typesafe.sbt.osgi.OsgiKeys
import OsgiKeys._
import root.libraries._
import org.openmole.buildsystem.OMKeys._
import scala.scalajs.sbtplugin.ScalaJSPlugin._
import org.scalajs.sbtplugin.ScalaJSPlugin
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
/**
* Created with IntelliJ IDEA.
......@@ -164,62 +165,48 @@ object OSGi extends Defaults(Apache) {
version := "18.0"
)
//lazy val scalaTagsVersion = "0.4.3-RC1"
lazy val scalaTagsVersion = "0.4.3-SNAPSHOT"
//lazy val scalaRxVersion = "0.2.7-M3"
lazy val scalaRxVersion = "0.2.6"
lazy val scalaDomVersion = "0.6.1"
lazy val scalaJQueryVersion = "0.6"
//lazy val scalaUpickleVersion = "0.2.6-RC1"
lazy val scalaUpickleVersion = "0.2.5"
//lazy val scalaAutowireVersion = "0.2.4-RC1"
lazy val scalaAutowireVersion = "0.2.3"
//lazy val jsSuffixRC1 = "_sjs0.6.0-RC1"
//lazy val jsSuffixM3 = "_sjs0.6.0-M3"
//lazy val jsSuffixM1 = "_sjs0.6.0-M1"
lazy val jsSuffixOld = "_sjs0.5"
lazy val scalaTagsVersion = "0.4.5"
lazy val scalaRxVersion = "0.2.7"
lazy val scalaDomVersion = "0.8.0"
lazy val scalaJQueryVersion = "0.8.0"
lazy val scalaUpickleVersion = "0.2.6"
lazy val scalaAutowireVersion = "0.2.4"
lazy val scalajsVersion = "0.6.0"
lazy val jsSuffix = "_sjs0.6"
lazy val scalajsDom = OsgiProject("scalajs-dom", exports = Seq("org.scalajs.dom.*")) settings(
libraryDependencies += "org.scala-lang.modules.scalajs" %%% ("scalajs-dom" + jsSuffixOld) % scalaDomVersion, version := scalaDomVersion)
libraryDependencies += "org.scala-js" %%% ("scalajs-dom" + jsSuffix) % scalaDomVersion, version := scalaDomVersion)
lazy val scalajsQuery = OsgiProject("scalajs-jquery", exports = Seq("org.scalajs.jquery.*")) settings(
libraryDependencies += "org.scala-lang.modules.scalajs" %%% ("scalajs-jquery" + jsSuffixOld) % scalaJQueryVersion, version := scalaJQueryVersion)
libraryDependencies += "be.doeraene" %%% ("scalajs-jquery" + jsSuffix) % scalaJQueryVersion, version := scalaJQueryVersion)
lazy val scalajsVersion = "0.5.6"
lazy val scalajsTools = OsgiProject("scalajs-tools", exports = Seq("scala.scalajs.tools.*", "scala.scalajs.ir.*", "com.google.javascript.*", "com.google.common.*", "rhino_ast.java.com.google.javascript.rhino.*", "org.json.*")) settings(
libraryDependencies += "org.scala-lang.modules.scalajs" %% "scalajs-tools" % scalajsVersion, version := scalajsVersion)
lazy val scalajsTools = OsgiProject("scalajs-tools", exports = Seq("org.scalajs.core.tools.*", "org.scalajs.core.ir.*", "com.google.javascript.*", "com.google.common.*", "rhino_ast.java.com.google.javascript.rhino.*", "org.json.*")) settings(
libraryDependencies += "org.scala-js" %% "scalajs-tools" % scalajsVersion, version := scalajsVersion)
lazy val scalajsLibrary = OsgiProject("scalajs-library", exports = Seq("scala.scalajs.*", "*.sjsir")) settings(
libraryDependencies += "org.scala-lang.modules.scalajs" %% "scalajs-library" % scalajsVersion, version := scalajsVersion)
lazy val scalajsLibrary = OsgiProject("scalajs-library", exports = Seq("scala.scalajs.*","*.sjsir")) settings(
libraryDependencies += "org.scala-js" %% "scalajs-library" % scalajsVersion, version := scalajsVersion)
/*
lazy val scalaTags = OsgiProject("com.scalatags", exports = Seq("scalatags.*", "*.sjsir")) settings(
libraryDependencies ++= Seq("com.lihaoyi" %% "scalatags" % scalaTagsVersion,
"com.lihaoyi" %%% ("scalatags" + jsSuffixOld) % scalaTagsVersion),
version := scalaTagsVersion
)*/
lazy val scalaTags = OsgiProject("com.scalatags", exports = Seq("scalatags.*", "*.sjsir")) settings(
libraryDependencies ++= Seq("fr.iscpif" %% "scalatags" % scalaTagsVersion,
"fr.iscpif" %%% ("scalatags" + jsSuffixOld) % scalaTagsVersion),
"com.lihaoyi" %%% ("scalatags" + jsSuffix) % scalaTagsVersion),
version := scalaTagsVersion
)
lazy val rx = OsgiProject("rx", exports = Seq("rx.*", "*.sjsir")) settings(
libraryDependencies ++= Seq("com.scalarx" %% "scalarx" % scalaRxVersion,
"com.scalarx" %%% ("scalarx" + jsSuffixOld) % scalaRxVersion),
libraryDependencies ++= Seq("com.lihaoyi" %% "scalarx" % scalaRxVersion,
"com.lihaoyi" %%% ("scalarx" + jsSuffix) % scalaRxVersion),
version := scalaRxVersion
)
lazy val upickle = OsgiProject("upickle", exports = Seq("upickle.*", "*.sjsir")) settings(
libraryDependencies ++= Seq("com.lihaoyi" %% "upickle" % scalaUpickleVersion,
"com.lihaoyi" %%% ("upickle" + jsSuffixOld) % scalaUpickleVersion),
"com.lihaoyi" %%% ("upickle" + jsSuffix) % scalaUpickleVersion),
version := scalaUpickleVersion
)
lazy val autowire = OsgiProject("autowire", exports = Seq("autowire.*", "*.sjsir")) settings(
libraryDependencies ++= Seq("com.lihaoyi" %% "autowire" % scalaAutowireVersion,
"com.lihaoyi" %%% ("autowire" + jsSuffixOld) % scalaAutowireVersion),
"com.lihaoyi" %%% ("autowire" + jsSuffix) % scalaAutowireVersion),
version := scalaAutowireVersion
)
......@@ -228,9 +215,9 @@ object OSGi extends Defaults(Apache) {
lazy val jawn = OsgiProject("jawn", exports = Seq("jawn.*", "utf8.json")) settings(
libraryDependencies += "org.spire-math" %% "jawn-parser" % jawnVersion, version := jawnVersion)
lazy val scaladgetVersion = "0.3.0-SNAPSHOT"
lazy val scaladgetVersion = "0.3.0"
lazy val scaladget = OsgiProject("scaladget", exports = Seq("fr.iscpif.scaladget.*", "*.sjsir")) settings(
libraryDependencies += "fr.iscpif" %%% ("scaladget" + jsSuffixOld) % scaladgetVersion, version := scaladgetVersion)
libraryDependencies += "fr.iscpif" %%% ("scaladget" + jsSuffix) % scaladgetVersion, version := scaladgetVersion)
lazy val jsonSimpleVersion = "1.1.1"
lazy val jsonSimple = OsgiProject("json-simple", exports = Seq("org.json.simple.*")) settings(
......
openmole/bin/openmole/src/main/resources/configuration/config.ini
View file @ 81e05f6a
......@@ -62,13 +62,13 @@ org-openmole-gui-bootstrap-osgi,\
org-openmole-gui-server-core,\
org-openmole-gui-server-factory,\
org-openmole-gui-server-state,\
org-openmole-gui-misc-js_sjs0.5,\
org-openmole-gui-misc-js_sjs0.6,\
org-openmole-gui-misc-utils,\
org-openmole-gui-client-core_sjs0.5,\
org-openmole-gui-client-service_sjs0.5,\
org-openmole-gui-ext-factoryui_sjs0.5,\
org-openmole-gui-ext-dataui_sjs0.5,\
org-openmole-gui-ext-data_sjs0.5,\
org-openmole-gui-client-core_sjs0.6,\
org-openmole-gui-client-service_sjs0.6,\
org-openmole-gui-ext-factoryui_sjs0.6,\
org-openmole-gui-ext-dataui_sjs0.6,\
org-openmole-gui-ext-data_sjs0.6,\
org-openmole-gui-shared,\
com-jsuereth-scala-arm,\
org-openmole-misc-console,\
......
openmole/gui/bootstrap/org.openmole.gui.bootstrap.js/src/main/scala/org/openmole/gui/bootstrap/js/JSPack.scala
View file @ 81e05f6a
......@@ -20,54 +20,53 @@ package org.openmole.gui.bootstrap.js
import org.openmole.misc.osgi.Activator
import org.openmole.misc.tools.io.FileUtil
import org.openmole.misc.tools.io.FileUtil._
import scala.scalajs.tools.io._
import scala.scalajs.tools.logging._
import scala.scalajs.tools.classpath._
import scala.scalajs.tools.classpath.builder._
import scala.scalajs.tools.optimizer._
import scala.scalajs.ir.Infos._
import org.scalajs.core.tools.io._
import org.scalajs.core.tools.logging._
import org.scalajs.core.tools.classpath._
import org.scalajs.core.tools.classpath.builder._
import org.scalajs.core.tools.optimizer._
import org.osgi.framework.Bundle
import scala.collection.JavaConverters._
import java.io.{ FileOutputStream, File }
object JSPack {
// val OPTIMIZED = "plugins-opt.js"
val JS_FILE = "plugins.js"
def apply(src: File, target: File, optimized: Boolean = true) = {
//FIXME: get the jar from bundles
val scalajsLib = copyJar("scalajs-library_2.11")
val scalajsLib = copyJar("scalajs-library_2.11-0.6.0")
val partialClasspath = PartialClasspathBuilder.buildIR(collection.immutable.Seq(scalajsLib, src))
val semantics = org.scalajs.core.tools.sem.Semantics.Defaults
val partialClasspath = PartialClasspathBuilder.build(collection.immutable.Seq(scalajsLib, src))
val completeClasspath = partialClasspath.resolve()
val optimizer = new ScalaJSOptimizer
val optimizer = new ScalaJSOptimizer(semantics)
val logger = new ScalaConsoleLogger
val out =
if (optimized) WritableMemVirtualJSFile("out.js")
else WritableFileVirtualJSFile(new java.io.File(target, JS_FILE))
val optimizedClasspath = optimizer.optimizeCP(
ScalaJSOptimizer.Inputs(completeClasspath),
ScalaJSOptimizer.OutputConfig(out, checkIR = false /*, wantSourceMap = !optimized*/ ),
logger
)
val out = WritableFileVirtualJSFile(new java.io.File(target, JS_FILE))
if (optimized) {
val fullOptOut = WritableFileVirtualJSFile(new java.io.File(target, JS_FILE))
val sems = semantics.optimized
val fullOptimizer = new ScalaJSClosureOptimizer
val fullyOptimizedCP = fullOptimizer.optimizeCP(
ScalaJSClosureOptimizer.Inputs(optimizedClasspath),
ScalaJSClosureOptimizer.OutputConfig(fullOptOut),
new ScalaJSClosureOptimizer(sems).optimizeCP(
new ScalaJSOptimizer(sems),
completeClasspath,
ScalaJSClosureOptimizer.Config(out),
logger
)
}
else {
optimizer.optimizeCP(
completeClasspath,
ScalaJSOptimizer.Config(out, checkIR = false /*, wantSourceMap = !optimized*/ ),
logger
)
}
}
def copyJar(name: String) = {
......
openmole/gui/client/org.openmole.gui.client.core/src/main/scala/org/openmole/gui/client/core/FlowChart.scala
View file @ 81e05f6a
......@@ -27,6 +27,7 @@ import scala.scalajs.concurrent.JSExecutionContext.Implicits.runNow
import autowire._
import org.openmole.gui.shared._
import org.openmole.gui.client.service.Post
import js.JSConverters._
trait GraphElement <: EventStates {
def literal: js.Dynamic
......@@ -67,18 +68,18 @@ class Window(nodes: Array[Task] = Array(), edges: Array[Edge] = Array()) {
)
}
case class Consts(selectedClass: js.String = "selected",
case class Consts(selectedClass: String = "selected",
circleGClass: String = "conceptG",
graphClass: js.String = "graph",
activeEditId: js.String = "active-editing",
DELETE_KEY: js.Number = 46,
nodeRadius: js.Number = 50)
graphClass: String = "graph",
activeEditId: String = "active-editing",
DELETE_KEY: Double = 46,
nodeRadius: Double = 50)
class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[Edge]) {
implicit def dynamicToString(d: js.Dynamic): String = d.asInstanceOf[js.String]
implicit def dynamicToString(d: js.Dynamic): String = d.asInstanceOf[String]
implicit def dynamicToBoolean(d: js.Dynamic): Boolean = d.asInstanceOf[js.Boolean]
implicit def dynamicToBoolean(d: js.Dynamic): Boolean = d.asInstanceOf[Boolean]
// SVG DEFINITIONS //
val consts = new Consts
......@@ -97,8 +98,8 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
val dragging: Var[Boolean] = Var(false)
svgSelection
.on("mousemove", (_: js.Any, _: js.Number) ⇒ mousemove)
.on("mouseup.scene", (_: js.Any, _: js.Number) ⇒ mouseup)
.on("mousemove", (_: js.Any, _: Double) ⇒ mousemove)
.on("mouseup.scene", (_: js.Any, _: Double) ⇒ mouseup)
// define arrow markers for graph links
defs.append("svg:marker")
......@@ -136,7 +137,7 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
// GLOBAL EVENTS //
d3.select(dom.window)
.on("keydown", (_: js.Any, _: js.Number) ⇒ {
.on("keydown", (_: js.Any, _: Double) ⇒ {
d3.event.keyCode match {
case consts.DELETE_KEY ⇒
tasks().filter(t ⇒ t().selected()).map { t ⇒
......@@ -203,7 +204,7 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
tasks() = tasks() :+ Var(task)
Obs(tasks) {
val mysel = circleRoot.selectAll("g").data(tasks(), (task: Var[Task], n: js.Number) ⇒ {
val mysel = circleRoot.selectAll("g").data(tasks().toJSArray, (task: Var[Task], n: Double) ⇒ {
task().id.toString
})
......@@ -222,7 +223,7 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
})
}
newG.on("mousedown", (t: Var[Task], n: js.Number) ⇒ {
newG.on("mousedown", (t: Var[Task], n: Double) ⇒ {
mouseDownTask() = Some(t())
d3.event.stopPropagation
......@@ -240,7 +241,7 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
.attr("d", "M" + x + "," + y + "L" + x + "," + y)
}
})
.on("mouseup.task", (t: Var[Task], n: js.Number) ⇒ {
.on("mouseup.task", (t: Var[Task], n: Double) ⇒ {
Seq(mouseDownTask()).flatten.map { mdt ⇒
if (t() != mdt) {
addEdge(mdt, t())
......@@ -259,7 +260,7 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
edges() = edges() :+ Var(edge)
Obs(edges) {
val mysel = pathRoot.selectAll("path").data(edges(), (edge: Var[Edge], n: js.Number) ⇒ {
val mysel = pathRoot.selectAll("path").data(edges().toJSArray, (edge: Var[Edge], n: Double) ⇒ {
edge().source().id + "+" + edge().target().id
})
......@@ -268,7 +269,7 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
Rx {
newPath.style("marker-end", "url(#end-arrow)")
.classed("link", true)
.attr("d", (edge: Var[Edge], n: js.Number) ⇒ {
.attr("d", (edge: Var[Edge], n: Double) ⇒ {
val source = edge().source().location()
val target = edge().target().location()
"M" + source._1 + "," + source._2 + "L" + target._1 + "," + target._2
......@@ -281,7 +282,7 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
}
)
newPath.on("mousedown", (edge: Var[Edge], n: js.Number) ⇒ {
newPath.on("mousedown", (edge: Var[Edge], n: Double) ⇒ {
unselectTasks
unselectEdges
edge().selected() = !edge().selected()
......@@ -292,4 +293,4 @@ class GraphCreator(svgSelection: Selection, _tasks: Array[Task], _edges: Array[E
mysel.exit().remove()
}
}
}
\ No newline at end of file
}
openmole/gui/client/org.openmole.gui.client.core/src/main/scala/org/openmole/gui/client/core/GUIClient.scala
View file @ 81e05f6a
......@@ -46,12 +46,12 @@ object GUIClient {
ClientService += ("org.openmole.gui.ext.data.FilePrototypeDataUI", PrototypeFactoryUI.fileFactory)
val db = DataBagUI(ClientService.taskFactories(1).dataUI)
db.name() = "premierr"
db.name() = "premier"
ClientService += db
db.name() = "first"
val db2 = DataBagUI(ClientService.taskFactories(1).dataUI)
ClientService += db2
db2.name() = "yop"
db2.name() = "yopp"
val proto = DataBagUI(ClientService.prototypeFactories(0).dataUI)
proto.name() = "proto1"
ClientService += proto
......@@ -61,7 +61,7 @@ object GUIClient {
topdiv.appendChild(
nav("mainMav",
Seq(
(navItem("settings", "Settings").render("data-toggle".attr := "modal", "data-target".attr := "#taskPanelID"), "task", () ⇒ {}),
(navItem("settings", "Settings").render(data("toggle") := "modal", data("target") := "#taskPanelID"), "task", () ⇒ {}),
(navItem("executions", "Executions").render, "env", () ⇒ {
println("Not yet")
})
......
openmole/gui/client/org.openmole.gui.client.core/src/main/scala/org/openmole/gui/client/core/Panel.scala
View file @ 81e05f6a
......@@ -134,7 +134,6 @@ class GenericPanel(uuid: String,
val factory = filter().factories.head
val dbUI = DataBagUI(factory.dataUI)
resetIODataUI(dbUI, factory)
// dbUI.name() = inputFilter.value
dbUI.name() = inputFilter.tag.value
dimInput.value = "0"
ClientService += dbUI
......@@ -177,7 +176,7 @@ class GenericPanel(uuid: String,
save
}).render
val saveButton = bs.button("Close", btn_test)("data-dismiss".attr := "modal", onclick := { () ⇒
val saveButton = bs.button("Close", btn_test)(data("dismiss") := "modal", onclick := { () ⇒
save
})
......
openmole/gui/client/org.openmole.gui.client.service/src/main/scala/org/openmole/gui/client/service/Post.scala
View file @ 81e05f6a
......@@ -20,14 +20,13 @@ package org.openmole.gui.client.service
import autowire._
import upickle._
import org.scalajs.dom
import org.scalajs.dom.extensions.Ajax
import scala.scalajs.concurrent.JSExecutionContext.Implicits.runNow
import scala.concurrent.Future
object Post extends autowire.Client[String, upickle.Reader, upickle.Writer] {
override def doCall(req: Request): Future[String] = {
val url = req.path.mkString("/")
dom.extensions.Ajax.post(
dom.ext.Ajax.post(
url = "http://localhost:8080/" + url,
data = upickle.write(req.args)
).map {
......
openmole/gui/ext/org.openmole.gui.ext.dataui/src/main/scala/org/openmole/gui/ext/dataui/InputPanelUI.scala
View file @ 81e05f6a
......@@ -21,7 +21,6 @@ import org.openmole.gui.misc.js.Forms._
import org.openmole.gui.misc.js.{ Forms ⇒ bs }
import scalatags.JsDom.all._
import scala.scalajs.js.annotation.JSExport
import org.openmole.gui.ext.dataui.PrototypeDataUI
import org.openmole.gui.misc.js.JsRxTags._
import rx._
import scala.scalajs.concurrent.JSExecutionContext.Implicits.runNow
......
openmole/gui/ext/org.openmole.gui.ext.dataui/src/main/scala/org/openmole/gui/ext/dataui/PanelUI.scala
View file @ 81e05f6a
package org.openmole.gui.ext.dataui
import org.scalajs.dom.HTMLElement
import org.scalajs.dom.raw.HTMLElement
import scalatags.JsDom.TypedTag
import scalatags.JsDom.all._
......
openmole/gui/misc/org.openmole.gui.misc.js/src/main/scala/org/openmole/gui/misc/js/Forms.scala
View file @ 81e05f6a
......@@ -17,10 +17,8 @@ package org.openmole.gui.misc.js
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import fr.iscpif.scaladget.mapping.{ Select2QueryOptions, Select2Options }
import fr.iscpif.scaladget.mapping.Select2Utils._
import org.scalajs.dom
import org.scalajs.dom._
import org.scalajs.dom.raw
import org.scalajs.dom.raw._
import scala.scalajs.js.annotation.JSExport
import scala.scalajs.js
import scalatags.JsDom.TypedTag
......@@ -41,7 +39,7 @@ object Forms {
implicit def formTagToNode(tt: HtmlTag): org.scalajs.dom.Node = tt.render
implicit class BootstrapTypedTag[+Output <: dom.Element](t: TypedTag[Output]) {
implicit class BootstrapTypedTag[+Output <: raw.Element](t: TypedTag[Output]) {
def +++(m: Seq[Modifier]) = t.copy(modifiers = t.modifiers :+ m.toSeq)
}
......@@ -106,7 +104,7 @@ object Forms {
//Select (to be used with button class aggregators )
def select(id: String, contents: Seq[(String, String)], key: ClassKeyAggregator) = buttonGroup()(
a(
`class` := "btn " + key.key + " dropdown-toggle", "data-toggle".attr := "dropdown", href := "#"
`class` := "btn " + key.key + " dropdown-toggle", data("toggle") := "dropdown", href := "#"
)("Select", span("caret")),
ul(`class` := "dropdown-menu")(
for (c ← contents) yield {
......@@ -118,7 +116,7 @@ object Forms {
)
def glyph(key: ClassKeyAggregator): TypedTag[HTMLSpanElement] =
span("glyphicon " + key.key)("aria-hidden".attr := "true")
span("glyphicon " + key.key)(aria.hidden := "true")
val glyph_edit = "glyphicon-pencil"
val glyph_trash = "glyphicon-trash"
......
openmole/gui/misc/org.openmole.gui.misc.js/src/main/scala/org/openmole/gui/misc/js/JsRxTags.scala
View file @ 81e05f6a
......@@ -52,7 +52,7 @@ object JsRxTags {
* the Obs onto the element itself so we have a reference to kill it when
* the element leaves the DOM (e.g. it gets deleted).
*/
implicit def rxMod[T <: dom.HTMLElement](r: Rx[HtmlTag]): Modifier = {
implicit def rxMod[T <: dom.raw.HTMLElement](r: Rx[HtmlTag]): Modifier = {
def rSafe = r.toTry match {
case Success(v) ⇒ v.render
case Failure(e) ⇒ span(e.toString).render
......
openmole/gui/misc/org.openmole.gui.misc.js/src/main/scala/org/openmole/gui/misc/js/ModalDialog.scala
View file @ 81e05f6a
......@@ -17,14 +17,13 @@ package org.openmole.gui.misc.js
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import org.scalajs.dom.{ HTMLDivElement, HTMLFormElement, HTMLElement }
import org.scalajs.dom.raw.{ HTMLFormElement, HTMLElement }
import org.scalajs.jquery.jQuery
import scalatags.JsDom.TypedTag
import scalatags.JsDom.all._
import org.scalajs.dom
import org.scalajs.dom.raw
import org.openmole.gui.misc.js.JsRxTags._
import fr.iscpif.scaladget.mapping.Select2Utils._
import rx._
class ModalDialog(ID: String, val header: TypedTag[HTMLFormElement], val body: TypedTag[HTMLElement], val footer: TypedTag[HTMLElement]) {
......@@ -32,12 +31,8 @@ class ModalDialog(ID: String, val header: TypedTag[HTMLFormElement], val body: T
val content =
div(`class` := "modal-content",
// Rx {
div(`class` := "modal-header")(header) // }
,
// Rx {
div(`class` := "modal-body", body) // }
,
div(`class` := "modal-header")(header),
div(`class` := "modal-body", body),
div(`class` := "modal-footer")(footer)
)
......@@ -47,13 +42,6 @@ class ModalDialog(ID: String, val header: TypedTag[HTMLFormElement], val body: T
)
)
/*jQuery(jQid).on("hide.bs.modal", { () ⇒
{
println("in hide.bs.modal reove")
jQuery(jQid).remove()
}
})*/
def jQid = "#" + ID
}
openmole/project/plugins.sbt
View file @ 81e05f6a
resolvers += Classpaths.sbtPluginSnapshots
//resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
resolvers += "openmole-public" at "http://maven.openmole.org/public"
resolvers += "Typesafe repository" at
"http://repo.typesafe.com/typesafe/releases/"
resolvers ++= Seq(Resolver.sonatypeRepo("snapshots"),
Resolver.url("scala-js-releases",
url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(
Resolver.ivyStylePatterns))
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.0")
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
......@@ -20,8 +13,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.0")
addSbtPlugin("org.openmole" % "openmole-buildsystem-plugin" % "1.3-SNAPSHOT")
addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.6")
//addSbtPlugin("fr.iscpif" %% "jsmanager" % "0.7.0-SNAPSHOT")
//addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0")
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.1.1")
openmole/project/project/plugins.sbt
View file @ 81e05f6a
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.0")
resolvers ++= Seq(Resolver.sonatypeRepo("snapshots"),
Resolver.sonatypeRepo("releases"),
Resolver.url("scala-js-releases",
url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(
Resolver.ivyStylePatterns))
//addSbtPlugin("fr.iscpif" %% "jsmanager" % "0.2.0")
\ No newline at end of file
openmole/project/src/main/scala/root/Libraries.scala
View file @ 81e05f6a
......@@ -6,7 +6,8 @@ import com.typesafe.sbt.osgi.OsgiKeys
import OsgiKeys._