changed color helpers, and other things

Author: lihaoyi

src/main/scala/scala/scalajs/extensions/Extensions.scala

@@ -18,17 +18,33 @@ class EasySeq[T](jsLength: js.Number, jsApply: js.Number => T) extends Seq[T]{
   }
 }
 
-
+case class Color(r: Int, g: Int, b: Int){
+  override def toString() = s"rgb($r, $g, $b)"
+  def *(c: Color) = Color(r * c.r, g * c.g, b * c.b)
+  def +(c: Color) = Color(r + c.r, g + c.g, b + c.b)
+}
 object Color{
-  def rgb(r: Int, g: Int, b: Int) = s"rgb($r, $g, $b)"
-  val White = rgb(255, 255, 255)
-  val Red = rgb(255, 0, 0)
-  val Green = rgb(0, 255, 0)
-  val Blue = rgb(0, 0, 255)
-  val Cyan = rgb(0, 255, 255)
-  val Magenta = rgb(255, 0, 255)
-  val Yellow = rgb(255, 255, 0)
-  val Black = rgb(0, 0, 0)
+
+  val d = "[0-9a-zA-Z]"
+  val RGB = "rgb\\((\\d+), (\\d+), (\\d+)\\)".r
+  val ShortHex = s"#($d)($d)($d)".r
+  val LongHex = s"#($d$d)($d$d)($d$d)".r
+  def hex(x: String) = Integer.parseInt(x, 16)
+  def apply(s: String): Color = {
+    s match{
+      case RGB(r, g, b) => Color(r.toInt, g.toInt, b.toInt)
+      case ShortHex(r, g, b) => Color(hex(r) * 16, hex(g) * 16, hex(b) * 16)
+      case LongHex(r, g, b) => Color(hex(r), hex(g), hex(b))
+    }
+  }
+  val White = Color(255, 255, 255)
+  val Red = Color(255, 0, 0)
+  val Green = Color(0, 255, 0)
+  val Blue = Color(0, 0, 255)
+  val Cyan = Color(0, 255, 255)
+  val Magenta = Color(255, 0, 255)
+  val Yellow = Color(255, 255, 0)
+  val Black = Color(0, 0, 0)
   val all = Seq(
     White,
     Red,

src/main/scala/scala/scalajs/extensions/package.scala

@@ -23,19 +23,23 @@ package object extensions {
       prepCircle(x, y, r)
       ctx.stroke()
     }
-    def prepPath(points: (js.Number, js.Number)*) = {
+    def prepPath(points: Seq[(js.Number, js.Number)], closed: Boolean = true) = {
       ctx.beginPath()
-      ctx.moveTo(points.last._1, points.last._2)
+      if (closed) ctx.moveTo(points.last._1, points.last._2)
       for(p <- points){
         ctx.lineTo(p._1, p._2)
       }
     }
     def fillPath(points: (js.Number, js.Number)*) = {
-      prepPath(points:_*)
+      prepPath(points)
       ctx.fill()
     }
     def strokePath(points: (js.Number, js.Number)*) = {
-      prepPath(points:_*)
+      prepPath(points)
+      ctx.stroke()
+    }
+    def strokePathOpen(points: (js.Number, js.Number)*) = {
+      prepPath(points, closed = false)
       ctx.stroke()
     }
   }

src/main/scala/scala/scalajs/js/lib.scala

@@ -1684,7 +1684,7 @@ trait NodeListOf[TNode <: Node] extends NodeList {
 
 }
 
-trait XMLSerializer extends js.Object {
+class XMLSerializer extends js.Object {
   def serializeToString(target: Node): js.String = ???
 }
 
@@ -1945,6 +1945,7 @@ object Option extends js.Object {
 /* ??? ConstructorMember(FunSignature(List(),List(FunParam(Ident(text),true,Some(TypeRef(CoreType(string),List()))), FunParam(Ident(value),true,Some(TypeRef(CoreType(string),List()))), FunParam(Ident(defaultSelected),true,Some(TypeRef(CoreType(boolean),List()))), FunParam(Ident(selected),true,Some(TypeRef(CoreType(boolean),List())))),Some(TypeRef(TypeName(HTMLOptionElement),List())))) */
 }
 
+
 object Image extends js.Object {
 /* ??? ConstructorMember(FunSignature(List(),List(FunParam(Ident(width),true,Some(TypeRef(CoreType(number),List()))), FunParam(Ident(height),true,Some(TypeRef(CoreType(number),List())))),Some(TypeRef(TypeName(HTMLImageElement),List())))) */
 }
@@ -2471,7 +2472,7 @@ object Worker extends js.Object {
 
 }
 package js{
-  object JsGlobals extends js.GlobalScope {
+  object globals extends js.GlobalScope {
     def parseInt(string: js.String, radix: js.Number): js.Number = ???
     def parseFloat(string: js.String, radix: js.Number): js.Number = ???
     var ondragend: js.Function1[DragEvent, js.Any] = _