Merge branch 'master' into deploy

# Conflicts:
#	project/plugins.sbt

Author: Mateusz Starzec

.travis.yml

@@ -23,5 +23,5 @@ before_script:
 
 script:
   - sbt ++$TRAVIS_SCALA_VERSION test
-  - sbt ++$TRAVIS_SCALA_VERSION +publishLocal
+  - sbt ++$TRAVIS_SCALA_VERSION publishLocal
   - cd example && sbt ++$TRAVIS_SCALA_VERSION compile fullOptJS

README.md

@@ -4,10 +4,10 @@ Static types for the jQuery API for [Scala.js](http://www.scala-js.org/) program
 
 ## Usage
 
-Add the following to your SBT build:
+Add the following dependency to your SBT build:
 
 ```scala
-libraryDependencies += "io.udash" %%% "udash-jquery" % "1.1.0"
+libraryDependencies += "io.udash" %%% "udash-jquery" % "2.0.0"
 ```
 
 then import the jQuery package: 
@@ -16,6 +16,21 @@ then import the jQuery package:
 import io.udash.wrappers.jquery._
 ```
 
+Since version `2.0.0` the wrapper does not force JS dependency on jQuery. You have to 
+add it manually by:
+ * explicit link in your `index.html`.
+ ```html
+ <script src="https://code.jquery.com/jquery-3.3.1.min.js" 
+         integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" 
+         crossorigin="anonymous"></script>
+ ```
+ * or a [Scala.js dependency](http://www.scala-js.org/doc/project/dependencies.html).
+ ```scala
+ jsDependencies +=
+   "org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js" minified "3.3.1/jquery.min.js"
+ ```
+ 
+
 ## Examples
 
 ```scala

build.sbt

@@ -5,7 +5,7 @@ import org.scalajs.jsenv.selenium.SeleniumJSEnv
 name := "udash-jquery"
 
 inThisBuild(Seq(
-  version := "1.2.0",
+  version := "2.0.0",
   organization := "io.udash",
   scalaVersion := "2.12.6",
   crossScalaVersions := Seq("2.11.12", "2.12.6"),
@@ -58,13 +58,13 @@ val commonJSSettings = Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.9.5",
+  "org.scala-js" %%% "scalajs-dom" % "0.9.6",
   "org.scalatest" %%% "scalatest" % "3.0.5" % Test,
   "com.lihaoyi" %%% "scalatags" % "0.6.7" % Test
 )
 
 jsDependencies +=
-  "org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js" minified "3.3.1/jquery.min.js"
+  "org.webjars" % "jquery" % "3.3.1" % Test / "3.3.1/jquery.js" minified "3.3.1/jquery.min.js"
 
 lazy val root = project.in(file("."))
   .enablePlugins(ScalaJSPlugin)

example/build.sbt

@@ -1,9 +1,10 @@
 name := "jquery-demo"
 
 inThisBuild(Seq(
-  version := "1.2.0",
+  version := "2.0.0",
   organization := "io.udash",
   scalaVersion := "2.12.6",
+  crossScalaVersions := Seq("2.11.12", "2.12.6"),
   scalacOptions ++= Seq(
     "-feature",
     "-deprecation",
@@ -31,6 +32,7 @@ val copyAssets = taskKey[Unit]("Copies all assets to the target directory.")
 val `jquery-demo` = project.in(file(".")).enablePlugins(ScalaJSPlugin)
   .settings(
     libraryDependencies ++= Dependencies.deps.value,
+    jsDependencies ++= Dependencies.jsDeps.value,
 
     /* move these files out of target/. */
     Compile / fullOptJS / crossTarget := generatedDir,

example/project/Dependencies.scala

@@ -1,12 +1,17 @@
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
+import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 import sbt._
 
 object Dependencies {
   val udashCoreVersion = "0.6.1"
-  val udashJQueryVersion = "1.2.0"
+  val udashJQueryVersion = "2.0.0"
 
   val deps = Def.setting(Seq[ModuleID](
     "io.udash" %%% "udash-core-frontend" % udashCoreVersion,
     "io.udash" %%% "udash-jquery" % udashJQueryVersion
   ))
+
+  val jsDeps = Def.setting(Seq[org.scalajs.sbtplugin.JSModuleID](
+    "org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js" minified "3.3.1/jquery.min.js"
+  ))
 }

example/project/build.properties

@@ -1 +1 @@
-sbt.version = 1.1.4
+sbt.version = 1.2.0

example/project/plugins.sbt

@@ -1,3 +1,3 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.1.4
+sbt.version = 1.2.0

project/plugins.sbt

@@ -2,8 +2,8 @@ logLevel := Level.Warn
 
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.2.0"
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
 
 // Deployment configuration
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")

src/main/scala/io/udash/wrappers/jquery/JQuery.scala

@@ -397,18 +397,10 @@ trait JQuery extends js.Object {
     * See: <a href="http://api.jquery.com/offsetParent/">jQuery Docs</a> */
   def offsetParent(): JQuery = js.native
 
-  /** Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns a number (without "px") representation of the value or null if called on an empty set of elements. <br/>
-    * See: <a href="http://api.jquery.com/outerHeight/">jQuery Docs</a> */
-  def outerHeight(includeMargin: Boolean = js.native): Double = js.native
-
   /** Set the CSS outer Height of each element in the set of matched elements. <br/>
     * See: <a href="http://api.jquery.com/outerHeight/">jQuery Docs</a> */
   def outerHeight(value: Int | Double | String): JQuery = js.native
 
-  /** Get the current computed width for the first element in the set of matched elements, including padding and border. <br/>
-    * See: <a href="http://api.jquery.com/outerWidth/">jQuery Docs</a> */
-  def outerWidth(includeMargin: Boolean = js.native): Double = js.native
-
   /** Set the CSS outer width of each element in the set of matched elements. <br/>
     * See: <a href="http://api.jquery.com/outerWidth/">jQuery Docs</a> */
   def outerWidth(value: Int | Double | String): JQuery = js.native
@@ -1142,11 +1134,23 @@ object JQuery {
       registrations.update(el, jqueryRegs)
     }
 
+    /** Get the current computed height for the first element in the set of matched elements, including padding,
+      * border, and optionally margin. Returns a number (without "px") representation of the value or undef
+      * if called on an empty set of elements. <br/>
+      * See: <a href="http://api.jquery.com/outerHeight/">jQuery Docs</a> */
+    def outerHeight(includeMargin: Boolean = false): Option[Double] =
+      jquery.asInstanceOf[js.Dynamic].outerHeight(includeMargin).asInstanceOf[UndefOr[Double]].toOption
+
     /** Set the CSS outer Height of each element in the set of matched elements. <br/>
       * See: <a href="http://api.jquery.com/outerHeight/">jQuery Docs</a> */
     def outerHeight(function: (Element, Int, Double) => Double): JQuery =
       jquery.asInstanceOf[js.Dynamic].outerHeight(js.ThisFunction.fromFunction3(function)).asInstanceOf[JQuery]
 
+    /** Get the current computed width for the first element in the set of matched elements, including padding and border. <br/>
+      * See: <a href="http://api.jquery.com/outerWidth/">jQuery Docs</a> */
+    def outerWidth(includeMargin: Boolean = false): Option[Double] =
+      jquery.asInstanceOf[js.Dynamic].outerWidth(includeMargin).asInstanceOf[UndefOr[Double]].toOption
+
     /** Set the CSS outer width of each element in the set of matched elements. <br/>
       * See: <a href="http://api.jquery.com/outerWidth/">jQuery Docs</a> */
     def outerWidth(function: (Element, Int, Double) => Double): JQuery =