Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e5b10a7

Browse files
committedNov 14, 2015
Merge pull request #173 from mseddon/scaladoc-htmlescape
Fix #160: HTML escape scaladoc
2 parents abd40f1 + cda56a8 commit e5b10a7

File tree

5 files changed

+241
-241
lines changed

5 files changed

+241
-241
lines changed
 

‎src/main/scala/org/scalajs/dom/raw/Audio.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class AudioContext extends EventTarget {
120120
def createGain(): GainNode = js.native
121121

122122
/** Creates a MediaElementAudioSourceNode associated with an HTMLMediaElement.
123-
* This can be used to play and manipulate audio from {{{<video>}}} or
124-
* {{{<audio>}}} elements.
123+
* This can be used to play and manipulate audio from &lt;video&gt; or
124+
* &lt;audio&gt; elements.
125125
*
126126
* @param myMediaElement An HTMLMediaElement object that you want to feed
127127
* into an audio processing graph to manipulate.
@@ -238,8 +238,8 @@ class OfflineAudioContext(numOfChannels: Int, length: Int, sampleRate: Int) exte
238238

239239

240240
/** The AudioNode interface is a generic interface for representing an audio
241-
* processing module like an audio source (e.g. an HTML {{{<audio>}}} or
242-
* {{{<video>}}} element, an OscillatorNode, etc.), the audio destination,
241+
* processing module like an audio source (e.g. an HTML &lt;audio&gt; or
242+
* &lt;video&gt; element, an OscillatorNode, etc.), the audio destination,
243243
* intermediate processing module (e.g. a filter like BiquadFilterNode or
244244
* ConvolverNode), or volume control (like GainNode).
245245
*
@@ -924,7 +924,7 @@ trait GainNode extends AudioNode {
924924
}
925925

926926
/** The MediaElementAudioSourceNode interface represents an audio source
927-
* consisting of an HTML5 {{{<audio>}}} or {{{<video>}}} element.
927+
* consisting of an HTML5 &lt;audio&gt; or &lt;video&gt; element.
928928
* It is an AudioNode that acts as an audio source.
929929
*
930930
* A MediaElementSourceNode has no inputs and exactly one output, and is

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

Lines changed: 99 additions & 99 deletions
Large diffs are not rendered by default.

‎src/main/scala/org/scalajs/dom/raw/Svg.scala

Lines changed: 119 additions & 119 deletions
Large diffs are not rendered by default.

‎src/main/scala/org/scalajs/dom/raw/WebGL.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ class WebGLRenderingContext extends js.Object {
12131213
* Sets the mapping from normalized device coordinates to window coordinates.
12141214
* "normalized device coordinates" in this context really means "normalized depth map values".
12151215
*
1216-
* ''note'' there is no requirement that zNear < zFar.
1216+
* ''note'' there is no requirement that zNear &lt; zFar.
12171217
*
12181218
* Both parameters are clamped to -1 .. 1
12191219
* @param zNear the near clipping plane, initially 0.

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -932,15 +932,15 @@ abstract class Element extends Node with NodeSelector with ParentNode with NonDo
932932
* Gets the markup of the element including its content. When used as a
933933
* setter, replaces the element with nodes parsed from the given string.
934934
*
935-
* Supported by FF>10, any Opera, any Chrome, any IE, any Safari
935+
* Supported by FF&gt;10, any Opera, any Chrome, any IE, any Safari
936936
*/
937937
var outerHTML: String = js.native
938938

939939
/**
940940
* innerHTML sets or gets the HTML syntax describing the element's descendants.
941941
*
942-
* Note: If a <div>, <span>, or <noembed> node has a child text node that includes
943-
* the characters (&), (<), or (>), innerHTML returns these characters as &amp,
942+
* Note: If a &lt;div&gt;, &lt;span&gt;, or &lt;noembed&gt; node has a child text node that includes
943+
* the characters (&), (&lt;), or (&gt;), innerHTML returns these characters as &amp,
944944
* &lt and &gt respectively. Use Node.textContent to get a correct copy of these
945945
* text nodes' contents.
946946
*/
@@ -955,14 +955,14 @@ abstract class Element extends Node with NodeSelector with ParentNode with NonDo
955955
var accessKey: String = js.native
956956

957957
/**
958-
* Supported by FF>3.6, any Opera, any Chrome, any IE, any Safari
958+
* Supported by FF&gt;3.6, any Opera, any Chrome, any IE, any Safari
959959
*/
960960
var classList: DOMTokenList = js.native
961961

962962
def scrollIntoView(top: Boolean = js.native): Unit = js.native
963963

964964
/**
965-
* Supported by FF>8, Opera>7, Chrome>1, IE>4, Safari>4
965+
* Supported by FF&gt;8, Opera&gt;7, Chrome&gt;1, IE&gt;4, Safari&gt;4
966966
*/
967967
def insertAdjacentHTML(where: String, html: String): Unit = js.native
968968

@@ -1625,7 +1625,7 @@ trait DocumentEvent extends js.Object {
16251625

16261626
/**
16271627
* A CDATA Section can be used within XML to include extended portions of
1628-
* unescaped text, such that the symbols < and & do not need escaping as they
1628+
* unescaped text, such that the symbols &lt; and & do not need escaping as they
16291629
* normally do within XML when used as text.
16301630
*
16311631
* As a CDATASection has no properties or methods unique to itself and only
@@ -2206,7 +2206,7 @@ class Window extends EventTarget with WindowLocalStorage
22062206
var onkeypress: js.Function1[KeyboardEvent, _] = js.native
22072207

22082208
/**
2209-
* Returns the element (such as <iframe> or <object>) in which the window is embedded,
2209+
* Returns the element (such as &lt;iframe&gt; or &lt;object&gt;) in which the window is embedded,
22102210
* or null if the window is top-level.
22112211
*
22122212
* MDN
@@ -2531,7 +2531,7 @@ class CanvasGradient extends js.Object {
25312531
/**
25322532
* Add a new stop, defined by an offset and a color, to the gradient. If the offset is not
25332533
* between 0 and 1 an INDEX_SIZE_ERR is raised, if the color can't be parsed as a CSS
2534-
* <color>, a SYNTAX_ERR is raised.
2534+
* &lt;color&gt;, a SYNTAX_ERR is raised.
25352535
*
25362536
* MDN
25372537
*/
@@ -2823,7 +2823,7 @@ object KeyboardEvent extends js.Object {
28232823
/**
28242824
* Each web page loaded in the browser has its own document object. The Document
28252825
* interface serves as an entry point to the web page's content (the DOM tree,
2826-
* including elements such as <body> and <table>) and provides functionality global
2826+
* including elements such as &lt;body&gt; and &lt;table&gt;) and provides functionality global
28272827
* to the document (such as obtaining the page's URL and creating new elements in the
28282828
* document).
28292829
*
@@ -2866,7 +2866,7 @@ abstract class Document extends Node with NodeSelector with DocumentEvent with P
28662866

28672867
/**
28682868
* Returns the Element that is the root element of the document (for example, the
2869-
* <html> element for HTML documents).
2869+
* &lt;html&gt; element for HTML documents).
28702870
*
28712871
* MDN
28722872
*/
@@ -3142,8 +3142,8 @@ class MessageEvent extends Event {
31423142

31433143

31443144
/**
3145-
* The 2D rendering context for the drawing surface of a <canvas> element. To get this
3146-
* object, call getContext() on a <canvas>, supplying "2d" as the argument:
3145+
* The 2D rendering context for the drawing surface of a &lt;canvas&gt; element. To get this
3146+
* object, call getContext() on a &lt;canvas&gt;, supplying "2d" as the argument:
31473147
*
31483148
* MDN
31493149
*/
@@ -5243,7 +5243,7 @@ class History extends js.Object {
52435243
/**
52445244
* The TimeRanges interface is used to represent a set of time ranges, primarily for
52455245
* the purpose of tracking which portions of media have been buffered when loading it
5246-
* for use by the <audio> and <video> elements.
5246+
* for use by the &lt;audio&gt; and &lt;video&gt; elements.
52475247
*
52485248
* MDN
52495249
*/
@@ -5410,7 +5410,7 @@ object Event extends js.Object {
54105410

54115411
/**
54125412
* The ImageData interface represents the underlying pixel data of an area of a
5413-
* <canvas> element. It is created using creators on the CanvasRenderingContext2D
5413+
* &lt;canvas&gt; element. It is created using creators on the CanvasRenderingContext2D
54145414
* object associated with the canvas createImageData() and getImageData()). It can
54155415
* also be used to set a part of the canvas (like with putImageData()).
54165416
*
@@ -5787,7 +5787,7 @@ object MediaError extends js.Object {
57875787
/**
57885788
* The Comment interface represents textual notations within markup; although it is
57895789
* generally not visually shown, such comments are available to be read in the source
5790-
* view. Comments are represented in HTML and XML as content between '<!--' and '-->'.
5790+
* view. Comments are represented in HTML and XML as content between '&lt;!--' and '--&gt;'.
57915791
* In XML, the character sequence '--' cannot be used within a comment.
57925792
*
57935793
* MDN
@@ -6524,7 +6524,7 @@ object EventSource extends js.Object {
65246524
/**
65256525
* The ProgressEvent interface represents events measuring progress of an
65266526
* underlying process, like an HTTP request (for an XMLHttpRequest, or the loading of
6527-
* the underlying resource of an <img>, <audio>, <video>, <style> or <link>).
6527+
* the underlying resource of an &lt;img&gt;, &lt;audio&gt;, &lt;video&gt;, &lt;style&gt; or &lt;link&gt;).
65286528
*
65296529
* MDN
65306530
*/
@@ -6572,7 +6572,7 @@ trait ProgressEvent extends Event {
65726572

65736573
/**
65746574
* An object of this type is returned by the files property of the HTML input element;
6575-
* this lets you access the list of files selected with the <input type="file">
6575+
* this lets you access the list of files selected with the &lt;input type="file"&gt;
65766576
* element. It's also used for a list of files dropped into web content when using the
65776577
* drag and drop API; see the DataTransfer object for details on this usage.
65786578
*

0 commit comments

Comments
 (0)
Please sign in to comment.