Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to Scala.js 0.6.18 #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump to Scala.js 0.6.18 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@ name := "Scala.js Ace"

normalizedName := "scalajs-ace"

version := "0.0.4"
version := "0.0.5-SNAPSHOT"

organization := "com.scalawarrior"

scalaVersion := "2.11.8"

crossScalaVersions := Seq("2.11.8", "2.12.1")
scalaVersion := "2.12.2"

libraryDependencies +=
"org.scala-js" %%% "scalajs-dom" % "0.9.1"
"org.scala-js" %%% "scalajs-dom" % "0.9.2"

scalacOptions ++= Seq(
"-deprecation",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.15
2 changes: 1 addition & 1 deletion project/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
68 changes: 34 additions & 34 deletions src/main/scala/com/scalawarrior/scalajs/ace/Ace.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ trait Position extends js.Object {
}

@js.native
@JSName("AceAjax.KeyBinding")
@JSGlobal("AceAjax.KeyBinding")
class KeyBinding protected () extends js.Object {
def this(editor: Editor) = this()
def setDefaultHandler(kb: js.Any): js.Dynamic = js.native
Expand All @@ -67,7 +67,7 @@ class KeyBinding protected () extends js.Object {
}

@js.native
@JSName("AceAjax.KeyBinding")
@JSGlobal("AceAjax.KeyBinding")
object KeyBinding extends js.Object {
}

Expand All @@ -91,7 +91,7 @@ trait Ace extends js.Object {
}

@js.native
@JSName("AceAjax.Anchor")
@JSGlobal("AceAjax.Anchor")
class Anchor protected () extends js.Object {
def this(doc: Document, row: Double, column: Double) = this()
def on(event: String, fn: js.Function1[js.Any, Any]): js.Dynamic = js.native
Expand All @@ -103,12 +103,12 @@ class Anchor protected () extends js.Object {
}

@js.native
@JSName("AceAjax.Anchor")
@JSGlobal("AceAjax.Anchor")
object Anchor extends js.Object {
}

@js.native
@JSName("AceAjax.BackgroundTokenizer")
@JSGlobal("AceAjax.BackgroundTokenizer")
class BackgroundTokenizer protected () extends js.Object {
def this(tokenizer: Tokenizer, editor: Editor) = this()
var states: js.Array[js.Any] = js.native
Expand All @@ -122,12 +122,12 @@ class BackgroundTokenizer protected () extends js.Object {
}

@js.native
@JSName("AceAjax.BackgroundTokenizer")
@JSGlobal("AceAjax.BackgroundTokenizer")
object BackgroundTokenizer extends js.Object {
}

@js.native
@JSName("AceAjax.Document")
@JSGlobal("AceAjax.Document")
class Document protected () extends js.Object {
def this(text: String = ???) = this()
def on(event: String, fn: js.Function1[js.Any, Any]): js.Dynamic = js.native
Expand Down Expand Up @@ -159,7 +159,7 @@ class Document protected () extends js.Object {
}

@js.native
@JSName("AceAjax.Document")
@JSGlobal("AceAjax.Document")
object Document extends js.Object {
}

Expand Down Expand Up @@ -272,15 +272,15 @@ trait IEditSession extends js.Object {
}

@js.native
@JSName("AceAjax.EditSession")
@JSGlobal("AceAjax.EditSession")
object EditSession extends js.Object {
/* ??? ConstructorMember(FunSignature(List(),List(FunParam(Ident(text),false,Some(TypeRef(CoreType(string),List()))), FunParam(Ident(mode),true,Some(TypeRef(TypeName(TextMode),List())))),Some(TypeRef(TypeName(IEditSession),List())))) */
/* ??? ConstructorMember(FunSignature(List(),List(FunParam(Ident(content),false,Some(TypeRef(CoreType(string),List()))), FunParam(Ident(mode),true,Some(TypeRef(CoreType(string),List())))),Some(TypeRef(TypeName(IEditSession),List())))) */
/* ??? ConstructorMember(FunSignature(List(),List(FunParam(Ident(text),false,Some(TypeRef(TypeName(Array),List(TypeRef(CoreType(string),List()))))), FunParam(Ident(mode),true,Some(TypeRef(CoreType(string),List())))),Some(TypeRef(TypeName(IEditSession),List())))) */
}

@js.native
@JSName("AceAjax.Editor")
@JSGlobal("AceAjax.Editor")
class Editor protected () extends js.Object {
def this(renderer: VirtualRenderer, session: IEditSession = ???) = this()
def addEventListener(ev: String, callback: js.Function): js.Dynamic = js.native
Expand Down Expand Up @@ -417,7 +417,7 @@ class Editor protected () extends js.Object {
}

@js.native
@JSName("AceAjax.Editor")
@JSGlobal("AceAjax.Editor")
object Editor extends js.Object {
}

Expand All @@ -430,7 +430,7 @@ trait EditorChangeEvent extends js.Object {
}

@js.native
@JSName("AceAjax.PlaceHolder")
@JSGlobal("AceAjax.PlaceHolder")
class PlaceHolder protected () extends js.Object {
def this(session: Document, length: Double, pos: Double, others: String, mainClass: String, othersClass: String) = this()
def this(session: IEditSession, length: Double, pos: Position, positions: js.Array[Position]) = this()
Expand All @@ -445,7 +445,7 @@ class PlaceHolder protected () extends js.Object {
}

@js.native
@JSName("AceAjax.PlaceHolder")
@JSGlobal("AceAjax.PlaceHolder")
object PlaceHolder extends js.Object {
}

Expand All @@ -460,13 +460,13 @@ trait IRangeList extends js.Object {
}

@js.native
@JSName("AceAjax.RangeList")
@JSGlobal("AceAjax.RangeList")
object RangeList extends js.Object {
/* ??? ConstructorMember(FunSignature(List(),List(),Some(TypeRef(TypeName(IRangeList),List())))) */
}

@js.native
@JSName("AceAjax.Range")
@JSGlobal("AceAjax.Range")
class Range protected () extends js.Object {
def this(startRow: Double, startColumn: Double, endRow: Double, endColumn: Double) = this()
var startRow: Double = js.native
Expand Down Expand Up @@ -504,23 +504,23 @@ class Range protected () extends js.Object {
}

@js.native
@JSName("AceAjax.Range")
@JSGlobal("AceAjax.Range")
object Range extends js.Object {
def fromPoints(pos1: Position, pos2: Position): Range = js.native
}

@js.native
@JSName("AceAjax.RenderLoop")
@JSGlobal("AceAjax.RenderLoop")
class RenderLoop extends js.Object {
}

@js.native
@JSName("AceAjax.RenderLoop")
@JSGlobal("AceAjax.RenderLoop")
object RenderLoop extends js.Object {
}

@js.native
@JSName("AceAjax.ScrollBar")
@JSGlobal("AceAjax.ScrollBar")
class ScrollBar protected () extends js.Object {
def this(parent: HTMLElement) = this()
def onScroll(e: js.Any): js.Dynamic = js.native
Expand All @@ -531,12 +531,12 @@ class ScrollBar protected () extends js.Object {
}

@js.native
@JSName("AceAjax.ScrollBar")
@JSGlobal("AceAjax.ScrollBar")
object ScrollBar extends js.Object {
}

@js.native
@JSName("AceAjax.Search")
@JSGlobal("AceAjax.Search")
class Search extends js.Object {
def set(options: js.Any): Search = js.native
def getOptions(): js.Dynamic = js.native
Expand All @@ -547,12 +547,12 @@ class Search extends js.Object {
}

@js.native
@JSName("AceAjax.Search")
@JSGlobal("AceAjax.Search")
object Search extends js.Object {
}

@js.native
@JSName("AceAjax.Selection")
@JSGlobal("AceAjax.Selection")
class Selection protected () extends js.Object {
def this(session: IEditSession) = this()
def addEventListener(ev: String, callback: js.Function): js.Dynamic = js.native
Expand Down Expand Up @@ -608,12 +608,12 @@ class Selection protected () extends js.Object {
}

@js.native
@JSName("AceAjax.Selection")
@JSGlobal("AceAjax.Selection")
object Selection extends js.Object {
}

@js.native
@JSName("AceAjax.Split")
@JSGlobal("AceAjax.Split")
class Split extends js.Object {
def getSplits(): Double = js.native
def getEditor(idx: Double): js.Dynamic = js.native
Expand All @@ -631,12 +631,12 @@ class Split extends js.Object {
}

@js.native
@JSName("AceAjax.Split")
@JSGlobal("AceAjax.Split")
object Split extends js.Object {
}

@js.native
@JSName("AceAjax.TokenIterator")
@JSGlobal("AceAjax.TokenIterator")
class TokenIterator protected () extends js.Object {
def this(session: IEditSession, initialRow: Double, initialColumn: Double) = this()
def stepBackward(): js.Array[String] = js.native
Expand All @@ -647,24 +647,24 @@ class TokenIterator protected () extends js.Object {
}

@js.native
@JSName("AceAjax.TokenIterator")
@JSGlobal("AceAjax.TokenIterator")
object TokenIterator extends js.Object {
}

@js.native
@JSName("AceAjax.Tokenizer")
@JSGlobal("AceAjax.Tokenizer")
class Tokenizer protected () extends js.Object {
def this(rules: js.Any, flag: String) = this()
def getLineTokens(): js.Dynamic = js.native
}

@js.native
@JSName("AceAjax.Tokenizer")
@JSGlobal("AceAjax.Tokenizer")
object Tokenizer extends js.Object {
}

@js.native
@JSName("AceAjax.UndoManager")
@JSGlobal("AceAjax.UndoManager")
class UndoManager extends js.Object {
def execute(options: js.Any): js.Dynamic = js.native
def undo(dontSelect: Boolean = ???): Range = js.native
Expand All @@ -675,12 +675,12 @@ class UndoManager extends js.Object {
}

@js.native
@JSName("AceAjax.UndoManager")
@JSGlobal("AceAjax.UndoManager")
object UndoManager extends js.Object {
}

@js.native
@JSName("AceAjax.VirtualRenderer")
@JSGlobal("AceAjax.VirtualRenderer")
class VirtualRenderer protected () extends js.Object {
def this(container: HTMLElement, theme: String = ???) = this()
var scroller: js.Any = js.native
Expand Down Expand Up @@ -748,7 +748,7 @@ class VirtualRenderer protected () extends js.Object {
}

@js.native
@JSName("AceAjax.VirtualRenderer")
@JSGlobal("AceAjax.VirtualRenderer")
object VirtualRenderer extends js.Object

}
Expand Down