Skip to content

Commit

Permalink
[e] (0) Editorial cleanup of the use of the term 'salvageable'.
Browse files Browse the repository at this point in the history
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=21734
Affected topics: DOM APIs, HTML, HTML Syntax and Parsing

git-svn-id: http://svn.whatwg.org/webapps@7891 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Jun 3, 2013
1 parent 935599c commit f84eb44
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 61 deletions.
38 changes: 20 additions & 18 deletions complete.html
Expand Up @@ -11861,7 +11861,7 @@ <h4 id=opening-the-input-stream><span class=secno>3.4.1 </span>Opening the input

<li><p>Release the <a href=#storage-mutex>storage mutex</a>.</li>

<li><p>Set the <code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state to false.</li>
<li><p>Set the <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state to false.</li>

<li><p><a href=#prompt-to-unload-a-document title="prompt to unload a document">Prompt to unload</a> the
<code><a href=#document>Document</a></code> object. If the user <a href=#refused-to-allow-the-document-to-be-unloaded>refused to allow the document to be
Expand Down Expand Up @@ -11902,7 +11902,7 @@ <h4 id=opening-the-input-stream><span class=secno>3.4.1 </span>Opening the input
<code><a href=#document>Document</a></code> object's <a href=#reload-override-flag>reload override flag</a> and set the
<code><a href=#document>Document</a></code>'s <a href=#reload-override-buffer>reload override buffer</a> to the empty string.</li>

<li><p>Set the <code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state back to true.</li>
<li><p>Set the <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state back to true.</li>

<li><p>Change <a href="#the-document's-address">the document's address</a> to the <a href=#entry-script>entry script</a>'s <a href="#script's-document" title="script's document">document</a>'s <a href="#the-document's-address" title="the document's
address">address</a>.</li>
Expand Down Expand Up @@ -65233,7 +65233,7 @@ <h4 id=garbage-collection-and-browsing-contexts><span class=secno>6.2.5 </span>G
<p>When a <a href=#browsing-context>browsing context</a> is to <dfn id=discard-a-document>discard a <code>Document</code></dfn>, the user
agent must run the following steps:</p>

<ol><li><p>Set the <code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state to false.</li>
<ol><li><p>Set the <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state to false.</li>

<li><p>Run any <a href=#unloading-document-cleanup-steps>unloading document cleanup steps</a> for the <code><a href=#document>Document</a></code> that
are defined by this specification and <a href=#other-applicable-specifications>other applicable specifications</a>.</li>
Expand Down Expand Up @@ -68198,7 +68198,7 @@ <h4 id=unloading-documents><span class=secno>6.6.11 </span>Unloading documents</

<div class=impl>

<p>A <code><a href=#document>Document</a></code> has a <dfn id=concept-document-salvageable title=concept-document-salvageable><var>salvageable</var></dfn> state, which must initially be
<p>A <code><a href=#document>Document</a></code> has a <dfn id=concept-document-salvageable title=concept-document-salvageable><i>salvageable</i></dfn> state, which must initially be
true, a <dfn id=fired-unload>fired unload</dfn> flag, which must initially be false, and a <dfn id=page-showing>page showing</dfn>
flag, which must initially be false.</p>

Expand All @@ -68225,7 +68225,7 @@ <h4 id=unloading-documents><span class=secno>6.6.11 </span>Unloading documents</
<li><p>Release the <a href=#storage-mutex>storage mutex</a>.</li>

<li><p>If any event listeners were triggered by the earlier <i>dispatch</i> step, then set the
<code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state to
<code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state to
false.</li>

<li>
Expand Down Expand Up @@ -68263,9 +68263,10 @@ <h4 id=unloading-documents><span class=secno>6.6.11 </span>Unloading documents</
<a href=#refused-to-allow-the-document-to-be-unloaded>refused to allow the document to be unloaded</a>, then the user implicitly also <a href=#refused-to-allow-the-document-to-be-unloaded title="refused to allow the document to be unloaded">refused to allow <em>this</em> document to
be unloaded</a>; jump to the step labeled <i>end</i>.</p>

<li><p>If <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state of the <a href=#active-document>active
<!--CLEANUP-->
<li><p>If the <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state of the <a href=#active-document>active
document</a> of the <a href=#browsing-context>browsing context</a> <var title="">b</var> is false, then set
the <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state of <em>this</em> document
the <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state of <em>this</em> document
to false also.</li>

</ol></li>
Expand Down Expand Up @@ -68316,7 +68317,7 @@ <h4 id=unloading-documents><span class=secno>6.6.11 </span>Unloading documents</
<li><p>Release the <a href=#storage-mutex>storage mutex</a>.</li>

<li><p>If any event listeners were triggered by the earlier <i>unload event</i> step, then set
the <code><a href=#document>Document</a></code> object's <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var>
the <code><a href=#document>Document</a></code> object's <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i>
state to false and set the <code><a href=#document>Document</a></code>'s <a href=#fired-unload>fired unload</a> flag to
true.</li>

Expand All @@ -68340,14 +68341,15 @@ <h4 id=unloading-documents><span class=secno>6.6.11 </span>Unloading documents</
<a href=#browsing-context>browsing context</a> <var title="">b</var> with the <var title="">recycle</var>
parameter set to false.</li>

<li><p>If <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state of the <a href=#active-document>active
<!--CLEANUP-->
<li><p>If the <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state of the <a href=#active-document>active
document</a> of the <a href=#browsing-context>browsing context</a> <var title="">b</var> is false, then set
the <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state of <em>this</em> document
the <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state of <em>this</em> document
to false also.</li>

</ol></li>

<li><p>If <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> and <var title="">recycle</var> are both false, then the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing
<li><p>If both the <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state and <var title="">recycle</var> are false, then the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing
context</a> must <a href=#discard-a-document title="discard a document">discard the
<code>Document</code></a>.</li>

Expand All @@ -68362,16 +68364,16 @@ <h4 id=unloading-documents><span class=secno>6.6.11 </span>Unloading documents</
<p><a href=#make-disappear>Make disappear</a> any <code><a href=#websocket>WebSocket</a></code> objects that were created by the <code title=dom-WebSocket><a href=#dom-websocket>WebSocket()</a></code> constructor whose global object is the
<code><a href=#document>Document</a></code>'s <code><a href=#window>Window</a></code> object.</p>

<p>If this affected any <code><a href=#websocket>WebSocket</a></code> objects, then set <code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state to false.</p>
<p>If this affected any <code><a href=#websocket>WebSocket</a></code> objects, then set <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state to false.</p>

</li>

<li><p>If the <code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var>
<li><p>If the <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i>
state is false, <a href=#concept-eventsource-forcibly-close title=concept-EventSource-forcibly-close>forcibly close</a> any
<code><a href=#eventsource>EventSource</a></code> objects that whose constructor was invoked from the
<code><a href=#document>Document</a></code>'s <code><a href=#window>Window</a></code> object.</li>

<li><p>If the <code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var>
<li><p>If the <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i>
state is false, empty the <code><a href=#document>Document</a></code>'s <code><a href=#window>Window</a></code>'s <a href=#list-of-active-timers>list of active
timers</a>.</li>

Expand Down Expand Up @@ -68417,19 +68419,19 @@ <h4 id=aborting-a-document-load><span class=secno>6.6.12 </span>Aborting a docum

<ol><li><p><a href=#abort-a-document title="abort a document">Abort</a> the <a href=#active-document title="active document">active
documents</a> of every <a href=#child-browsing-context>child browsing context</a>. If this results in any of those
<code><a href=#document>Document</a></code> objects having their <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state set to false, then set this
<code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state to
<code><a href=#document>Document</a></code> objects having their <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state set to false, then set this
<code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state to
false also.</li>

<li><p>Cancel any instances of the <a href=#fetch title=fetch>fetch</a> algorithm in the context of
this <code><a href=#document>Document</a></code>, discarding any <a href=#concept-task title=concept-task>tasks</a> <a href=#queue-a-task title="queue a task">queued</a> for them, and discarding any further data received from the
network for them. If this resulted in any instances of the <a href=#fetch title=fetch>fetch</a>
algorithm being canceled or any <a href=#queue-a-task title="queue a task">queued</a> <a href=#concept-task title=concept-task>tasks</a> or any network data getting discarded, then set the
<code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state to
<code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state to
false.</li>

<li><p>If the <code><a href=#document>Document</a></code> has an <a href=#active-parser>active parser</a>, then <a href=#abort-a-parser title="abort a
parser">abort that parser</a> and set the <code><a href=#document>Document</a></code>'s <var title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></var> state to false.</li>
parser">abort that parser</a> and set the <code><a href=#document>Document</a></code>'s <i title=concept-document-salvageable><a href=#concept-document-salvageable>salvageable</a></i> state to false.</li>

<!-- we could also stop all script, or stop animations -->

Expand Down

0 comments on commit f84eb44

Please sign in to comment.