From 73ba2965b300cf930ae4ef73819364becd8d0fc8 Mon Sep 17 00:00:00 2001 From: Simon Pieters Date: Thu, 26 Nov 2015 10:56:12 +0100 Subject: [PATCH] Fix #119: Merge DOMSettableTokenList into DOMTokenList Move DOMSettableTokenList#value to DOMTokenList and remove the DOMSettableTokenList interface. --- dom.bs | 34 +++++++++++----------------------- dom.html | 35 ++++++++++++----------------------- 2 files changed, 23 insertions(+), 46 deletions(-) diff --git a/dom.bs b/dom.bs index d85bd9221..c02a116d3 100644 --- a/dom.bs +++ b/dom.bs @@ -8522,8 +8522,7 @@ These constants can be used for the

Sets

-

Yes, the names {{DOMTokenList}} and {{DOMSettableTokenList}} -are unfortunate legacy mishaps. +

Yes, the name {{DOMTokenList}} is an unfortunate legacy mishap.

Interface {{DOMTokenList}}

@@ -8536,6 +8535,7 @@ interface DOMTokenList { void remove(DOMString... tokens); boolean toggle(DOMString token, optional boolean force); void replace(DOMString token, DOMString newToken); + attribute DOMString value; stringifier; iterable<DOMString>; }; @@ -8653,6 +8653,11 @@ associated element's

Throws a {{SyntaxError}} exception if one if the arguments is the empty string.

Throws an {{InvalidCharacterError}} exception if one of the arguments contains any ASCII whitespace. + +

tokenlist . {{DOMTokenList/value}} +
+

Returns the associated set as string. +

Can be set, to change the associated attribute.

The length attribute' getter must return the @@ -8783,32 +8788,15 @@ method, when invoked, must run these steps:

  • Run the update steps. -

    The stringification behavior -must return the result of running context object's serialize steps. - - -

    Interface {{DOMSettableTokenList}}

    - -
    -interface DOMSettableTokenList : DOMTokenList {
-            attribute DOMString value;
-};
-
    - -
    -
    tokenlist . {{DOMSettableTokenList/value}} -
    -

    Returns the associated set as string. -

    Can be set, to change the associated attribute. -

    - -

    The value attribute must return the +

    The value attribute must return the result of running context object's serialize steps. -

    Setting the {{DOMSettableTokenList/value}} attribute must set an attribute value for the +

    Setting the {{DOMTokenList/value}} attribute must set an attribute value for the associated element using associated attribute's local name and the given value. +

    The stringification behavior +must return the result of running context object's serialize steps.

    Historical

    diff --git a/dom.html b/dom.html index 7123d2fc8..e7d266166 100644 --- a/dom.html +++ b/dom.html @@ -69,7 +69,7 @@

    DOM

    -

    Living Standard — Last Updated

    +

    Living Standard — Last Updated

    Participate: @@ -183,7 +183,6 @@

    7 Sets
  • 8 Historical @@ -4034,7 +4033,7 @@

    SHOW_DOCUMENT_FRAGMENT (1024, 400 in hexadecimal).

    7. Sets

    -

    Yes, the names DOMTokenList and DOMSettableTokenList are unfortunate legacy mishaps.

    +

    Yes, the name DOMTokenList is an unfortunate legacy mishap.

    7.1. Interface DOMTokenList

    interface DOMTokenList {
   readonly attribute unsigned long length;
@@ -4044,6 +4043,7 @@ 
    remove(DOMString... tokens);
   boolean toggle(DOMString token, optional boolean force);
   void replace(DOMString token, DOMString newToken);
+           attribute DOMString value;
   stringifier;
   iterable<DOMString>;
 };
@@ -4121,6 +4121,10 @@ 
    Replaces token with newToken. 
    
      
    Throws a SyntaxError exception if one if the arguments is the empty string. 
    
      
    Throws an InvalidCharacterError exception if one of the arguments contains any ASCII whitespace. 
    
+    
    tokenlist . value 
+    
    
+     
    Returns the associated set as string. 
    
+     
    Can be set, to change the associated attribute.

    • The length attribute' getter must return the number of tokens in the tokens.

    @@ -4219,23 +4223,12 @@

    Run the update steps.

    -

    The stringification behavior must return the result of running context object’s serialize steps.

    -

    7.2. Interface DOMSettableTokenList

    -
    interface DOMSettableTokenList : DOMTokenList {
-            attribute DOMString value;
-};
-
    -
    -
    tokenlist . value -
    -

    Returns the associated set as string.

    -

    Can be set, to change the associated attribute.

    -
    -

    The value attribute must return the +

    The value attribute must return the result of running context object’s serialize steps.

    -

    Setting the value attribute must set an attribute value for the +

    Setting the value attribute must set an attribute value for the associated element using associated attribute’s local name and the given value.

    +

    The stringification behavior must return the result of running context object’s serialize steps.

    8. Historical

    As explained in goals this specification is a significant revision of various DOM specifications. This section attempts to @@ -4746,7 +4739,6 @@

    DOMImplementationSource, in §8.2
  • DOMLocator, in §8.2
  • DOMObject, in §8.2 -
  • DOMSettableTokenList, in §7.2
  • DOMStringList, in §8.2
  • DOMTokenList, in §7.1
  • DOMUserData, in §8.2 @@ -5448,7 +5440,7 @@

    argument for Element/setAttributeNS(namespace, name, value), in §4.8
  • dfn for Attr, in §4.8.2
  • attribute for Attr, in §4.8.2 -
  • attribute for DOMSettableTokenList, in §7.2 +
  • attribute for DOMTokenList, in §7.1
  • webkitMatchesSelector(selectors), in §4.8
  • @@ -6019,14 +6011,11 @@

    IDL Inde void remove(DOMString... tokens); boolean toggle(DOMString token, optional boolean force); void replace(DOMString token, DOMString newToken); + attribute DOMString value; stringifier; iterable<DOMString>; }; -interface DOMSettableTokenList : DOMTokenList { - attribute DOMString value; -}; - \ No newline at end of file