Skip to content

Commit 9a698b2

Browse files
author
exoego
committed
Merge remote-tracking branch 'upstream/master' into srcObject
2 parents e2b167b + df7033c commit 9a698b2

File tree

4 files changed

+33
-10
lines changed

4 files changed

+33
-10
lines changed

src/main/scala/org/scalajs/dom/ext/Extensions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ object Ajax {
276276
} else {
277277
// fall back to copying the data
278278
val tempBuffer = ByteBuffer.allocateDirect(data.remaining)
279-
val origPosition = data.position
279+
val origPosition = data.position()
280280
tempBuffer.put(data)
281281
data.position(origPosition)
282282
tempBuffer.typedArray()

src/main/scala/org/scalajs/dom/html.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,28 @@ object html {
99
type Applet = raw.HTMLAppletElement
1010
type Audio = raw.HTMLAudioElement
1111
type Area = raw.HTMLAreaElement
12+
@deprecated("Non-standard", "0.9.8")
1213
type AreasCollection = raw.HTMLAreasCollection
1314
type Base = raw.HTMLBaseElement
1415
@deprecated("Obsolete.", "DOM Level 2")
1516
type BaseFont = raw.HTMLBaseFontElement
1617
@deprecated("Non standard.", "forever")
1718
type BGSound = raw.HTMLBGSoundElement
19+
@deprecated("Non-standard", "0.9.8")
1820
type BlockElement = raw.HTMLBlockElement
1921
type Body = raw.HTMLBodyElement
2022
type Button = raw.HTMLButtonElement
2123
type BR = raw.HTMLBRElement
2224
type Canvas = raw.HTMLCanvasElement
2325
type Collection = raw.HTMLCollection
2426
type DataList = raw.HTMLDataListElement
27+
@deprecated("Non-standard.", "0.9.8")
2528
type DD = raw.HTMLDDElement
2629
@deprecated("Obsolete.", "HTML 4")
2730
type Directory = raw.HTMLDirectoryElement
2831
type Div = raw.HTMLDivElement
2932
type DList = raw.HTMLDListElement
33+
@deprecated("Non-standard.", "0.9.8")
3034
type DT = raw.HTMLDTElement
3135
type Document = raw.HTMLDocument
3236
type Element = raw.HTMLElement
@@ -69,6 +73,7 @@ object html {
6973
type Paragraph = raw.HTMLParagraphElement
7074
type Param = raw.HTMLParamElement
7175
type Pre = raw.HTMLPreElement
76+
@deprecated("Non-standard", "0.9.8")
7277
type Phrase = raw.HTMLPhraseElement
7378
type Progress = raw.HTMLProgressElement
7479
type Quote = raw.HTMLQuoteElement
@@ -82,7 +87,13 @@ object html {
8287
type TableCaption = raw.HTMLTableCaptionElement
8388
type TableCell = raw.HTMLTableCellElement
8489
type TableCol = raw.HTMLTableColElement
90+
@deprecated(
91+
"https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableDataCellElement",
92+
"0.9.8")
8593
type TableDataCell = raw.HTMLTableDataCellElement
94+
@deprecated(
95+
"https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableHeaderCellElement",
96+
"0.9.8")
8697
type TableHeaderCell = raw.HTMLTableHeaderCellElement
8798
type TableRow = raw.HTMLTableRowElement
8899
type TableSection = raw.HTMLTableSectionElement

src/main/scala/org/scalajs/dom/raw/Html.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,9 @@ abstract class HTMLTableElement extends HTMLElement {
858858
*/
859859
@js.native
860860
@JSGlobal
861+
@deprecated(
862+
"https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableDataCellElement",
863+
"0.9.8")
861864
abstract class HTMLTableDataCellElement extends HTMLTableCellElement
862865

863866
/**
@@ -918,6 +921,7 @@ abstract class HTMLParagraphElement extends HTMLElement {
918921
}
919922

920923
@js.native
924+
@deprecated("Non-standard", "0.9.8")
921925
trait HTMLAreasCollection extends HTMLCollection {
922926
def remove(index: Int = js.native): Unit = js.native
923927

@@ -1126,6 +1130,7 @@ abstract class HTMLSelectElement extends HTMLElement {
11261130
}
11271131

11281132
@js.native
1133+
@deprecated("Non-standard.", "0.9.8")
11291134
trait HTMLBlockElement extends HTMLElement {
11301135
var width: Double = js.native
11311136
var cite: String = js.native
@@ -1176,6 +1181,7 @@ abstract class HTMLMetaElement extends HTMLElement {
11761181

11771182
@js.native
11781183
@JSGlobal
1184+
@deprecated("Non-standard.", "0.9.8")
11791185
abstract class HTMLDDElement extends HTMLElement {
11801186
var noWrap: Boolean = js.native
11811187
}
@@ -1381,6 +1387,7 @@ abstract class HTMLMapElement extends HTMLElement {
13811387
*
13821388
* MDN
13831389
*/
1390+
@deprecated("Non-standard", "0.9.8")
13841391
def areas: HTMLAreasCollection = js.native
13851392
}
13861393

@@ -2024,6 +2031,9 @@ abstract class HTMLQuoteElement extends HTMLElement {
20242031
*/
20252032
@js.native
20262033
@JSGlobal
2034+
@deprecated(
2035+
"https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableHeaderCellElement",
2036+
"0.9.8")
20272037
abstract class HTMLTableHeaderCellElement extends HTMLTableCellElement
20282038

20292039
/**
@@ -3002,6 +3012,7 @@ abstract class HTMLPreElement extends HTMLElement {
30023012

30033013
@js.native
30043014
@JSGlobal
3015+
@deprecated("Non-standard.", "0.9.8")
30053016
abstract class HTMLPhraseElement extends HTMLElement {
30063017
var dateTime: String = js.native
30073018
}
@@ -3855,6 +3866,7 @@ object HTMLMediaElement extends js.Object {
38553866

38563867
@js.native
38573868
@JSGlobal
3869+
@deprecated("Non-standard.", "0.9.8")
38583870
abstract class HTMLDTElement extends HTMLElement {
38593871
var noWrap: Boolean = js.native
38603872
}

src/main/scala/org/scalajs/dom/raw/lib.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ abstract class Node extends EventTarget {
10681068
*
10691069
* MDN
10701070
*/
1071-
def nodeValue: String = js.native
1071+
var nodeValue: String = js.native
10721072

10731073
/**
10741074
* Returns a Node representing the last direct child node of the node, or null if the
@@ -7441,12 +7441,12 @@ trait Console extends js.Object {
74417441
*
74427442
* MDN
74437443
*/
7444-
def info(message: js.Any, optionalParams: js.Any*): Unit = js.native
7444+
def info(message: Any, optionalParams: Any*): Unit = js.native
74457445

74467446
def profile(reportName: String = js.native): Unit = js.native
74477447

74487448
def assert(test: Boolean, message: String,
7449-
optionalParams: js.Any*): Unit = js.native
7449+
optionalParams: Any*): Unit = js.native
74507450

74517451
def clear(): Unit = js.native
74527452

@@ -7457,7 +7457,7 @@ trait Console extends js.Object {
74577457
*
74587458
* MDN
74597459
*/
7460-
def dir(value: js.Any, optionalParams: js.Any*): Unit = js.native
7460+
def dir(value: Any, optionalParams: Any*): Unit = js.native
74617461

74627462
/**
74637463
* Displays an interactive tree of the descendant elements of the specified XML/HTML element.
@@ -7467,39 +7467,39 @@ trait Console extends js.Object {
74677467
*
74687468
* MDN
74697469
*/
7470-
def dirxml(value: js.Any): Unit = js.native
7470+
def dirxml(value: Any): Unit = js.native
74717471

74727472
/**
74737473
* Outputs a warning message. You may use string substitution and additional
74747474
* arguments with this method. See Using string substitutions.
74757475
*
74767476
* MDN
74777477
*/
7478-
def warn(message: js.Any, optionalParams: js.Any*): Unit = js.native
7478+
def warn(message: Any, optionalParams: Any*): Unit = js.native
74797479

74807480
/**
74817481
* Outputs an error message. You may use string substitution and additional
74827482
* arguments with this method. See Using string substitutions.
74837483
*
74847484
* MDN
74857485
*/
7486-
def error(message: js.Any, optionalParams: js.Any*): Unit = js.native
7486+
def error(message: Any, optionalParams: Any*): Unit = js.native
74877487

74887488
/**
74897489
* For general output of logging information. You may use string substitution and
74907490
* additional arguments with this method. See Using string substitutions.
74917491
*
74927492
* MDN
74937493
*/
7494-
def log(message: js.Any, optionalParams: js.Any*): Unit = js.native
7494+
def log(message: Any, optionalParams: Any*): Unit = js.native
74957495

74967496
/**
74977497
* Outputs a debug message. You may use string substitution and additional
74987498
* arguments with this method. See Using string substitutions.
74997499
*
75007500
* MDN
75017501
*/
7502-
def debug(message: js.Any, optionalParams: js.Any*): Unit = js.native
7502+
def debug(message: Any, optionalParams: Any*): Unit = js.native
75037503

75047504
/**
75057505
* Displays tabular data as a table.

0 commit comments

Comments
 (0)