Fix 23748, 2375050 - Make getModifierState() refer to Modifier key table.
authorGary Kacmarcik <garykac@google.com>
Mon, 07 Apr 2014 16:38:36 -0700
changeset 574 29d9ed38ab98
parent 573 2c2c081f3478
child 575 4d46ba3de875
Fix 23748, 2375050 - Make getModifierState() refer to Modifier key table.

Move ScrollLock into Modifier table.
html/DOM3-Events.html
--- a/html/DOM3-Events.html	Mon Apr 07 16:16:12 2014 -0700
+++ b/html/DOM3-Events.html	Mon Apr 07 16:38:36 2014 -0700
@@ -5065,24 +5065,10 @@
 							<dl class="parameters">
 								<dt>DOMString keyArg</dt>
 								<dd>
-									<p>A modifier key value.  Modifier keys defined in this specification are
-										<a href="#key-Alt"><code class="key">'Alt'</code></a>
-										<a href="#key-AltGraph"><code class="key">'AltGraph'</code></a>
-										<a href="#key-CapsLock"><code class="key">'CapsLock'</code></a>
-										<a href="#key-Control"><code class="key">'Control'</code></a>
-										<a href="#key-Fn"><code class="key">'Fn'</code></a>
-										<a href="#key-Meta"><code class="key">'Meta'</code></a>
-										<a href="#key-NumLock"><code class="key">'NumLock'</code></a>
-										<a href="#key-ScrollLock"><code class="key">'ScrollLock'</code></a>
-										<a href="#key-Shift"><code class="key">'Shift'</code></a>
-										<a href="#key-SymbolLock"><code class="key">'SymbolLock'</code></a>, and
-										<a href="#key-OS"><code class="key">'OS'</code></a>
-										User agents MAY support additional implementation-specific modifier keys
-										depending on the environment.
+									<p>A modifier key value.  Modifier keys defined in this specification are given in the
+										<a href="#key-table-modifier">Modifier Keys</a> table.
 										</p>
 
-									<p class="issue">Refer to table rather than listing the modifier keys here.</p>
-									
 									<p>Returns <code>true</code> if it is a modifier key and the modifier is activated, <code>false</code> otherwise.</p>
 
 									<p class="note"><strong>Note:</strong> If an application wishes to distinguish between right and left modifiers, this information could be
@@ -7401,16 +7387,43 @@
 			<section id="keys-modifiers">
 				<h3>Modifier keys</h3>
 
-				<p>Keyboard input uses modifier keys to change the normal behavior of a key.  Like other keys, modifier keys generate <a class="eventtype" href="#event-type-keydown">
-					<code>keydown</code></a> and <a class="eventtype" href="#event-type-keyup"><code>keyup</code></a> events, as shown in the example below. Some modifiers are activated
-					while the key is being pressed down or maintained pressed such as <code class="key">'Alt'</code>, <code class="key">'Control'</code>, <code class="key">'Shift'</code>,
-					<code class="key">'AltGraph'</code>, or <code class="key">'Meta'</code>. Others modifiers are activated depending on their state such as <code class="key">'CapsLock'</code>,
-					<code class="key">'NumLock'</code>, or <code class="key">'ScrollLock'</code>. Change in the state happens when the modifier key is being pressed down. The <a href="#interface-KeyboardEvent">
-					<code>KeyboardEvent</code></a> interface provides convenient attributes for some common modifiers keys: <a href="#widl-KeyboardEvent-ctrlKey"><code>KeyboardEvent.ctrlKey</code></a>,
-					<a href="#widl-KeyboardEvent-shiftKey"><code>KeyboardEvent.shiftKey</code></a>, <a href="#widl-KeyboardEvent-altKey"><code>KeyboardEvent.altKey</code></a>,
-					<a href="#widl-KeyboardEvent-metaKey"><code>KeyboardEvent.metaKey</code></a>. Some operating systems simulate the <code class="key">'AltGraph'</code> modifier
-					key with the combination of the <code class="key">'Alt'</code> and <code class="key">'Control'</code> modifier keys. Implementations are encouraged to use the
-					<code class="key">'AltGraph'</code> modifier key.</p>
+				<p>Keyboard input uses modifier keys to change the normal behavior of a key.
+					Like other keys, modifier keys generate
+						<a class="eventtype" href="#event-type-keydown"><code>keydown</code></a>
+					and
+						<a class="eventtype" href="#event-type-keyup"><code>keyup</code></a>
+					events, as shown in the example below.
+					Some modifiers are activated while the key is being pressed down or maintained pressed such as
+						<code class="key">'Alt'</code>,
+						<code class="key">'Control'</code>,
+						<code class="key">'Shift'</code>,
+						<code class="key">'AltGraph'</code>,
+					or
+						<code class="key">'Meta'</code>.
+					Others modifiers are activated depending on their state such as
+						<code class="key">'CapsLock'</code>,
+						<code class="key">'NumLock'</code>,
+					or
+						<code class="key">'ScrollLock'</code>.
+					Change in the state happens when the modifier key is being pressed down.
+					The
+						<a href="#interface-KeyboardEvent"><code>KeyboardEvent</code></a>
+					interface provides convenient attributes for some common modifiers keys:
+						<a href="#widl-KeyboardEvent-ctrlKey"><code>KeyboardEvent.ctrlKey</code></a>,
+						<a href="#widl-KeyboardEvent-shiftKey"><code>KeyboardEvent.shiftKey</code></a>,
+						<a href="#widl-KeyboardEvent-altKey"><code>KeyboardEvent.altKey</code></a>,
+						<a href="#widl-KeyboardEvent-metaKey"><code>KeyboardEvent.metaKey</code></a>.
+					Some operating systems simulate the
+						<code class="key">'AltGraph'</code>
+					modifier key with the combination of the
+						<code class="key">'Alt'</code>
+					and
+						<code class="key">'Control'</code>
+					modifier keys.
+					Implementations are encouraged to use the
+						<code class="key">'AltGraph'</code>
+					modifier key.
+					</p>
 
 				<p>The following example describes a possible sequence of events associated with the generation of the Unicode character Q (Latin Capital Letter Q, <a class="def"
 					href="#glossary-unicode-code-point">Unicode code point</a> <code class="char">'\u0051'</code>) on a PC/AT US keyboard using a US mapping:</p>
@@ -8588,6 +8601,7 @@
 						</key>
 					<key name="NumLock">The Number Lock key, to toggle numer-pad mode function for interpreting subsequent keyboard input.</key>
 					<key name="OS">The operating system key (e.g. the <q>Windows Logo</q> key).</key>
+					<key name="ScrollLock">The Scroll Lock key, to toggle between scrolling and cursor movement modes.</key>
 					<key name="Shift">The Shift key, to enable shift modifier function for interpreting concurrent or subsequent keyboard input.</key>
 					<key name="Super">The Super key.</key>
 					<key name="Symbol">The Symbol modifier key (used on some virtual keyboards).</key>
@@ -8666,7 +8680,6 @@
 						</key>
 					<key name="Props">The properties (Props) key.</key>
 					<key name="Select">The Select key.</key>
-					<key name="ScrollLock">The Scroll Lock key, to toggle between scrolling and cursor movement modes.</key>
 					<key name="ZoomIn">The ZoomIn key.</key>
 					<key name="ZoomOut">The ZoomOut key.</key>
 				</div>