Merge branch 'develop'

* develop:
  Test fixes
  Continued work on Phaser.js

# Conflicts:
#	browser/jquery/src/main/scala/io/scalajs/jquery/JQueryElement.scala
#	browser/jquery/src/test/scala/io/scalajs/jquery/JQueryTest.scala
#	browser/phaser/src/main/scala/io/scalajs/dom/html/phaser/ArcadePhysics.scala
#	browser/phaser/src/main/scala/io/scalajs/dom/html/phaser/GameObjectCreator.scala
#	browser/phaser/src/main/scala/io/scalajs/dom/html/phaser/Phaser.scala
#	browser/phaser/src/main/scala/io/scalajs/dom/html/phaser/Physics.scala
#	browser/phaser/src/main/scala/io/scalajs/dom/html/phaser/PhysicsBody.scala
#	browser/phaser/src/main/scala/io/scalajs/dom/html/phaser/Sprite.scala
#	browser/pixijs/src/main/scala/io/scalajs/dom/html/pixijs/TextStyleOptions.scala
#	build.sbt
#	nodejs/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala
#	nodejs/src/test/scala/io/scalajs/nodejs/net/NetTest.scala

Author: ldaniels528

browser/dom/src/main/scala/io/scalajs/dom/html/URLSearchParams.scala

@@ -4,6 +4,7 @@ import io.scalajs.collection.Iterator
 import io.scalajs.dom.USVString
 
 import scala.scalajs.js
+import scala.scalajs.js.annotation.JSName
 import scala.scalajs.js.|
 
 /**
@@ -16,6 +17,7 @@ import scala.scalajs.js.|
   * @author lawrence.daniels@gmail.com
   */
 @js.native
+@JSName("URLSearchParams")
 class URLSearchParams(init: USVString | URLSearchParams) extends js.Object {
 
   /////////////////////////////////////////////////////////////////////////////////

browser/dom/src/test/scala/io/scalajs/dom/html/URLSearchParamsTest.scala

@@ -1,8 +1,11 @@
 package io.scalajs.dom.html
 
 import io.scalajs.dom.html.browser.console
+import io.scalajs.util.ScalaJsHelper._
 import org.scalatest.FunSpec
 
+import scala.scalajs.js
+
 /**
   * URL Search Params Test
   * @author lawrence.daniels@gmail.com
@@ -12,11 +15,14 @@ class URLSearchParamsTest extends FunSpec {
   describe("URLSearchParams") {
 
     it("should provide an iteration of values") {
-      val searchParams = new URLSearchParams("key1=value1&key2=value2")
+      // only if URLSearchParams is supported
+      if (isDefined(js.Dynamic.global.URLSearchParams)) {
+        val searchParams = new URLSearchParams("key1=value1&key2=value2")
 
-      // Display the key/value pairs
-      for (value <- searchParams.values()) {
-        console.log(value)
+        // Display the key/value pairs
+        for (value <- searchParams.values()) {
+          console.log(value)
+        }
       }
     }
 

browser/jquery/src/main/scala/io/scalajs/jquery/JQueryElement.scala

@@ -3,7 +3,7 @@ package io.scalajs.jquery
 import io.scalajs.JsNumber
 import io.scalajs.dom.html.HTMLElement
 import io.scalajs.dom.html.css.CSSSelector
-import io.scalajs.dom.{Element, Event, Node}
+import io.scalajs.dom.{Element, Event, Node, Text}
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSBracketAccess
@@ -42,16 +42,27 @@ trait JQueryElement extends HTMLElement {
   //    Methods
   ///////////////////////////////////////////////////////////////
 
+  /**
+    * Create a new jQuery object with elements added to the set of matched elements.
+    * @param selector could be any of the following:
+    *                 <ul>
+    *                 <li>selector: A string representing a selector expression to find additional elements to add to the set of matched elements.</li>
+    *                 <li>elements: One or more elements to add to the set of matched elements.</li>
+    *                 <li>html: An HTML fragment to add to the set of matched elements.</li>
+    *                 <li>selection: An existing jQuery object to add to the set of matched elements..</li>
+    *                 </ul>
+    */
+  def add(selector: Selector | CSSSelector | HTMLElement*): this.type = js.native
+
   /**
     * The add() method adds elements to an existing group of elements.
-    * @param element Required. Specifies a selector expression, a jQuery object, one or more elements
-    *                or an HTML snippet to be added to an existing group of elements
-    * @param context Optional. Specifies the point in the document at which the selector expression
-    *                should begin matching
+    * @param selector Required. Specifies a selector expression, a jQuery object, one or more elements
+    *                 or an HTML snippet to be added to an existing group of elements
+    * @param context  Optional. Specifies the point in the document at which the selector expression
+    *                 should begin matching
     * @return self reference
     */
-  def add(element: Element | Selector | CSSSelector | js.Any, context: Element | js.Any = js.native): this.type =
-    js.native
+  def add(selector: HTMLElement | Selector | CSSSelector, context: HTMLElement): this.type = js.native
 
   /**
     * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
@@ -78,9 +89,7 @@ trait JQueryElement extends HTMLElement {
     * @param speed    The optional speed parameter can take the following values: "slow", "fast", or milliseconds.
     * @param callback The optional callback parameter is a function to be executed after toggle() completes.
     */
-  def animate(params: AnimateOptions | js.Any,
-              speed: String | JsNumber = js.native,
-              callback: js.Function): this.type = js.native
+  def animate(params: AnimateOptions | js.Any, speed: String | JsNumber = js.native, callback: js.Function): this.type = js.native
 
   /**
     * Insert content, specified by the parameter, to the end of each element in the set of matched elements.
@@ -144,8 +153,7 @@ trait JQueryElement extends HTMLElement {
     *                 containing one or more events to attach to the elements, and
     *                 functions to run when the event occurs
     */
-  def bind(event: String, data: js.Any = js.native, function: js.Function, map: js.Any = js.native): this.type =
-    js.native
+  def bind(event: String, data: js.Any = js.native, function: js.Function, map: js.Any = js.native): this.type = js.native
 
   /**
     * Attach a handler to an event for the elements.
@@ -194,7 +202,7 @@ trait JQueryElement extends HTMLElement {
     * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
     * @param callback A function to execute each time the event is triggered.
     */
-  def change(callback: js.Function1[Event, Any] = js.native): this.type = js.native
+  def change[A](callback: js.Function1[Event, A] = js.native): this.type = js.native
 
   /**
     * Get the children of each element in the set of matched elements, optionally filtered by a selector.
@@ -480,8 +488,7 @@ trait JQueryElement extends HTMLElement {
     * @param selector A selector which should match the one originally passed to [[JQueryElement.on .on()]] when attaching event handlers.
     * @param handler  A handler function previously attached for the event(s), or the special value false.
     */
-  def off(events: String, selector: String = js.native, handler: js.Function1[Event, Unit] = js.native): this.type =
-    js.native
+  def off(events: String, selector: String = js.native, handler: js.Function1[Event, Unit] = js.native): this.type = js.native
 
   /**
     * Get the current coordinates of the first element in the set of matched elements, relative to the document.
@@ -511,19 +518,15 @@ trait JQueryElement extends HTMLElement {
     * @param handler  A function to execute when the event is triggered. The value false is also allowed as a shorthand
     *                 for a function that simply does return false.
     */
-  def on(events: String,
-         selector: String = js.native,
-         data: js.Any = js.native,
-         handler: js.Function = js.native): this.type = js.native
+  def on(events: String, selector: String = js.native, data: js.Any = js.native, handler: js.Function = js.native): this.type = js.native
 
   /**
     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
     * @param events  One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
     * @param data    Data to be passed to the handler in event.data when an event is triggered.
     * @param handler A function to execute at the time the event is triggered.
     */
-  def one(events: String, data: js.Any = js.native, handler: js.Function1[Event, Unit] = js.native): this.type =
-    js.native
+  def one(events: String, data: js.Any = js.native, handler: js.Function1[Event, Unit] = js.native): this.type = js.native
 
   def outerHeight(): Integer = js.native
 
@@ -568,7 +571,7 @@ trait JQueryElement extends HTMLElement {
     * @param content One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to
     *                insert at the beginning of each element in the set of matched elements.
     */
-  def prepend(content: js.Any, content1: js.Any*): this.type = js.native
+  def prepend(content: (String | HTMLElement | Text | js.Array[String | HTMLElement | Text])*): this.type = js.native
 
   /**
     * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
@@ -579,12 +582,6 @@ trait JQueryElement extends HTMLElement {
     */
   def prepend(fn: js.Function): this.type = js.native
 
-  /**
-    * Inserts content at the beginning of the selected elements
-    * @param content the specified content
-    */
-  def prepend(content: js.Any): this.type = js.native
-
   /**
     * Get the immediately preceding sibling of each element in the set of matched elements. If a selector is provided,
     * it retrieves the previous sibling only if it matches that selector.
@@ -614,13 +611,7 @@ trait JQueryElement extends HTMLElement {
     * @param propertyName The name of the property to get.
     * @return the property value
     */
-  def prop[T <: js.Any](propertyName: String): T = js.native
-
-  /**
-    * Get the value of a property for the first element in the set of matched elements.
-    * @param name The name of the property to get.
-    */
-  def prop(name: String): Boolean = js.native
+  def prop(propertyName: String): String = js.native
 
   /**
     * Set one or more properties for the set of matched elements.
@@ -888,4 +879,4 @@ trait JQueryElement extends HTMLElement {
     */
   def wrap(function: js.Function): this.type = js.native
 
-}
+}

browser/jquery/src/main/scala/io/scalajs/jquery/package.scala

@@ -1,5 +1,7 @@
 package io.scalajs
 
+import scala.scalajs.js
+
 /**
   * jquery package object
   * @author lawrence.daniels@gmail.com
@@ -11,4 +13,18 @@ package object jquery {
     */
   type Selector = String
 
+
+  /**
+    * JQuery Enrichment
+    * @param element the given [[JQueryElement]]
+    */
+  implicit class JQueryEnrichment(val element: JQueryElement) extends AnyVal {
+
+    @inline
+    def attr(name: String, function: (Int, String) => String): element.type = {
+      element.attr(name, function: js.Function2[Int, String, String])
+    }
+
+  }
+
 }

browser/jquery/src/test/scala/io/scalajs/jquery/JQueryTest.scala

@@ -1,7 +1,9 @@
 package io.scalajs.jquery
 
+import io.scalajs.dom.Event
+import io.scalajs.dom.html.browser.window
+import io.scalajs.dom.html.browser.window.document
 import io.scalajs.jquery.JQuery.$
-import org.scalajs.dom.html.browser.window
 import org.scalatest._
 
 import scala.scalajs.js
@@ -12,10 +14,11 @@ import scala.scalajs.js
   */
 class JQueryTest extends FunSpec {
 
-  import window.document
 
   describe("JQuery") {
+    // No JQuery on the server - See cheerio instead
 
+    /*
     it("should provide a add() method for adding elements to an existing group") {
       $("h1").add("p").add("span")
     }
@@ -30,29 +33,27 @@ class JQueryTest extends FunSpec {
 
       // case #2
       $("#greatphoto").attr(new js.Object {
-        val alt: String   = "Beijing Brush Seller"
+        val alt: String = "Beijing Brush Seller"
         val title: String = "photo by Kelly Clark"
       })
 
       // case #3
       $("#w3s").attr("href", "http://www.w3schools.com/jquery")
 
       // case #4
-      $("#greatphoto").attr("title", (i, `val`) => `val` + " - photo by Kelly Clark")
+      $("#greatphoto").attr("title", (i: Int, value: String) => value + " - photo by Kelly Clark")
     }
 
     it("should provide a change() method") {
       val element = $("input")
-      element
-        .change(_ => {
-          val $input = $(element)
-          $("p").html(
-            ".attr( 'checked' ): <b>" + $input.attr("checked") + "</b><br>" +
-              ".prop( 'checked' ): <b>" + $input.prop("checked") + "</b><br>" +
-              ".is( ':checked' ): <b>" + $input.is(":checked") + "</b>"
-          )
-        })
-        .change()
+      element.change { _: Event =>
+        val $input = $(element)
+        $("p").html(
+          ".attr( 'checked' ): <b>" + $input.attr("checked") + "</b><br>" +
+            ".prop( 'checked' ): <b>" + $input.prop("checked") + "</b><br>" +
+            ".is( ':checked' ): <b>" + $input.is(":checked") + "</b>"
+        )
+      }.change()
     }
 
     it("should provide a children() method") {
@@ -74,12 +75,12 @@ class JQueryTest extends FunSpec {
       $("p").click()
 
       // case #2
-      $("#btn1").click { _ =>
+      $("#btn1").click { _: Event =>
         window.alert("Text: " + $("#test").text())
       }
 
       // case #3
-      $("ul").click { event =>
+      $("ul").click { event: Event =>
         val target = $(event.target)
         if (target.is("li")) {
           target.css("background-color", "red")
@@ -149,7 +150,7 @@ class JQueryTest extends FunSpec {
 
     it("should provide a text() method") {
       $("div").text($("img").attr("alt"))
-    }
+    }*/
 
   }