Skip to content

Commit

Permalink
[w] (2) Change 'errorCode' and 'error' to 'code' and 'message', since…
Browse files Browse the repository at this point in the history 
… they're both on an 'error' object now. Also, fix interface names.

git-svn-id: http://svn.whatwg.org/webapps@1088 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Oct 24, 2007
1 parent 1f9612a commit ebe710d
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 44 deletions.
61 changes: 31 additions & 30 deletions index
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25514,7 +25514,7 @@ JSURI: http://ietfreport.isoc.org/all-ids/draft-hoehrmann-javascript-scheme-00.t

<dd>
<p>Must be invoked whenever a <code title=event-message><a
href="#message">message</a></code> event is targeted at or bubbles
href="#message0">message</a></code> event is targeted at or bubbles
through the element.

<dt><dfn id=onmousedown
Expand Down Expand Up @@ -30443,9 +30443,9 @@ interface <dfn id=database0>Database</dfn> {
readonly attribute DOMString <a href="#version" title=dom-database-version>version</a>;
void <a href="#changeversion" title=dom-database-changeVersion>changeVersion</a>(in DOMString oldVersion, in DOMString newVersion);
void <a href="#changeversion" title=dom-database-changeVersion>changeVersion</a>(in DOMString oldVersion, in DOMString newVersion, in <a href="#sqlversionchangecallback">SQLVersionChangeCallback</a> callback);
void <a href="#changeversion" title=dom-database-changeVersion>changeVersion</a>(in DOMString oldVersion, in DOMString newVersion, in <a href="#sqlversionchangecallback">SQLVersionChangeCallback</a> callback, in <span>SQLErrorCallback</span> errorCallback);
void <a href="#changeversion" title=dom-database-changeVersion>changeVersion</a>(in DOMString oldVersion, in DOMString newVersion, in <a href="#sqlversionchangecallback">SQLVersionChangeCallback</a> callback, in <a href="#sqltransactionerrorcallback">SQLTransactionErrorCallback</a> errorCallback);
void <a href="#transaction" title=dom-database-transaction>transaction</a>(in <a href="#sqltransactioncallback">SQLTransactionCallback</a> callback);
void <a href="#transaction" title=dom-database-transaction>transaction</a>(in <a href="#sqltransactioncallback">SQLTransactionCallback</a> callback, in <span>SQLErrorCallback</span> errorCallback);
void <a href="#transaction" title=dom-database-transaction>transaction</a>(in <a href="#sqltransactioncallback">SQLTransactionCallback</a> callback, in <a href="#sqltransactionerrorcallback">SQLTransactionErrorCallback</a> errorCallback);
};

interface <dfn id=sqltransactioncallback>SQLTransactionCallback</dfn> {
Expand Down Expand Up @@ -30522,11 +30522,11 @@ interface <dfn id=sqltransactionerrorcallback>SQLTransactionErrorCallback</dfn>

<pre class=idl>interface <dfn id=sqltransaction>SQLTransaction</dfn> {
void <span title=dom-sqltransaction-executeSql>executeSql</span>(in DOMString sqlStatement, in <a href="#objectarray">ObjectArray</a> arguments);
void <span title=dom-sqltransaction-executeSql>executeSql</span>(in DOMString sqlStatement, in <a href="#objectarray">ObjectArray</a> arguments, in <span>SQLStatementCallback</span> callback);
void <span title=dom-sqltransaction-executeSql>executeSql</span>(in DOMString sqlStatement, in <a href="#objectarray">ObjectArray</a> arguments, in <span>SQLStatementCallback</span> callback, in <a href="#sqlstatementerrorcallback">SQLStatementErrorCallback</a> errorCallback);
void <span title=dom-sqltransaction-executeSql>executeSql</span>(in DOMString sqlStatement, in <a href="#objectarray">ObjectArray</a> arguments, in <a href="#sqlstatementcallback">SQLStatementCallback</a> callback);
void <span title=dom-sqltransaction-executeSql>executeSql</span>(in DOMString sqlStatement, in <a href="#objectarray">ObjectArray</a> arguments, in <a href="#sqlstatementcallback">SQLStatementCallback</a> callback, in <a href="#sqlstatementerrorcallback">SQLStatementErrorCallback</a> errorCallback);
};

interface <dfn id=sqlstatmentcallback>SQLStatmentCallback</dfn> {
interface <dfn id=sqlstatementcallback>SQLStatementCallback</dfn> {
void <span title=dom-sqlstatementcallback-handleEvent>handleEvent</span>(in <a href="#sqltransaction">SQLTransaction</a> transaction, in <a href="#sqlresultset">SQLResultSet</a> resultSet);
};

Expand All @@ -30549,7 +30549,8 @@ interface <dfn id=sqlstatementerrorcallback>SQLStatementErrorCallback</dfn> {
href="#sqltransactioncallback">SQLTransactionCallback</a></code>,
<code><a
href="#sqlversionchangecallback">SQLVersionChangeCallback</a></code>,
<code>SQLStatementCallback</code>, or <code><a
<code><a href="#sqlstatementcallback">SQLStatementCallback</a></code>,
or <code><a
href="#sqlstatementerrorcallback">SQLStatementErrorCallback</a></code>
then raise an <code>INVALID_STATE_ERR</code> exception. (Calls from
inside a <code><a
Expand Down Expand Up @@ -30591,7 +30592,7 @@ interface <dfn id=sqlstatementerrorcallback>SQLStatementErrorCallback</dfn> {
href="#expected" title=concept-database-expected-version>expected
version</a> that is neither the empty string nor the actual version of
the database, then mark <i>the statement</i> as bogus. (<a href="#x1"
title=dom-sqlerror-errorcode-2>Error code 2</a>.)
title=dom-sqlerror-code-2>Error code 2</a>.)

<li>
<p>Queue up <i>the statement</i> in the transaction, along with the third
Expand Down Expand Up @@ -30688,13 +30689,12 @@ interface <dfn id=sqlstatementerrorcallback>SQLStatementErrorCallback</dfn> {
arguments.

<pre class=idl>interface <dfn id=sqlerror>SQLError</dfn> {
readonly attribute unsigned int <a href="#errorcode" title=dom-SQLError-errorCode>errorCode</a>;
readonly attribute DOMString <a href="#error2" title=dom-SQLError-error>error</a>;
readonly attribute unsigned int <a href="#code1" title=dom-SQLError-code>code</a>;
readonly attribute DOMString <a href="#message" title=dom-SQLError-message>message</a>;
};</pre>

<p>The <dfn id=errorcode
title=dom-SQLError-errorCode><code>errorCode</code></dfn> DOM attribute
must return the most appropriate code from the following table:
<p>The <dfn id=code1 title=dom-SQLError-code><code>code</code></dfn> DOM
attribute must return the most appropriate code from the following table:

<table>
<thead>
Expand All @@ -30705,40 +30705,40 @@ interface <dfn id=sqlstatementerrorcallback>SQLStatementErrorCallback</dfn> {

<tbody>
<tr>
<td><dfn id=x title=dom-sqlerror-errorcode-0>0 </dfn>
<td><dfn id=x title=dom-sqlerror-code-0>0 </dfn>

<td>The transaction failed for reasons unrelated to the database itself
and not covered by any other error code.

<tr>
<td><dfn id=x0 title=dom-sqlerror-errorcode-1>1 </dfn>
<td><dfn id=x0 title=dom-sqlerror-code-1>1 </dfn>

<td>The statement failed for database reasons not covered by any other
error code.

<tr>
<td><dfn id=x1 title=dom-sqlerror-errorcode-2>2 </dfn>
<td><dfn id=x1 title=dom-sqlerror-code-2>2 </dfn>

<td>The statement failed because the <a href="#expected"
title=concept-database-expected-version>expected version</a> of the
database didn't match the actual database version.

<tr>
<td><dfn id=x2 title=dom-sqlerror-errorcode-3>3 </dfn>
<td><dfn id=x2 title=dom-sqlerror-code-3>3 </dfn>

<td>The statement failed because the data returned from the database was
too large. The SQL "LIMIT" modifier might be useful to reduce the size
of the result set.

<tr>
<td><dfn id=x3 title=dom-sqlerror-errorcode-4>4 </dfn>
<td><dfn id=x3 title=dom-sqlerror-code-4>4 </dfn>

<td>The statement failed because there was not enough remaining storage
space, or the storage quota was reached and the user declined to give
more space to the database.

<tr>
<td><dfn id=x4 title=dom-sqlerror-errorcode-5>5 </dfn>
<td><dfn id=x4 title=dom-sqlerror-code-5>5 </dfn>

<td>The statement failed because the transaction's first statement was a
read-only statement, and a subsequent statement in the same transaction
Expand All @@ -30755,9 +30755,10 @@ interface <dfn id=sqlstatementerrorcallback>SQLStatementErrorCallback</dfn> {
<p class=big-issue>We should define a more thorough list of codes.
Implementation feedback is requested to determine what codes are needed.

<p>The <dfn id=error2 title=dom-SQLError-error><code>error</code></dfn> DOM
attribute must return an error message, localised to the user's language,
describing the error encountered.
<p>The <dfn id=message
title=dom-SQLError-message><code>message</code></dfn> DOM attribute must
return an error message, localised to the user's language, describing the
error encountered.

<h4 id=processing3><span class=secno>4.11.6. </span>Processing model</h4>

Expand Down Expand Up @@ -34556,7 +34557,7 @@ http://developer.apple.com/documentation/AppleApplications/Conceptual/SafariJSPr

<p>Messages in <a href="#cross-document">cross-document messaging</a> and,
by default, in <a href="#server-sent">server-sent DOM events</a>, use the
<dfn id=message title=event-message><code>message</code></dfn> event.
<dfn id=message0 title=event-message><code>message</code></dfn> event.

<p>The following interface is defined for this event:

Expand Down Expand Up @@ -34886,7 +34887,7 @@ Test:&nbsp;Line 2</pre>
<p>This field gives the name of the event. For example, <code
title="">load</code>, <code title="">DOMActivate</code>, <code
title="">updateTicker</code>. If there is no field with this name, the
name <code title=event-message><a href="#message">message</a></code>
name <code title=event-message><a href="#message0">message</a></code>
must be used.

<dt><code title="">Namespace</code> field
Expand Down Expand Up @@ -34929,7 +34930,7 @@ Test:&nbsp;Line 2</pre>

<p>If the <code title="">Namespace</code> is null and the <code
title="">Event</code> field is <code title=event-message><a
href="#message">message</a></code> (including if it was not specified
href="#message0">message</a></code> (including if it was not specified
explicitly), then the <code><a
href="#messageevent">MessageEvent</a></code> interface must be used.</p>

Expand Down Expand Up @@ -35092,7 +35093,7 @@ data: -2
data: 10</pre>

<p>...would cause an event <code title=event-message><a
href="#message">message</a></code> with the interface <code><a
href="#message0">message</a></code> with the interface <code><a
href="#messageevent">MessageEvent</a></code> to be dispatched on the
<code><a href="#event-source">event-source</a></code> element, which
would then bubble up the DOM, and whose <code
Expand All @@ -35115,18 +35116,18 @@ data: 10</pre>
<div class=example>
<p>The following stream contains four blocks and therefore fires four
events. The first block has just a comment, and will fire a <code
title=event-message><a href="#message">message</a></code> event with all
title=event-message><a href="#message0">message</a></code> event with all
the fields set to the empty string or null. The second block has two
fields with names "load" and "Target" respectively; since there is no
"<code title="">load</code>" member on the <code><a
href="#messageevent">MessageEvent</a></code> object that field is
ignored, leaving the event as a second <code title=event-message><a
href="#message">message</a></code> event with all the fields set to the
href="#message0">message</a></code> event with all the fields set to the
empty string or null, but this time the event is targetted at an element
with ID "image1". The third block is empty (no lines between two blank
lines), and the fourth block has only two comments, so they both yet
again fire <code title=event-message><a
href="#message">message</a></code> events with all the fields set to the
href="#message0">message</a></code> events with all the fields set to the
empty string or null.</p>

<pre>; test
Expand Down Expand Up @@ -36027,7 +36028,7 @@ Target: #image1
href="#window">Window</a></code> object, the user agent must create an
event that uses the <code><a href="#messageevent">MessageEvent</a></code>
interface, with the event name <code title=event-message><a
href="#message">message</a></code>, which bubbles, is cancelable, and has
href="#message0">message</a></code>, which bubbles, is cancelable, and has
no default action. The <code title=dom-MessageEvent-data><a
href="#data4">data</a></code> attribute must be set to the value passed as
the <var title="">message</var> argument to the <code
Expand Down
28 changes: 14 additions & 14 deletions source
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28031,9 +28031,9 @@ interface <dfn>Database</dfn> {
readonly attribute DOMString <span title="dom-database-version">version</span>;
void <span title="dom-database-changeVersion">changeVersion</span>(in DOMString oldVersion, in DOMString newVersion);
void <span title="dom-database-changeVersion">changeVersion</span>(in DOMString oldVersion, in DOMString newVersion, in <span>SQLVersionChangeCallback</span> callback);
void <span title="dom-database-changeVersion">changeVersion</span>(in DOMString oldVersion, in DOMString newVersion, in <span>SQLVersionChangeCallback</span> callback, in <span>SQLErrorCallback</span> errorCallback);
void <span title="dom-database-changeVersion">changeVersion</span>(in DOMString oldVersion, in DOMString newVersion, in <span>SQLVersionChangeCallback</span> callback, in <span>SQLTransactionErrorCallback</span> errorCallback);
void <span title="dom-database-transaction">transaction</span>(in <span>SQLTransactionCallback</span> callback);
void <span title="dom-database-transaction">transaction</span>(in <span>SQLTransactionCallback</span> callback, in <span>SQLErrorCallback</span> errorCallback);
void <span title="dom-database-transaction">transaction</span>(in <span>SQLTransactionCallback</span> callback, in <span>SQLTransactionErrorCallback</span> errorCallback);
};

interface <dfn>SQLTransactionCallback</dfn> {
Expand Down Expand Up @@ -28118,7 +28118,7 @@ interface <dfn>SQLTransactionErrorCallback</dfn> {
void <span title="dom-sqltransaction-executeSql">executeSql</span>(in DOMString sqlStatement, in <span>ObjectArray</span> arguments, in <span>SQLStatementCallback</span> callback, in <span>SQLStatementErrorCallback</span> errorCallback);
};

interface <dfn>SQLStatmentCallback</dfn> {
interface <dfn>SQLStatementCallback</dfn> {
void <span title="dom-sqlstatementcallback-handleEvent">handleEvent</span>(in <span>SQLTransaction</span> transaction, in <span>SQLResultSet</span> resultSet);
};

Expand Down Expand Up @@ -28183,7 +28183,7 @@ interface <dfn>SQLStatementErrorCallback</dfn> {
title="concept-database-expected-version">expected version</span>
that is neither the empty string nor the actual version of the
database, then mark <i>the statement</i> as bogus. (<span
title="dom-sqlerror-errorcode-2">Error code 2</span>.)</p></li>
title="dom-sqlerror-code-2">Error code 2</span>.)</p></li>

<li><p>Queue up <i>the statement</i> in the transaction, along with
the third argument as the statement's result set callback and the
Expand Down Expand Up @@ -28281,12 +28281,12 @@ interface <dfn>SQLStatementErrorCallback</dfn> {
a <code>SQLError</code> object as one of their arguments.</p>

<pre class="idl">interface <dfn>SQLError</dfn> {
readonly attribute unsigned int <span title="dom-SQLError-errorCode">errorCode</span>;
readonly attribute DOMString <span title="dom-SQLError-error">error</span>;
readonly attribute unsigned int <span title="dom-SQLError-code">code</span>;
readonly attribute DOMString <span title="dom-SQLError-message">message</span>;
};</pre>

<p>The <dfn
title="dom-SQLError-errorCode"><code>errorCode</code></dfn> DOM
title="dom-SQLError-code"><code>code</code></dfn> DOM
attribute must return the most appropriate code from the following
table:</p>

Expand All @@ -28298,35 +28298,35 @@ interface <dfn>SQLStatementErrorCallback</dfn> {
<tbody>

<tr>
<td><dfn title="dom-sqlerror-errorcode-0">0
<td><dfn title="dom-sqlerror-code-0">0
<td>The transaction failed for reasons unrelated to the database
itself and not covered by any other error code.

<tr>
<td><dfn title="dom-sqlerror-errorcode-1">1
<td><dfn title="dom-sqlerror-code-1">1
<td>The statement failed for database reasons not covered by any
other error code.

<tr>
<td><dfn title="dom-sqlerror-errorcode-2">2
<td><dfn title="dom-sqlerror-code-2">2
<td>The statement failed because the <span
title="concept-database-expected-version">expected version</span>
of the database didn't match the actual database version.

<tr>
<td><dfn title="dom-sqlerror-errorcode-3">3
<td><dfn title="dom-sqlerror-code-3">3
<td>The statement failed because the data returned from the
database was too large. The SQL "LIMIT" modifier might be useful
to reduce the size of the result set.

<tr>
<td><dfn title="dom-sqlerror-errorcode-4">4
<td><dfn title="dom-sqlerror-code-4">4
<td>The statement failed because there was not enough remaining
storage space, or the storage quota was reached and the user
declined to give more space to the database.

<tr>
<td><dfn title="dom-sqlerror-errorcode-5">5
<td><dfn title="dom-sqlerror-code-5">5
<td>The statement failed because the transaction's first
statement was a read-only statement, and a subsequent statement
in the same transaction tried to modify the database, but the
Expand All @@ -28345,7 +28345,7 @@ interface <dfn>SQLStatementErrorCallback</dfn> {
codes. Implementation feedback is requested to determine what codes
are needed.</p>

<p>The <dfn title="dom-SQLError-error"><code>error</code></dfn>
<p>The <dfn title="dom-SQLError-message"><code>message</code></dfn>
DOM attribute must return an error message, localised to the user's
language, describing the error encountered.</p>

Expand Down

0 comments on commit ebe710d

Please sign in to comment.