From db659dc0a199a77466088aeaf0ad50d4815e9308 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Tue, 3 May 2016 10:55:02 +0200
Subject: Split implementation to internal mutable and external interface

---
 dottydoc/js/src/DottyDoc.scala          | 6 ++++--
 dottydoc/js/src/EntityIndex.scala       | 3 ++-
 dottydoc/js/src/html/EntityLayout.scala | 2 +-
 dottydoc/js/src/html/Member.scala       | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'dottydoc/js/src')

diff --git a/dottydoc/js/src/DottyDoc.scala b/dottydoc/js/src/DottyDoc.scala
index b9ad1d891..d08bd8cc8 100644
--- a/dottydoc/js/src/DottyDoc.scala
+++ b/dottydoc/js/src/DottyDoc.scala
@@ -6,12 +6,14 @@ import js.Dynamic.global
 import js.JSApp
 import js.annotation.{ JSExport, JSName }
 import org.scalajs.dom
-import model.Entities._
+import dom.document
+import dom.webworkers.Worker
+import model._
 import html.EntityLayout
 
 @JSExport object DottyDocJS {
   @JSExport def main(target: dom.html.Div) = {
-    global.document.title = "Dotty " + EntityIndex.currentEntity.path.mkString(".")
+    document.title = "Dotty " + EntityIndex.currentEntity.path.mkString(".")
     target.appendChild(EntityLayout(EntityIndex.currentEntity).html.render)
     hljs.initHighlightingOnLoad()
   }
diff --git a/dottydoc/js/src/EntityIndex.scala b/dottydoc/js/src/EntityIndex.scala
index 69bda283f..e58cdf88e 100644
--- a/dottydoc/js/src/EntityIndex.scala
+++ b/dottydoc/js/src/EntityIndex.scala
@@ -10,7 +10,8 @@ import js.annotation.JSName
 object EntityIndex {
   import microjson._
   import prickle._
-  import model.Entities._
+  import model._
+  import model.pickling._
 
   lazy val packages: Map[String, Package] =
     //FIXME
diff --git a/dottydoc/js/src/html/EntityLayout.scala b/dottydoc/js/src/html/EntityLayout.scala
index 51fd000b7..58ca3df49 100644
--- a/dottydoc/js/src/html/EntityLayout.scala
+++ b/dottydoc/js/src/html/EntityLayout.scala
@@ -5,7 +5,7 @@ package html
 import scalatags.JsDom.all._
 import org.scalajs.dom
 import org.scalajs.dom.html.{Anchor, Div}
-import model.Entities._
+import model._
 
 case class EntityLayout(entity: Entity) extends MemberLayout {
   def html = div(
diff --git a/dottydoc/js/src/html/Member.scala b/dottydoc/js/src/html/Member.scala
index 065626a1c..a862ffea4 100644
--- a/dottydoc/js/src/html/Member.scala
+++ b/dottydoc/js/src/html/Member.scala
@@ -8,7 +8,7 @@ import org.scalajs.dom
 import org.scalajs.dom.html.{Anchor, Div}
 
 trait MemberLayout {
-  import model.Entities._
+  import model._
 
   def member(m: Entity, parent: Entity) = {
     def toggleBetween(short: Div, and: Div): Unit =
-- 
cgit v1.2.3