Upgrade React to 0.14.1

japgolly · japgolly · commit b8745f72eb6c · 2015-11-01T17:11:06.000+11:00
diff --git a/core/src/main/scala/japgolly/scalajs/react/vdom/HtmlAttrs.scala b/core/src/main/scala/japgolly/scalajs/react/vdom/HtmlAttrs.scala
@@ -803,4 +803,7 @@ trait HtmlAttrs {
   final val onVolumeChange = "onVolumeChange".attr
   final val onWaiting = "onWaiting".attr
 
+  final val srcLang = "srcLang".attr
+  final val default = "default".attr
+  final val kind    = "kind".attr
 }
diff --git a/doc/CHANGELOG-0.10.md b/doc/CHANGELOG-0.10.md
@@ -40,6 +40,11 @@
 
 * Add `React.Children.toArray`.
 
+* Upgrade React to 0.14.1. Adds new attributes:
+  * `default`
+  * `kind`
+  * `srcLang`
+
 * Upgrade Scala.JS to 0.6.5.
 
 ---
diff --git a/doc/TESTING.md b/doc/TESTING.md
@@ -20,8 +20,8 @@ Setup
 
     // React JS itself.
     // NOTE: Requires react-with-addons.js instead of just react.js
-    jsDependencies += "org.webjars.npm" % "react"     % "0.14.0" % "test" / "react-with-addons.js" commonJSName "React"    minified "react-with-addons.min.js",
-    jsDependencies += "org.webjars.npm" % "react-dom" % "0.14.0" % "test" / "react-dom.js"         commonJSName "ReactDOM" minified "react-dom.min.js"         dependsOn "react-with-addons.js",
+    jsDependencies += "org.webjars.npm" % "react"     % "0.14.1" % "test" / "react-with-addons.js" commonJSName "React"    minified "react-with-addons.min.js",
+    jsDependencies += "org.webjars.npm" % "react-dom" % "0.14.1" % "test" / "react-dom.js"         commonJSName "ReactDOM" minified "react-dom.min.js"         dependsOn "react-with-addons.js",
 
     // Indicate that unit tests will access the DOM
     requiresDOM := true
diff --git a/doc/USAGE.md b/doc/USAGE.md
@@ -28,8 +28,8 @@ Setup
   libraryDependencies += "com.github.japgolly.scalajs-react" %%% "core" % "0.10.0"
 
   // React JS itself (Note the filenames, adjust as needed, eg. to remove addons.)
-  jsDependencies += "org.webjars.npm" % "react"     % "0.14.0" / "react-with-addons.js" commonJSName "React"    minified "react-with-addons.min.js",
-  jsDependencies += "org.webjars.npm" % "react-dom" % "0.14.0" / "react-dom.js"         commonJSName "ReactDOM" minified "react-dom.min.js" dependsOn "react-with-addons.js",
+  jsDependencies += "org.webjars.npm" % "react"     % "0.14.1" / "react-with-addons.js" commonJSName "React"    minified "react-with-addons.min.js",
+  jsDependencies += "org.webjars.npm" % "react-dom" % "0.14.1" / "react-dom.js"         commonJSName "ReactDOM" minified "react-dom.min.js" dependsOn "react-with-addons.js",
   ```
 
 Creating Virtual-DOM
diff --git a/gh-pages/index.html b/gh-pages/index.html
@@ -6,8 +6,8 @@
     <link rel="stylesheet" href="res/bootstrap.css">
     <link rel="stylesheet" href="res/app.css">
     <link rel="stylesheet" href="res/default.css">
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/react/0.14.0/react-with-addons.min.js"></script>
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/react/0.14.0/react-dom.min.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/react/0.14.1/react-with-addons.min.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/react/0.14.1/react-dom.min.js"></script>
     <script type="text/javascript" src="res/highlight.pack.js"></script>
 </head>
 <body>
diff --git a/project/Build.scala b/project/Build.scala
@@ -83,8 +83,8 @@ object ScalajsReact extends Build {
 
   def useReactJs(scope: String = "compile"): PE =
     _.settings(
-      jsDependencies += "org.webjars.npm" % "react"     % "0.14.0" % scope / "react-with-addons.js" commonJSName "React"    minified "react-with-addons.min.js",
-      jsDependencies += "org.webjars.npm" % "react-dom" % "0.14.0" % scope / "react-dom.js"         commonJSName "ReactDOM" minified "react-dom.min.js"         dependsOn "react-with-addons.js",
+      jsDependencies += "org.webjars.npm" % "react"     % "0.14.1" % scope / "react-with-addons.js" commonJSName "React"    minified "react-with-addons.min.js",
+      jsDependencies += "org.webjars.npm" % "react-dom" % "0.14.1" % scope / "react-dom.js"         commonJSName "ReactDOM" minified "react-dom.min.js"         dependsOn "react-with-addons.js",
       jsDependencies += "org.webjars"     % "sizzle"    % "2.1.1"  % scope / "sizzle.min.js"        commonJSName "Sizzle",
       skip in packageJSDependencies := false)
 

Original file line number	Diff line number	Diff line change
`@@ -803,4 +803,7 @@ trait HtmlAttrs {`
`803`	`803`	`final val onVolumeChange = "onVolumeChange".attr`
`804`	`804`	`final val onWaiting = "onWaiting".attr`
`805`	`805`
	`806`	`+ final val srcLang = "srcLang".attr`
	`807`	`+ final val default = "default".attr`
	`808`	`+ final val kind = "kind".attr`
`806`	`809`	`}`