Skip to content

Commit 12ed633

Browse files
committed
updated with review comments
1 parent 61f7165 commit 12ed633

File tree

5 files changed

+12
-201
lines changed

5 files changed

+12
-201
lines changed

js-src/functions/build.sbt

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.scalajs.core.tools.linker.backend.OutputMode
2-
31
enablePlugins(ScalaJSPlugin)
42

53
name := "functions"
@@ -12,7 +10,6 @@ libraryDependencies ++= Seq(
1210
// move our output folder to static
1311
artifactPath in(Compile, fastOptJS) := baseDirectory.value / ".." / ".." / "resources" / "js" / s"scala-${name.value}.js"
1412
artifactPath in(Compile, fullOptJS) := baseDirectory.value / ".." / ".." / "resources" / "js" / s"scala-${name.value}.js"
15-
scalaJSOptimizerOptions in (Compile, fullOptJS) ~= { _.withUseClosureCompiler(true) }
1613

1714
scalaJSUseMainModuleInitializer := true
18-
emitSourceMaps := false
15+
scalaJSLinkerConfig ~= { _.withSourceMap(false) }

js-src/functions/src/main/scala/org/scalalang/DownloadLinks.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.scalalang
22

33
import org.querki.jquery._
44
import org.scalajs.dom.{Element, document}
5-
import org.scalalang.utils.{JsUtils, Logger, OS}
5+
import org.scalalang.utils.{JsUtils, OS}
66

77
/**
88
* This updates our download links based on the OS of the client

js-src/functions/src/main/scala/org/scalalang/FunctionsApp.scala

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@ package org.scalalang
22

33
import org.querki.jquery._
44
import org.scalajs.dom.document
5-
import org.scalalang.utils.{Logger, RootLogger}
65

76
/**
87
* This is the main entry point for our application
98
*/
109
object FunctionsApp {
11-
RootLogger.setInfo()
12-
13-
private val logger: Logger = Logger[FunctionsApp.type]
14-
1510
def main(args: Array[String]): Unit = {
1611
$(document).ready(() => {
17-
logger.trace("Dom Ready")
12+
println("Dom Ready")
1813

1914
Tooltip()
2015
DownloadLinks()

js-src/functions/src/main/scala/org/scalalang/utils/Logger.scala

-158
This file was deleted.

js-src/functions/src/main/scala/org/scalalang/utils/OS.scala

+9-32
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,27 @@ import org.scalajs.dom.window
55
/**
66
* Find which OS our client is running
77
*/
8-
sealed trait OS {
9-
val navigator: String
10-
val label: String
11-
}
8+
sealed abstract class OS(val navigator: String, val label: String)
129

1310
object OS {
1411

15-
private val logger: Logger = Logger[OS.type]
12+
case object Windows extends OS("Win", "windows")
1613

17-
case object Windows extends OS {
18-
override val navigator: String = "Win"
19-
override val label: String = "windows"
20-
}
21-
22-
case object Mac extends OS {
23-
override val navigator: String = "Mac"
24-
override val label: String = "osx"
25-
}
14+
case object Mac extends OS("Mac", "osx")
2615

27-
case object Linux extends OS {
28-
override val navigator: String = "Linux"
29-
override val label: String = "linux"
30-
}
16+
case object Linux extends OS("Linux", "linux")
3117

32-
case object Unix extends OS {
33-
override val navigator: String = "X11"
34-
override val label: String = "unix"
35-
}
18+
case object Unix extends OS("X11", "unix")
3619

3720
def apply(): OS = {
3821
val appVersion: String = window.navigator.appVersion
3922
val default: OS = Linux
4023

4124
val os: OS = Array(Windows, Mac, Linux, Unix)
42-
.foldLeft(default)((last: OS, os: OS) => {
43-
if (appVersion.contains(os.navigator)) {
44-
os
45-
}
46-
else {
47-
last
48-
}
49-
})
50-
51-
logger.trace("OS: " + os)
25+
.find(os => appVersion.contains(os.navigator))
26+
.getOrElse(default)
27+
28+
println("OS: " + os)
5229

5330
os
5431
}

0 commit comments

Comments
 (0)