Get rid off bootstrap-markdown.

gshakhn · Apr 15, 2016 · 5626169 · 5626169
1 parent 585d2ab
commit 5626169
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -43,8 +43,7 @@ val client = project.dependsOn(sharedJS)
                         "org.webjars" % "bootstrap" % bootstrapVersion / "bootstrap.js" dependsOn s"$jQueryVersion/jquery.js",
                         "org.webjars.bower" % "react" % reactVersion / "react-with-addons.js" commonJSName "React",
                         "org.webjars.bower" % "react" % reactVersion / "react-dom.js" dependsOn "react-with-addons.js" commonJSName "ReactDOM",
-                        "org.webjars.bower" % "react" % reactVersion / "react-dom-server.js" dependsOn "react-dom.js" commonJSName "ReactDOMServer",
-                        "org.webjars.npm" % "bootstrap-markdown" % "2.9.0" / "bootstrap-markdown.js"
+                        "org.webjars.bower" % "react" % reactVersion / "react-dom-server.js" dependsOn "react-dom.js" commonJSName "ReactDOMServer"
                       ),
                       libraryDependencies ++= Seq(
                         "com.github.japgolly.scalajs-react" %%% "core" % scalajsReactVersion,
@@ -66,8 +65,7 @@ val server = project.dependsOn(sharedJVM)
                         "com.lihaoyi" %% "upickle" % upickleVersion,
                         "com.lihaoyi" %% "scalatags" % scalatagsVersion,
                         "com.typesafe.akka" %% "akka-actor" % "2.3.6",
-                        "org.webjars" % "bootstrap" % bootstrapVersion,
-                        "org.webjars.npm" % "bootstrap-markdown" % "2.9.0"),
+                        "org.webjars" % "bootstrap" % bootstrapVersion),
                       managedResources in Compile <<= (managedResources in Compile).dependsOn(fastOptJS in (client, Compile)),
                       // add  in fast opts JS
                       managedResources in Compile += (artifactPath in (client, Compile, fastOptJS)).value,

diff --git a/client/src/main/scala/com/gshakhn/privatewiki/client/components/PaperDisplay.scala b/client/src/main/scala/com/gshakhn/privatewiki/client/components/PaperDisplay.scala
@@ -25,9 +25,6 @@ object PaperDisplay {
 
   private[this] val component = ReactComponentB[Props]("PaperList")
     .renderBackend[Backend]
-    .componentDidMount(scope => Callback {
-      js.Dynamic.global.jQuery(scope.getDOMNode()).find(".foobar").markdown()
-    })
     .build
 
   def apply(paper: Paper): ReactComponentU[Props, Unit, Backend, TopNode] = {

diff --git a/server/src/main/scala/com/gshakhn/privatewiki/server/services/StaticService.scala b/server/src/main/scala/com/gshakhn/privatewiki/server/services/StaticService.scala
@@ -43,11 +43,6 @@ object Template {
             rel := "stylesheet",
             `type` := "text/css",
             href := "META-INF/resources/webjars/bootstrap/3.3.6/css/bootstrap.css"
-          ),
-          link(
-            rel := "stylesheet",
-            `type` := "text/css",
-            href := "META-INF/resources/webjars/bootstrap-markdown/2.9.0/css/bootstrap-markdown.min.css"
           )
         ),
         body(margin := 0, onload := "PrivateWikiRenderer().render()")