JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
/*!
|
2013-01-15 23:38:49 +00:00
|
|
|
* VisualEditor DataModel example data sets.
|
2012-07-19 21:25:16 +00:00
|
|
|
*
|
2013-02-19 23:37:34 +00:00
|
|
|
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
|
2012-07-19 00:11:26 +00:00
|
|
|
* @license The MIT License (MIT); see LICENSE.txt
|
|
|
|
*/
|
|
|
|
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
/**
|
|
|
|
* @class
|
|
|
|
* @singleton
|
|
|
|
* @ignore
|
|
|
|
*/
|
2012-04-27 21:59:52 +00:00
|
|
|
ve.dm.example = {};
|
|
|
|
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
/* Methods */
|
|
|
|
|
2012-10-06 00:34:12 +00:00
|
|
|
/**
|
|
|
|
* Convert arrays of shorthand annotations in a data fragment to AnnotationSets with real
|
2013-03-20 22:35:05 +00:00
|
|
|
* annotation objects, and wraps the result in a ve.dm.ElementLinearData object.
|
2012-10-06 00:34:12 +00:00
|
|
|
*
|
|
|
|
* Shorthand notation for annotations is:
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
* [ 'a', [ { 'type': 'link', 'attributes': { 'href': '...' } ] ]
|
2012-10-06 00:34:12 +00:00
|
|
|
*
|
|
|
|
* The actual storage format has an instance of ve.dm.LinkAnnotation instead of the plain object,
|
2013-03-20 22:35:05 +00:00
|
|
|
* and an instance of ve.dm.AnnotationSet instead of the array.
|
2012-10-06 00:34:12 +00:00
|
|
|
*
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
* @method
|
2013-03-20 22:35:05 +00:00
|
|
|
* @param {Array} data Linear model data
|
|
|
|
* @param {ve.dm.IndexValueStore} [store] Index-value store to use, creates one if undefined
|
|
|
|
* @returns {ve.dm.ElementLinearData} Element linear data store
|
|
|
|
* @throws {Error} Example data passed to preprocessAnnotations by reference
|
2012-10-06 00:34:12 +00:00
|
|
|
*/
|
2013-03-20 22:35:05 +00:00
|
|
|
ve.dm.example.preprocessAnnotations = function ( data, store ) {
|
2012-08-24 02:06:36 +00:00
|
|
|
var i, key;
|
2013-03-20 22:35:05 +00:00
|
|
|
|
|
|
|
// Sanity check to make sure ve.dm.example data has not been passed in
|
2013-07-28 20:51:32 +00:00
|
|
|
// by reference. Always use ve#copy.
|
2013-03-20 22:35:05 +00:00
|
|
|
for ( i in ve.dm.example ) {
|
|
|
|
if ( data === ve.dm.example[i] ) {
|
|
|
|
throw new Error( 'Example data passed to preprocessAnnotations by reference' );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
store = store || new ve.dm.IndexValueStore();
|
2012-08-24 02:06:36 +00:00
|
|
|
for ( i = 0; i < data.length; i++ ) {
|
|
|
|
key = data[i].annotations ? 'annotations' : 1;
|
2013-03-20 22:35:05 +00:00
|
|
|
// check for shorthand annotation objects in array
|
|
|
|
if ( ve.isArray( data[i][key] ) && data[i][key][0].type ) {
|
|
|
|
data[i][key] = ve.dm.example.createAnnotationSet( store, data[i][key] ).getIndexes();
|
2012-10-06 00:34:12 +00:00
|
|
|
}
|
|
|
|
}
|
2013-03-20 22:35:05 +00:00
|
|
|
return new ve.dm.ElementLinearData( store, data );
|
2012-10-06 00:34:12 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create an annotation object from shorthand notation.
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
* @method
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
* @param {Object} annotation Plain object with type and attributes properties
|
2013-06-17 10:50:24 +00:00
|
|
|
* @returns {ve.dm.Annotation} Instance of the right ve.dm.Annotation subclass
|
2012-10-06 00:34:12 +00:00
|
|
|
*/
|
|
|
|
ve.dm.example.createAnnotation = function ( annotation ) {
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
return ve.dm.annotationFactory.create( annotation.type, annotation );
|
2012-10-06 00:34:12 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create an AnnotationSet from an array of shorthand annotations.
|
|
|
|
*
|
|
|
|
* This calls ve.dm.example.createAnnotation() for each element and puts the result in an
|
|
|
|
* AnnotationSet.
|
|
|
|
*
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
* @method
|
2012-10-06 00:34:12 +00:00
|
|
|
* @param {Array} annotations Array of annotations in shorthand format
|
2013-06-17 10:50:24 +00:00
|
|
|
* @returns {ve.dm.AnnotationSet}
|
2012-10-06 00:34:12 +00:00
|
|
|
*/
|
2013-03-20 22:35:05 +00:00
|
|
|
ve.dm.example.createAnnotationSet = function ( store, annotations ) {
|
2012-10-06 00:34:12 +00:00
|
|
|
var i;
|
|
|
|
for ( i = 0; i < annotations.length; i++ ) {
|
|
|
|
annotations[i] = ve.dm.example.createAnnotation( annotations[i] );
|
|
|
|
}
|
2013-04-18 17:56:03 +00:00
|
|
|
return new ve.dm.AnnotationSet( store, store.indexes( annotations ) );
|
2012-08-24 02:06:36 +00:00
|
|
|
};
|
|
|
|
|
2012-10-06 00:34:12 +00:00
|
|
|
/* Some common annotations in shorthand format */
|
2013-08-08 06:05:20 +00:00
|
|
|
ve.dm.example.bold = { 'type': 'textStyle/bold', 'attributes': { 'nodeName': 'b' } };
|
|
|
|
ve.dm.example.italic = { 'type': 'textStyle/italic', 'attributes': { 'nodeName': 'i' } };
|
|
|
|
ve.dm.example.underline = { 'type': 'textStyle/underline', 'attributes': { 'nodeName': 'u' } };
|
|
|
|
ve.dm.example.span = { 'type': 'textStyle/span', 'attributes': { 'nodeName': 'span' } };
|
|
|
|
ve.dm.example.big = { 'type': 'textStyle/big', 'attributes': { 'nodeName': 'big' } };
|
|
|
|
ve.dm.example.code = { 'type': 'textStyle/code', 'attributes': { 'nodeName': 'code' } };
|
|
|
|
ve.dm.example.tt = { 'type': 'textStyle/code', 'attributes': { 'nodeName': 'tt' } };
|
2012-10-06 00:34:12 +00:00
|
|
|
|
2013-03-20 22:35:05 +00:00
|
|
|
/**
|
|
|
|
* Creates a document from example data.
|
|
|
|
*
|
|
|
|
* Defaults to ve.dm.example.data if no name is supplied.
|
|
|
|
*
|
|
|
|
* @param {string} [name='data'] Named element of ve.dm.example
|
|
|
|
* @param {ve.dm.IndexValueStore} [store] A specific index-value store to use, optionally.
|
|
|
|
* @returns {ve.dm.Document} Document
|
|
|
|
* @throws {Error} Example data not found
|
|
|
|
*/
|
2013-05-06 11:34:32 +00:00
|
|
|
ve.dm.example.createExampleDocument = function ( name, store ) {
|
2013-07-03 01:30:10 +00:00
|
|
|
return ve.dm.example.createExampleDocumentFromObject( name, store, ve.dm.example );
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Helper function for ve.dm.createExampleDocument.
|
|
|
|
*
|
|
|
|
* @param {string} [name='data'] Named element of ve.dm.example
|
|
|
|
* @param {ve.dm.IndexValueStore} [store] A specific index-value store to use, optionally.
|
|
|
|
* @param {Object} [object] Collection of test documents, keyed by name
|
|
|
|
* @returns {ve.dm.Document} Document
|
|
|
|
* @throws {Error} Example data not found
|
|
|
|
*/
|
|
|
|
ve.dm.example.createExampleDocumentFromObject = function ( name, store, object ) {
|
2013-05-22 14:34:32 +00:00
|
|
|
var doc, i;
|
2013-03-20 22:35:05 +00:00
|
|
|
name = name || 'data';
|
|
|
|
store = store || new ve.dm.IndexValueStore();
|
2013-07-03 01:30:10 +00:00
|
|
|
if ( object[name] === undefined ) {
|
2013-03-20 22:35:05 +00:00
|
|
|
throw new Error( 'Example data \'' + name + '\' not found' );
|
|
|
|
}
|
2013-05-22 14:34:32 +00:00
|
|
|
doc = new ve.dm.Document(
|
2013-07-28 20:51:32 +00:00
|
|
|
ve.dm.example.preprocessAnnotations( ve.copy( object[name] ), store )
|
2013-03-20 22:35:05 +00:00
|
|
|
);
|
2013-05-22 14:34:32 +00:00
|
|
|
// HACK internalList isn't populated when creating a document from data
|
2013-07-03 01:30:10 +00:00
|
|
|
if ( object[name].internalItems ) {
|
|
|
|
for ( i = 0; i < object[name].internalItems.length; i++ ) {
|
2013-05-28 13:07:46 +00:00
|
|
|
doc.internalList.queueItemHtml(
|
2013-09-05 00:59:17 +00:00
|
|
|
object[name].internalItems[i].group,
|
2013-07-03 01:30:10 +00:00
|
|
|
object[name].internalItems[i].key,
|
|
|
|
object[name].internalItems[i].body
|
2013-05-22 14:34:32 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return doc;
|
2013-03-20 22:35:05 +00:00
|
|
|
};
|
|
|
|
|
2013-06-14 00:29:32 +00:00
|
|
|
/**
|
|
|
|
* Looks up a value in a node tree.
|
|
|
|
*
|
|
|
|
* @method
|
|
|
|
* @param {ve.Node} root Root node to lookup from
|
|
|
|
* @param {number...} [paths] Index path
|
|
|
|
* @returns {ve.Node} Node at given path
|
|
|
|
*/
|
|
|
|
ve.dm.example.lookupNode = function ( root ) {
|
|
|
|
var i,
|
|
|
|
node = root;
|
|
|
|
for ( i = 1; i < arguments.length; i++ ) {
|
|
|
|
node = node.children[arguments[i]];
|
|
|
|
}
|
|
|
|
return node;
|
|
|
|
};
|
|
|
|
|
|
|
|
ve.dm.example.createDomElement = function ( type, attributes ) {
|
|
|
|
var key,
|
|
|
|
element = document.createElement( type );
|
|
|
|
for ( key in attributes ) {
|
|
|
|
element.setAttribute( key, attributes[key] );
|
|
|
|
}
|
|
|
|
return element;
|
|
|
|
};
|
|
|
|
|
2013-07-03 01:30:10 +00:00
|
|
|
ve.dm.example.testDir = window.VE_TESTDIR || '.';
|
2013-04-02 21:40:07 +00:00
|
|
|
|
|
|
|
ve.dm.example.imgSrc = ve.dm.example.testDir + '/example.png';
|
|
|
|
|
2012-04-27 21:59:52 +00:00
|
|
|
/**
|
|
|
|
* Serialized HTML.
|
2012-05-14 22:05:09 +00:00
|
|
|
*
|
2012-04-27 21:59:52 +00:00
|
|
|
* This is what the parser will emit.
|
2012-08-16 20:06:18 +00:00
|
|
|
* TODO remove some of the <p>s here to test automatic wrapping
|
2012-04-27 21:59:52 +00:00
|
|
|
*/
|
|
|
|
ve.dm.example.html =
|
|
|
|
'<h1>a<b>b</b><i>c</i></h1>' +
|
|
|
|
'<table>' +
|
|
|
|
'<tr>' +
|
|
|
|
'<td>' +
|
|
|
|
'<p>d</p>' +
|
|
|
|
'<ul>' +
|
|
|
|
'<li>' +
|
2012-08-03 19:12:09 +00:00
|
|
|
'<p>e</p>' +
|
2012-04-27 21:59:52 +00:00
|
|
|
'<ul>' +
|
|
|
|
'<li>' +
|
2012-08-03 19:12:09 +00:00
|
|
|
'<p>f</p>' +
|
2012-04-27 21:59:52 +00:00
|
|
|
'</li>' +
|
|
|
|
'</ul>' +
|
|
|
|
'</li>' +
|
|
|
|
'</ul>' +
|
|
|
|
'<ol>' +
|
|
|
|
'<li>' +
|
2012-08-03 19:12:09 +00:00
|
|
|
'<p>g</p>' +
|
2012-04-27 21:59:52 +00:00
|
|
|
'</li>' +
|
|
|
|
'</ol>' +
|
|
|
|
'</td>' +
|
|
|
|
'</tr>' +
|
|
|
|
'</table>' +
|
2013-04-02 21:40:07 +00:00
|
|
|
'<pre>h<img src="' + ve.dm.example.imgSrc + '">i</pre>'+
|
2012-05-04 18:56:32 +00:00
|
|
|
'<dl>' +
|
|
|
|
'<dt>' +
|
|
|
|
'<p>j</p>' +
|
|
|
|
'</dt>' +
|
|
|
|
'<dd>' +
|
|
|
|
'<p>k</p>' +
|
|
|
|
'</dd>' +
|
2012-05-16 20:33:27 +00:00
|
|
|
'</dl>' +
|
|
|
|
'<p>l</p>' +
|
|
|
|
'<p>m</p>';
|
2012-04-27 21:59:52 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Linear data.
|
2012-05-14 22:05:09 +00:00
|
|
|
*
|
2012-04-27 21:59:52 +00:00
|
|
|
* This is what we convert serialized HTML from the parser into so we can work with it more easily.
|
2012-05-14 22:05:09 +00:00
|
|
|
*
|
2012-04-27 21:59:52 +00:00
|
|
|
* There are three types of components in content data:
|
2012-05-14 22:05:09 +00:00
|
|
|
*
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
* {string} Plain text character
|
2012-05-15 00:15:28 +00:00
|
|
|
*
|
2012-04-27 21:59:52 +00:00
|
|
|
* {Array} Annotated character
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
* 0: {string} Character
|
2012-04-27 21:59:52 +00:00
|
|
|
* 1: {Object} List of references to immutable annotation objects, keyed by JSON
|
|
|
|
* serializations of their values (hashes)
|
2012-05-15 00:15:28 +00:00
|
|
|
*
|
2012-04-27 21:59:52 +00:00
|
|
|
* {Object} Opening or closing structural element
|
JSDuck: Generated code documentation!
See CODING.md for how to run it.
Mistakes fixed:
* Warning: Unknown type function
-> Function
* Warning: Unknown type DOMElement
-> HTMLElement
* Warning: Unknown type DOM Node
-> HTMLElement
* Warning: Unknown type Integer
-> Mixed
* Warning: Unknown type Command
-> ve.Command
* Warning: Unknown type any
-> number
* Warning: Unknown type ve.Transaction
-> ve.dm.Transaction
* Warning: Unknown type ve.dm.AnnotationSet
-> ve.AnnotationSet
* Warning: Unknown type false
-> boolean
* Warning: Unknown type ve.dm.AlienNode
ve.dm doesn't have a generic AlienNode like ve.ce
-> Unknown type ve.dm.AlienInlineNode|ve.dm.AlienBlockNode
* Warning: Unknown type ve.ve.Surface
-> ve.ce.Surface
* ve.example.lookupNode:
-> Last @param should be @return
* ve.dm.Transaction.prototype.pushReplace:
-> @param {Array] should be @param {Array}
* Warning: ve.BranchNode.js:27: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
* Warning: ve.LeafNode.js:21: {@link ve.Node#hasChildren} links to non-existing member
-> (removed)
Differences fixed:
* Variadic arguments are like @param {Type...} [name]
instead of @param {Type} [name...]
* Convert all file headers from /** to /*! because JSDuck tries
to parse all /** blocks and fails to parse with all sorts of
errors for "Global property", "Unnamed property", and
"Duplicate property".
Find: \/\*\*([^@]+)(@copyright)
Replace: /*!$1$2
* Indented blocks are considered code examples.
A few methods had documentation with numbered lists that were
indented, which have now been updated to not be intended.
* The free-form text descriptions are parsed with Markdown,
which requires lists to be separated from paragraphs by an
empty line.
And we should use `backticks` instead of {braces} for inline
code in text paragraphs.
* Doc blocks for classes and their constructor have to be
in the correct order (@constructor, @param, @return must be
before @class, @abstract, @extends etc.)
* `@extends Class` must not have Class {wrapped}
* @throws must start with a {Type}
* @example means something else. It is used for an inline demo
iframe, not code block. For that simply indent with spaces.
* @member means something else.
Non-function properties are marked with @property, not @member.
* To create a link to a class or member, in most cases the name
is enough to create a link. E.g. Foo, Foo.bar, Foo.bar#quux,
where a hash stands for "instance member", so Foo.bar#quux,
links to Foo.bar.prototype.quux (the is not supported, as
"prototype" is considered an implementation detail, it only
indexes class name and method name).
If the magic linker doesn't work for some case, the
verbose syntax is {@link #target label}.
* @property can't have sub-properties (nested @param and @return
values are supported, only @static @property can't be nested).
We only have one case of this, which can be worked around by
moving those in a new virtual class. The code is unaltered
(only moved down so that it isn't with the scope of the main
@class block). ve.dm.TransactionProcessor.processors.
New:
* @mixins: Classes mixed into the current class.
* @event: Events that can be emitted by a class. These are also
inherited by subclasses. (+ @param, @return and @preventable).
So ve.Node#event-attach is inherited to ve.dm.BreakNode,
just like @method is.
* @singleton: Plain objects such as ve, ve.dm, ve.ce were missing
documentation causing a tree error. Documented those as a
JSDuck singleton, which they but just weren't documented yet.
NB: Members of @singleton don't need @static (if present,
triggers a compiler warning).
* @chainable: Shorthand for "@return this". We were using
"@return {classname}" which is ambiguous (returns the same
instance or another instance?), @chainable is specifically
for "@return this". Creates proper labels in the generated
HTML pages.
Removed:
* @mixin: (not to be confused with @mixins). Not supported by
JSDuck. Every class is standalone anyway. Where needed marked
them @class + @abstract instead.
Change-Id: I6a7c9e8ee8f995731bc205d666167874eb2ebe23
2013-01-04 08:54:17 +00:00
|
|
|
* type: {string} Symbolic node type name, if closing element first character will be "/"
|
2012-04-27 21:59:52 +00:00
|
|
|
* [attributes]: {Object} List of symbolic attribute name and literal value pairs
|
|
|
|
*/
|
|
|
|
ve.dm.example.data = [
|
|
|
|
// 0 - Beginning of heading
|
|
|
|
{ 'type': 'heading', 'attributes': { 'level': 1 } },
|
|
|
|
// 1 - Plain "a"
|
|
|
|
'a',
|
|
|
|
// 2 - Bold "b"
|
2012-10-06 00:34:12 +00:00
|
|
|
['b', [ ve.dm.example.bold ]],
|
2012-04-27 21:59:52 +00:00
|
|
|
// 3 - Italic "c"
|
2012-10-06 00:34:12 +00:00
|
|
|
['c', [ ve.dm.example.italic ]],
|
2012-04-27 21:59:52 +00:00
|
|
|
// 4 - End of heading
|
|
|
|
{ 'type': '/heading' },
|
|
|
|
// 5 - Beginning of table
|
|
|
|
{ 'type': 'table' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 6 - Beginning of body
|
|
|
|
{ 'type': 'tableSection', 'attributes': { 'style': 'body' } },
|
|
|
|
// 7 - Beginning of row
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': 'tableRow' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 8 - Beginning of cell
|
2012-06-08 05:02:25 +00:00
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 9 - Beginning of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 10 - Plain "d"
|
2012-04-27 21:59:52 +00:00
|
|
|
'd',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 11 - End of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 12 - Beginning of bullet list
|
2012-05-03 21:54:27 +00:00
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 13 - Beginning of list item
|
2012-05-04 22:50:32 +00:00
|
|
|
{ 'type': 'listItem' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 14 - Beginning of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 15 - Plain "e"
|
2012-04-27 21:59:52 +00:00
|
|
|
'e',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 16 - End of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 17 - Beginning of nested bullet list
|
2012-05-03 21:54:27 +00:00
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 18 - Beginning of nested bullet list item
|
Remainder JSHint fixes on modules/ve/*
[jshint]
ce/ve.ce.Surface.js: line 670, col 9, Too many var statements.
ce/ve.ce.Surface.js: line 695, col 6, Missing semicolon.
ce/ve.ce.Surface.js: line 726, col 22, Expected '===' and instead saw '=='.
ce/ve.ce.Surface.js: line 726, col 41, Expected '===' and instead saw '=='.
ce/ve.ce.Surface.js: line 733, col 13, Too many var statements.
ce/ve.ce.Surface.js: line 734, col 24, Expected '===' and instead saw '=='.
ce/ve.ce.Surface.js: line 1013, col 13, Too many var statements.
ce/ve.ce.Surface.js: line 1019, col 17, Too many var statements.
ce/ve.ce.Surface.js: line 1023, col 18, Too many ar statements.
ce/ve.ce.Surface.js: line 1027, col 13, Too many var statements.
dm/annotations/ve.dm.LinkAnnotation.js: line 70, col 52, Insecure '.'.
dm/ve.dm.Converter.js: line 383, col 29, Empty block.
dm/ve.dm.Converter.js: line 423, col 33, Empty block.
Commands:
* jshint .
* ack '(if|else|function|switch|for|while)\('
* Sublime Text 2:
Find(*): (if|else|function|switch|for|while)\(
Replace: $1 (
* ack ' ' -Q # double spaces, except in certain comments
Change-Id: I8e34bf2924bc8688fdf8acef08bbc4f6707e93be
2012-09-02 21:45:01 +00:00
|
|
|
{ 'type': 'listItem' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 19 - Beginning of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 20 - Plain "f"
|
2012-04-27 21:59:52 +00:00
|
|
|
'f',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 21 - End of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 22 - End of nested bullet list item
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/listItem' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 23 - End of nested bullet list
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/list' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 24 - End of bullet list item
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/listItem' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 25 - End of bullet list
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/list' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 26 - Beginning of numbered list
|
2012-05-03 21:54:27 +00:00
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'number' } },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 27 - Beginning of numbered list item
|
2012-05-04 22:50:32 +00:00
|
|
|
{ 'type': 'listItem' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 28 - Beginning of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 29 - Plain "g"
|
2012-04-27 21:59:52 +00:00
|
|
|
'g',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 30 - End of paragraph
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 31 - End of item
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/listItem' },
|
2013-03-01 01:20:59 +00:00
|
|
|
// 32 - End of lis t
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/list' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 33 - End of cell
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/tableCell' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 34 - End of row
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/tableRow' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 35 - End of body
|
|
|
|
{ 'type': '/tableSection' },
|
|
|
|
// 36 - End of table
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/table' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 37 - Beginning of preformatted
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': 'preformatted' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 38 - Plain "h"
|
2012-04-27 21:59:52 +00:00
|
|
|
'h',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 39 - Beginning of inline image
|
2013-05-18 03:49:25 +00:00
|
|
|
{
|
|
|
|
'type': 'image',
|
|
|
|
'attributes': {
|
|
|
|
'src': ve.dm.example.imgSrc,
|
|
|
|
'width': null,
|
|
|
|
'height': null
|
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': { 'src': ve.dm.example.imgSrc } } ]
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2012-06-08 05:08:49 +00:00
|
|
|
// 40 - End of inline image
|
2012-04-27 21:59:52 +00:00
|
|
|
{ 'type': '/image' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 41 - Plain "i"
|
2012-04-27 21:59:52 +00:00
|
|
|
'i',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 42 - End of preformatted
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': '/preformatted' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 43 - Beginning of definition list
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': 'definitionList' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 44 - Beginning of definition list term item
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': 'definitionListItem', 'attributes': { 'style': 'term' } },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 45 - Beginning of paragraph
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 46 - Plain "j"
|
2012-05-04 18:56:32 +00:00
|
|
|
'j',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 47 - End of paragraph
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 48 - End of definition list term item
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': '/definitionListItem' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 49 - Beginning of definition list definition item
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': 'definitionListItem', 'attributes': { 'style': 'definition' } },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 50 - Beginning of paragraph
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 51 - Plain "k"
|
2012-05-11 17:29:09 +00:00
|
|
|
'k',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 52 - End of paragraph
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 53 - End of definition list definition item
|
2012-05-04 18:56:32 +00:00
|
|
|
{ 'type': '/definitionListItem' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 54 - End of definition list
|
2012-05-16 20:33:27 +00:00
|
|
|
{ 'type': '/definitionList' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 55 - Beginning of paragraph
|
2012-05-16 20:33:27 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 56 - Plain "l"
|
2012-05-16 20:33:27 +00:00
|
|
|
'l',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 57 - End of paragraph
|
2012-05-16 20:33:27 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 58 - Beginning of paragraph
|
2012-05-16 20:33:27 +00:00
|
|
|
{ 'type': 'paragraph' },
|
2012-06-08 05:08:49 +00:00
|
|
|
// 59 - Plain "m"
|
2012-05-16 20:33:27 +00:00
|
|
|
'm',
|
2012-06-08 05:08:49 +00:00
|
|
|
// 60 - End of paragraph
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
// 61 - Beginning of internalList
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
// 62 - End of internalList
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
// 63 - End of document
|
2012-06-04 22:59:04 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
ve.dm.example.alienData = [
|
|
|
|
// 0 - Open alienBlock
|
|
|
|
{ 'type': 'alienBlock' },
|
|
|
|
// 1 - Close alienBlock
|
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
// 2 - Open paragraph
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
// 3 - Plain character 'a'
|
|
|
|
'a',
|
|
|
|
// 4 - Open alienInline
|
|
|
|
{ 'type': 'alienBlock' },
|
|
|
|
// 5 - Close alienInline
|
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
// 6 - Plain character 'b'
|
|
|
|
'b',
|
|
|
|
// 7 - Close paragraph
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
// 8 - Open alienBlock
|
|
|
|
{ 'type': 'alienBlock' },
|
|
|
|
// 9 - Close alienBlock
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
// 10 - Beginning of internalList
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
// 11 - End of internalList
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
// 12 - End of document
|
2012-04-27 21:59:52 +00:00
|
|
|
];
|
|
|
|
|
2013-04-17 17:53:26 +00:00
|
|
|
ve.dm.example.internalData = [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'F', 'o', 'o',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': 'internalItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'B', 'a', 'r',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/internalItem' },
|
|
|
|
{ 'type': 'internalItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'B', 'a', 'z',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/internalItem' },
|
|
|
|
{ 'type': '/internalList' },
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'Q', 'u', 'u', 'x',
|
|
|
|
{ 'type': '/paragraph' }
|
|
|
|
];
|
|
|
|
|
2013-05-22 14:34:32 +00:00
|
|
|
ve.dm.example.internalData.internalItems = [
|
2013-09-05 00:59:17 +00:00
|
|
|
{ 'group': 'test', 'key': 'bar', 'body': 'Bar' },
|
|
|
|
{ 'group': 'test', 'key': 'baz', 'body': 'Baz' }
|
2013-05-22 14:34:32 +00:00
|
|
|
];
|
|
|
|
|
2012-10-30 01:42:12 +00:00
|
|
|
ve.dm.example.withMeta = [
|
2012-11-20 04:01:09 +00:00
|
|
|
{
|
2013-02-21 23:01:04 +00:00
|
|
|
'type': 'alienMeta',
|
2012-11-20 04:01:09 +00:00
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- No content conversion -->' ).toArray()
|
2012-11-20 04:01:09 +00:00
|
|
|
}
|
|
|
|
},
|
2013-02-21 23:01:04 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-10-30 01:42:12 +00:00
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta property="foo" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
2013-07-03 01:30:10 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-10-30 01:42:12 +00:00
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<link rel="bar" href="baz" />' ).toArray()
|
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
2013-07-03 01:30:10 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-10-30 01:42:12 +00:00
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'r',
|
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta property="foo" content="bar" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
2013-07-03 01:30:10 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-10-30 01:42:12 +00:00
|
|
|
'B',
|
|
|
|
'a',
|
2012-11-20 04:01:09 +00:00
|
|
|
{
|
2013-02-21 23:01:04 +00:00
|
|
|
'type': 'alienMeta',
|
2012-11-20 04:01:09 +00:00
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- inline -->' ).toArray()
|
2012-11-20 04:01:09 +00:00
|
|
|
}
|
|
|
|
},
|
2013-02-21 23:01:04 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-10-30 01:42:12 +00:00
|
|
|
'z',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta property="bar" content="baz" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
2013-07-03 01:30:10 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-11-20 04:01:09 +00:00
|
|
|
{
|
2013-02-21 23:01:04 +00:00
|
|
|
'type': 'alienMeta',
|
2012-11-20 04:01:09 +00:00
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!--barbaz-->' ).toArray()
|
2012-11-20 04:01:09 +00:00
|
|
|
}
|
|
|
|
},
|
2013-02-21 23:01:04 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-10-30 01:42:12 +00:00
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<link rel="foofoo" href="barbar" />' ).toArray()
|
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
2013-07-03 01:30:10 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-10-30 01:42:12 +00:00
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta typeof=bazquux" data-foo="foobar" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
2013-07-03 01:30:10 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-30 01:42:12 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
ve.dm.example.withMetaPlainData = [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'r',
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'z',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-30 01:42:12 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
ve.dm.example.withMetaMetaData = [
|
|
|
|
[
|
2012-11-20 04:01:09 +00:00
|
|
|
{
|
2013-02-21 23:01:04 +00:00
|
|
|
'type': 'alienMeta',
|
2012-11-20 04:01:09 +00:00
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- No content conversion -->' ).toArray()
|
2012-11-20 04:01:09 +00:00
|
|
|
}
|
|
|
|
},
|
2012-10-30 01:42:12 +00:00
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta property="foo" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
}
|
|
|
|
],
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
[
|
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<link rel="bar" href="baz" />' ).toArray()
|
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
}
|
|
|
|
],
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
[
|
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta property="foo" content="bar" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
}
|
|
|
|
],
|
|
|
|
undefined,
|
2012-11-20 04:01:09 +00:00
|
|
|
[
|
|
|
|
{
|
2013-02-21 23:01:04 +00:00
|
|
|
'type': 'alienMeta',
|
2012-11-20 04:01:09 +00:00
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- inline -->' ).toArray()
|
2012-11-20 04:01:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
],
|
2012-10-30 01:42:12 +00:00
|
|
|
undefined,
|
|
|
|
[
|
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta property="bar" content="baz" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
2012-11-20 04:01:09 +00:00
|
|
|
{
|
2013-02-21 23:01:04 +00:00
|
|
|
'type': 'alienMeta',
|
2012-11-20 04:01:09 +00:00
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!--barbaz-->' ).toArray()
|
2012-11-20 04:01:09 +00:00
|
|
|
}
|
|
|
|
},
|
2012-10-30 01:42:12 +00:00
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<link rel="foofoo" href="barbar" />' ).toArray()
|
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
},
|
|
|
|
{
|
2013-07-03 01:30:10 +00:00
|
|
|
'type': 'alienMeta',
|
2012-10-30 01:42:12 +00:00
|
|
|
'attributes': {
|
2013-07-03 01:30:10 +00:00
|
|
|
'domElements': $( '<meta typeof=bazquux" data-foo="foobar" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-10-30 01:42:12 +00:00
|
|
|
}
|
2013-06-10 23:05:42 +00:00
|
|
|
],
|
|
|
|
undefined,
|
|
|
|
undefined
|
2012-10-30 01:42:12 +00:00
|
|
|
];
|
|
|
|
|
2013-07-03 01:30:10 +00:00
|
|
|
|
2013-09-02 18:51:23 +00:00
|
|
|
ve.dm.example.listWithMeta = [
|
|
|
|
// 0 - Beginning of list
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="one" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': 'list' },
|
|
|
|
// 1 - Beginning of first list item
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="two" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': 'listItem', 'attributes': { 'styles': ['bullet'] } },
|
|
|
|
// 2 - Beginning of paragraph
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="three" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
// 3 - Plain "a"
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="four" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'a',
|
|
|
|
// 4 - End of paragraph
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="five" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
// 5 - End of first list item
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="six" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
// 6 - Beginning of second list item
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="seven" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': 'listItem', 'attributes': { 'styles': ['bullet'] } },
|
|
|
|
// 7 - Beginning of paragraph
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="eight" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
// 8 - Plain "b"
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="nine" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'b',
|
|
|
|
// 9 - End of paragraph
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="ten" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
// 10 - End of second list item
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="eleven" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
// 11 - End of list
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<meta property="twelve" />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/list' }
|
|
|
|
];
|
|
|
|
|
|
|
|
|
2013-04-25 22:24:37 +00:00
|
|
|
ve.dm.example.complexTableHtml = '<table><caption>Foo</caption><thead><tr><th>Bar</th></tr></thead>' +
|
|
|
|
'<tfoot><tr><td>Baz</td></tr></tfoot><tbody><tr><td>Quux</td><td>Whee</td></tr></tbody></table>';
|
|
|
|
|
|
|
|
ve.dm.example.complexTable = [
|
|
|
|
{ 'type': 'table' },
|
|
|
|
{ 'type': 'tableCaption' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCaption' },
|
|
|
|
{ 'type': 'tableSection', 'attributes': { 'style': 'header' } },
|
|
|
|
{ 'type': 'tableRow' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'header' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'r',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': '/tableRow' },
|
|
|
|
{ 'type': '/tableSection' },
|
|
|
|
{ 'type': 'tableSection', 'attributes': { 'style': 'footer' } },
|
|
|
|
{ 'type': 'tableRow' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'z',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': '/tableRow' },
|
|
|
|
{ 'type': '/tableSection' },
|
|
|
|
{ 'type': 'tableSection', 'attributes': { 'style': 'body' } },
|
|
|
|
{ 'type': 'tableRow' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'Q',
|
|
|
|
'u',
|
|
|
|
'u',
|
|
|
|
'x',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'W',
|
|
|
|
'h',
|
|
|
|
'e',
|
|
|
|
'e',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': '/tableRow' },
|
|
|
|
{ 'type': '/tableSection' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-04-25 22:24:37 +00:00
|
|
|
];
|
|
|
|
|
2013-04-26 23:49:43 +00:00
|
|
|
ve.dm.example.inlineAtEdges = [
|
|
|
|
{ 'type': 'paragraph' },
|
2013-05-18 03:49:25 +00:00
|
|
|
{
|
|
|
|
'type': 'image',
|
|
|
|
'attributes': {
|
|
|
|
'src': ve.dm.example.imgSrc,
|
|
|
|
'width': null,
|
|
|
|
'height': null
|
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': { 'src': ve.dm.example.imgSrc } } ]
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-04-26 23:49:43 +00:00
|
|
|
{ 'type': '/image' },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
2013-06-22 01:03:59 +00:00
|
|
|
{ 'type': 'alienInline', 'attributes': { 'domElements': $( '<foobar />' ).toArray() } },
|
2013-04-26 23:49:43 +00:00
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
{ 'type': '/paragraph' }
|
|
|
|
];
|
|
|
|
|
2013-06-14 01:19:39 +00:00
|
|
|
ve.dm.example.emptyBranch = [
|
|
|
|
{ 'type': 'table' },
|
|
|
|
{ 'type': '/table' }
|
|
|
|
];
|
|
|
|
|
2012-04-27 21:59:52 +00:00
|
|
|
/**
|
|
|
|
* Sample content data index.
|
2012-05-14 22:05:09 +00:00
|
|
|
*
|
2012-04-27 21:59:52 +00:00
|
|
|
* This is part of what a ve.dm.DocumentFragment generates when given linear data.
|
2012-05-14 22:05:09 +00:00
|
|
|
*
|
2012-05-04 18:56:32 +00:00
|
|
|
* (21) branch nodes
|
2012-04-30 20:23:46 +00:00
|
|
|
* (01) document node
|
|
|
|
* (01) heading node
|
|
|
|
* (01) table node
|
|
|
|
* (01) tableRow node
|
|
|
|
* (01) tableCell node
|
2012-05-04 18:56:32 +00:00
|
|
|
* (06) paragraph nodes
|
2012-04-30 20:23:46 +00:00
|
|
|
* (03) list nodes
|
|
|
|
* (03) listItem nodes
|
|
|
|
* (01) preformatted node
|
2012-05-04 18:56:32 +00:00
|
|
|
* (01) definitionList node
|
|
|
|
* (02) definitionListItem nodes
|
|
|
|
* (10) leaf nodes
|
|
|
|
* (09) text nodes
|
2012-04-30 20:23:46 +00:00
|
|
|
* (01) image node
|
2012-04-27 21:59:52 +00:00
|
|
|
*/
|
2012-04-30 19:37:08 +00:00
|
|
|
ve.dm.example.tree = new ve.dm.DocumentNode( [
|
2012-04-27 21:59:52 +00:00
|
|
|
// Heading with "abc"
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.HeadingNode( [new ve.dm.TextNode( 3 )], ve.dm.example.data[0] ),
|
2012-04-27 21:59:52 +00:00
|
|
|
new ve.dm.TableNode( [
|
2012-06-08 05:08:49 +00:00
|
|
|
new ve.dm.TableSectionNode( [
|
|
|
|
new ve.dm.TableRowNode( [
|
|
|
|
new ve.dm.TableCellNode( [
|
|
|
|
// Paragraph with "d"
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.ParagraphNode( [new ve.dm.TextNode( 1 )],
|
|
|
|
ve.dm.example.data[9] ),
|
2012-06-08 05:08:49 +00:00
|
|
|
new ve.dm.ListNode( [
|
|
|
|
// 1st level bullet list item with "e"
|
|
|
|
new ve.dm.ListItemNode( [
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.ParagraphNode(
|
|
|
|
[new ve.dm.TextNode( 1 )],
|
|
|
|
ve.dm.example.data[14]
|
|
|
|
),
|
2012-06-08 05:08:49 +00:00
|
|
|
new ve.dm.ListNode( [
|
|
|
|
// 2nd level bullet list item with "f"
|
|
|
|
new ve.dm.ListItemNode( [
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.ParagraphNode(
|
|
|
|
[new ve.dm.TextNode( 1 )],
|
|
|
|
ve.dm.example.data[19]
|
|
|
|
)
|
|
|
|
], ve.dm.example.data[18] )
|
|
|
|
], ve.dm.example.data[17] )
|
|
|
|
], ve.dm.example.data[13] )
|
|
|
|
], ve.dm.example.data[12] ),
|
2012-06-08 05:08:49 +00:00
|
|
|
new ve.dm.ListNode( [
|
|
|
|
// Numbered list item with "g"
|
|
|
|
new ve.dm.ListItemNode( [
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.ParagraphNode(
|
|
|
|
[new ve.dm.TextNode( 1 )],
|
|
|
|
ve.dm.example.data[28]
|
|
|
|
)
|
|
|
|
], ve.dm.example.data[27] )
|
|
|
|
], ve.dm.example.data[26] )
|
|
|
|
], ve.dm.example.data[8] )
|
|
|
|
], ve.dm.example.data[7] )
|
|
|
|
], ve.dm.example.data[6] )
|
|
|
|
], ve.dm.example.data[5] ),
|
2013-04-02 21:40:07 +00:00
|
|
|
// Preformatted with "h[example.png]i"
|
2012-04-27 21:59:52 +00:00
|
|
|
new ve.dm.PreformattedNode( [
|
|
|
|
new ve.dm.TextNode( 1 ),
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.ImageNode( [], ve.dm.example.data[39] ),
|
2012-04-27 21:59:52 +00:00
|
|
|
new ve.dm.TextNode( 1 )
|
2012-11-23 23:16:08 +00:00
|
|
|
], ve.dm.example.data[37] ),
|
2012-05-04 18:56:32 +00:00
|
|
|
new ve.dm.DefinitionListNode( [
|
|
|
|
// Definition list term item with "j"
|
|
|
|
new ve.dm.DefinitionListItemNode( [
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.ParagraphNode( [new ve.dm.TextNode( 1 )], ve.dm.example.data[45] )
|
|
|
|
], ve.dm.example.data[44] ),
|
2012-05-04 18:56:32 +00:00
|
|
|
// Definition list definition item with "k"
|
|
|
|
new ve.dm.DefinitionListItemNode( [
|
2012-11-23 23:16:08 +00:00
|
|
|
new ve.dm.ParagraphNode( [new ve.dm.TextNode( 1 )], ve.dm.example.data[50] )
|
|
|
|
], ve.dm.example.data[49] )
|
|
|
|
], ve.dm.example.data[43] ),
|
|
|
|
new ve.dm.ParagraphNode( [new ve.dm.TextNode( 1 )], ve.dm.example.data[55] ),
|
2013-06-10 23:05:42 +00:00
|
|
|
new ve.dm.ParagraphNode( [new ve.dm.TextNode( 1 )], ve.dm.example.data[58] ),
|
|
|
|
new ve.dm.InternalListNode( [], ve.dm.example.data[61] )
|
2012-04-30 19:37:08 +00:00
|
|
|
] );
|
2012-04-27 21:59:52 +00:00
|
|
|
|
2012-06-06 17:17:30 +00:00
|
|
|
ve.dm.example.conversions = {
|
|
|
|
'definitionListItem term': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'dt' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'definitionListItem', 'attributes': { 'style': 'term' } }
|
|
|
|
},
|
|
|
|
'definitionListItem definition': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'dd' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'definitionListItem', 'attributes': { 'style': 'definition' } }
|
|
|
|
},
|
|
|
|
'definitionList definition': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'dl' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'definitionList' }
|
|
|
|
},
|
|
|
|
'heading level 1': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'h1' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'heading', 'attributes': { 'level': 1 } }
|
|
|
|
},
|
|
|
|
'heading level 2': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'h2' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'heading', 'attributes': { 'level': 2 } }
|
|
|
|
},
|
|
|
|
'heading level 3': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'h3' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'heading', 'attributes': { 'level': 3 } }
|
|
|
|
},
|
|
|
|
'heading level 4': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'h4' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'heading', 'attributes': { 'level': 4 } }
|
|
|
|
},
|
|
|
|
'heading level 5': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'h5' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'heading', 'attributes': { 'level': 5 } }
|
|
|
|
},
|
|
|
|
'heading level 6': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'h6' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'heading', 'attributes': { 'level': 6 } }
|
|
|
|
},
|
|
|
|
'image': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'img' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'image' }
|
|
|
|
},
|
|
|
|
'listItem': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'li' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'listItem' }
|
|
|
|
},
|
|
|
|
'list bullet': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'ul' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'list', 'attributes': { 'style': 'bullet' } }
|
|
|
|
},
|
|
|
|
'list number': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'ol' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'list', 'attributes': { 'style': 'number' } }
|
|
|
|
},
|
|
|
|
'paragraph': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'p' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'paragraph' }
|
|
|
|
},
|
|
|
|
'preformatted': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'pre' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'preformatted' }
|
|
|
|
},
|
|
|
|
'tableCell': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'td' ),
|
2012-06-08 05:02:25 +00:00
|
|
|
'dataElement': { 'type': 'tableCell', 'attributes': { 'style': 'data' } }
|
2012-06-06 17:17:30 +00:00
|
|
|
},
|
|
|
|
'table': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'table' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'table' }
|
|
|
|
},
|
|
|
|
'tableRow': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'tr' ),
|
2012-06-06 17:17:30 +00:00
|
|
|
'dataElement': { 'type': 'tableRow' }
|
|
|
|
},
|
2013-02-06 19:47:52 +00:00
|
|
|
'paragraph with data-mw attribute': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'p', { 'data-mw': '{"test":1234}' } ),
|
2013-05-18 03:49:25 +00:00
|
|
|
'dataElement': {
|
|
|
|
'type': 'paragraph',
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': { 'data-mw': '{"test":1234}' } } ]
|
2013-05-18 03:49:25 +00:00
|
|
|
}
|
2012-06-06 17:17:30 +00:00
|
|
|
},
|
2012-06-07 00:47:27 +00:00
|
|
|
'paragraph with style attribute': {
|
2013-06-14 00:29:32 +00:00
|
|
|
'domElement': ve.dm.example.createDomElement( 'p', { 'style': 'color:blue' } ),
|
2013-05-18 03:49:25 +00:00
|
|
|
'dataElement': {
|
|
|
|
'type': 'paragraph',
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': { 'style': 'color:blue' } } ]
|
2013-05-18 03:49:25 +00:00
|
|
|
}
|
2012-06-06 17:17:30 +00:00
|
|
|
}
|
|
|
|
};
|
2012-06-08 05:00:25 +00:00
|
|
|
|
|
|
|
ve.dm.example.domToDataCases = {
|
|
|
|
'paragraph with plain text': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p>abc</p></body>',
|
2012-08-10 23:49:14 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'a',
|
|
|
|
'b',
|
|
|
|
'c',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-10 23:49:14 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'annotated text with bold, italic, underline formatting': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p><b>a</b><i>b</i><u>c</u></p></body>',
|
2012-08-10 23:49:14 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
2012-10-06 00:34:12 +00:00
|
|
|
['a', [ ve.dm.example.bold ]],
|
|
|
|
['b', [ ve.dm.example.italic ]],
|
|
|
|
['c', [ ve.dm.example.underline ]],
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-10 23:49:14 +00:00
|
|
|
]
|
|
|
|
},
|
2013-08-08 06:05:20 +00:00
|
|
|
'equivalent annotations': {
|
|
|
|
'html': '<body><p><code>a</code>b<tt>c</tt>d<code>e</code><tt>f</tt></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
['a', [ ve.dm.example.code ]],
|
|
|
|
'b',
|
|
|
|
['c', [ ve.dm.example.tt ]],
|
|
|
|
'd',
|
|
|
|
['e', [ ve.dm.example.code ]],
|
|
|
|
['f', [ ve.dm.example.tt ]],
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
],
|
|
|
|
'normalizedHtml': '<body><p><code>a</code>b<tt>c</tt>d<code>ef</code></body>'
|
|
|
|
},
|
2013-07-02 20:22:09 +00:00
|
|
|
'additive annotations': {
|
2013-07-05 20:12:39 +00:00
|
|
|
'html': '<body><p><big>a<big>b</big>c</big><b>d<b>e</b>f</b></p></body>',
|
2013-07-02 20:22:09 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
['a', [ ve.dm.example.big ]],
|
|
|
|
['b', [ ve.dm.example.big, ve.dm.example.big ]],
|
|
|
|
['c', [ ve.dm.example.big ]],
|
2013-07-05 20:12:39 +00:00
|
|
|
['d', [ ve.dm.example.bold ]],
|
|
|
|
['e', [ ve.dm.example.bold, ve.dm.example.bold ]],
|
|
|
|
['f', [ ve.dm.example.bold ]],
|
2013-07-02 20:22:09 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2013-07-05 20:12:39 +00:00
|
|
|
'additive annotations overlapping other annotations': {
|
2013-07-02 20:22:09 +00:00
|
|
|
'html': '<body><p><i><big>a<big><b>b</b></big><b>c</b></big></i></p></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
['a', [ ve.dm.example.italic, ve.dm.example.big ]],
|
|
|
|
['b', [ ve.dm.example.italic, ve.dm.example.big, ve.dm.example.big, ve.dm.example.bold ]],
|
|
|
|
['c', [ ve.dm.example.italic, ve.dm.example.big, ve.dm.example.bold ]],
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2013-08-02 11:03:27 +00:00
|
|
|
'strip leading whitepsace in paragraphs': {
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
' ', 'f', 'o', 'o',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
' ', '\t', ' ', '\t', 'b', 'a', 'r',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'heading', 'attributes': { 'level': 2 } },
|
|
|
|
' ', ' ', 'b', 'a', 'z',
|
|
|
|
{ 'type': '/heading' },
|
|
|
|
{ 'type': 'preformatted' },
|
|
|
|
' ', '\t', 'q', 'u', 'u', 'x',
|
|
|
|
{ 'type': '/preformatted' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
],
|
|
|
|
'normalizedHtml': '<body><p>foo</p><p>bar</p><h2>baz</h2><pre> \tquux</pre></body>'
|
|
|
|
},
|
2012-08-10 23:49:14 +00:00
|
|
|
'image': {
|
2013-04-02 21:40:07 +00:00
|
|
|
'html': '<body><img src="' + ve.dm.example.imgSrc + '"></body>',
|
2012-08-10 23:49:14 +00:00
|
|
|
'data': [
|
2013-02-02 00:06:17 +00:00
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-18 03:49:25 +00:00
|
|
|
{
|
|
|
|
'type': 'image',
|
|
|
|
'attributes' : {
|
|
|
|
'width': null,
|
|
|
|
'height': null,
|
|
|
|
'src': ve.dm.example.imgSrc
|
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': { 'src': ve.dm.example.imgSrc } } ]
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-02-02 00:06:17 +00:00
|
|
|
{ 'type' : '/image' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-10 23:49:14 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'paragraph with alienInline inside': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'html': '<body><p>a<foobar class="foo">b</foobar>c</p></body>',
|
2012-08-10 23:49:14 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'a',
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
2013-08-02 20:49:21 +00:00
|
|
|
'attributes': { 'domElements': $( '<foobar class="foo">b</foobar>' ).toArray() }
|
2012-08-10 23:49:14 +00:00
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
'c',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-10 23:49:14 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'paragraphs with an alienBlock between them': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p>abc</p><figure>abc</figure><p>def</p></body>',
|
2012-08-10 23:49:14 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'a',
|
|
|
|
'b',
|
|
|
|
'c',
|
|
|
|
{ 'type': '/paragraph' },
|
2013-06-22 01:03:59 +00:00
|
|
|
{ 'type': 'alienBlock', 'attributes': { 'domElements': $( '<figure>abc</figure>' ).toArray() } },
|
2012-08-10 23:49:14 +00:00
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'd',
|
|
|
|
'e',
|
|
|
|
'f',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-10 23:49:14 +00:00
|
|
|
]
|
|
|
|
},
|
2012-11-24 02:44:54 +00:00
|
|
|
'annotated inline nodes': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'html': '<body><p>a<b><foobar class="foo">b</foobar><i><foobar class="bar">c</foobar></i></b>' +
|
2013-02-11 19:46:58 +00:00
|
|
|
'<i><br/>d</i>e</p></body>',
|
2012-11-24 02:44:54 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'a',
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
2013-08-02 20:49:21 +00:00
|
|
|
'attributes': { 'domElements': $( '<foobar class="foo">b</foobar>' ).toArray() },
|
2012-11-24 02:44:54 +00:00
|
|
|
'annotations': [ ve.dm.example.bold ]
|
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'alienInline',
|
2013-08-02 20:49:21 +00:00
|
|
|
'attributes': { 'domElements': $( '<foobar class="bar">c</foobar>' ).toArray() },
|
2012-11-24 02:44:54 +00:00
|
|
|
'annotations': [ ve.dm.example.bold, ve.dm.example.italic ]
|
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
{ 'type': '/alienInline' },
|
2012-11-24 02:44:54 +00:00
|
|
|
{
|
|
|
|
'type': 'break',
|
|
|
|
'annotations': [ ve.dm.example.italic ]
|
|
|
|
},
|
|
|
|
{ 'type': '/break' },
|
|
|
|
['d', [ ve.dm.example.italic ]],
|
|
|
|
'e',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-24 02:44:54 +00:00
|
|
|
]
|
|
|
|
},
|
2013-06-23 17:48:32 +00:00
|
|
|
'annotated metadata': {
|
|
|
|
'html': '<body><p><b><!--foo-->bar<!--baz--></b></p></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'annotations': [ ve.dm.example.bold ],
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!--foo-->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
[ 'b', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'a', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'r', [ ve.dm.example.bold ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'annotations': [ ve.dm.example.bold ],
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!--baz-->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2013-07-12 14:03:52 +00:00
|
|
|
'annotated comment metadata in a wrapper': {
|
2013-06-25 19:29:58 +00:00
|
|
|
'html': '<body><b><!--foo-->bar<!--baz-->quux<!--whee--></b></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'annotations': [ ve.dm.example.bold ],
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!--foo-->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
[ 'b', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'a', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'r', [ ve.dm.example.bold ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'annotations': [ ve.dm.example.bold ],
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!--baz-->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
[ 'q', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'u', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'u', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'x', [ ve.dm.example.bold ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'annotations': [ ve.dm.example.bold ],
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!--whee-->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2013-07-12 14:03:52 +00:00
|
|
|
'annotated element metadata in a wrapper with content': {
|
|
|
|
'html': '<body><b><link />foo<link /></b></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'annotations': [ ve.dm.example.bold ],
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<link />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
[ 'f', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'o', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'o', [ ve.dm.example.bold ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'annotations': [ ve.dm.example.bold ],
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<link />' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
|
|
|
'comment metadata in a wrapper followed by annotated text': {
|
2013-06-30 05:35:21 +00:00
|
|
|
'html': '<body>Foo<!--bar--><b>Baz</b></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!--bar-->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
[ 'B', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'a', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'z', [ ve.dm.example.bold ] ],
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2012-10-16 06:05:29 +00:00
|
|
|
'wrapping of bare content': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body>abc</body>',
|
2012-10-16 06:05:29 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'a',
|
|
|
|
'b',
|
|
|
|
'c',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-16 06:05:29 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'wrapping of bare content with inline node': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body>1<br/>2</body>',
|
2012-10-16 06:05:29 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'1',
|
|
|
|
{ 'type': 'break' },
|
|
|
|
{ 'type': '/break' },
|
|
|
|
'2',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-16 06:05:29 +00:00
|
|
|
]
|
|
|
|
},
|
2013-02-02 00:06:17 +00:00
|
|
|
'wrapping of bare content starting with inline node': {
|
2013-04-02 21:40:07 +00:00
|
|
|
'html': '<body><img src="' + ve.dm.example.imgSrc + '">12</body>',
|
2013-02-02 00:06:17 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-18 03:49:25 +00:00
|
|
|
{
|
|
|
|
'type': 'image',
|
|
|
|
'attributes': {
|
|
|
|
'src': ve.dm.example.imgSrc,
|
|
|
|
'width': null,
|
|
|
|
'height': null
|
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': { 'src': ve.dm.example.imgSrc } } ]
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-02-02 00:06:17 +00:00
|
|
|
{ 'type': '/image' },
|
|
|
|
'1',
|
|
|
|
'2',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-02-02 00:06:17 +00:00
|
|
|
]
|
|
|
|
},
|
2012-10-16 06:05:29 +00:00
|
|
|
'wrapping of bare content with inline alien': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'html': '<body>1<foobar class="bar">baz</foobar>2</body>',
|
2012-10-16 06:05:29 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'1',
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
2013-08-02 20:49:21 +00:00
|
|
|
'attributes': { 'domElements': $( '<foobar class="bar">baz</foobar>' ).toArray() }
|
2012-10-16 06:05:29 +00:00
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
'2',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-16 06:05:29 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'wrapping of bare content with block alien': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body>1<figure class="bar">baz</figure>2</body>',
|
2012-10-16 06:05:29 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'1',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{
|
|
|
|
'type': 'alienBlock',
|
2013-06-22 01:03:59 +00:00
|
|
|
'attributes': { 'domElements': $( '<figure class="bar">baz</figure>' ).toArray() }
|
2012-10-16 06:05:29 +00:00
|
|
|
},
|
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'2',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-16 06:05:29 +00:00
|
|
|
]
|
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
'wrapping of bare content starting with inline alien': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'html': '<body><foobar class="bar">Foo</foobar>Bar</body>',
|
2012-11-20 04:26:54 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
2013-08-02 20:49:21 +00:00
|
|
|
'attributes': { 'domElements': $( '<foobar class="bar">Foo</foobar>' ).toArray() }
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'r',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
]
|
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
'wrapping of bare content ending with inline alien': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'html': '<body>Foo<foobar class="bar">Bar</foobar></body>',
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
2013-08-02 20:49:21 +00:00
|
|
|
'attributes': { 'domElements': $( '<foobar class="bar">Bar</foobar>' ).toArray() }
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
]
|
|
|
|
},
|
2012-11-20 04:26:54 +00:00
|
|
|
'wrapping of bare content with about group': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'html': '<body>1<foobar about="#mwt1">foo</foobar><foobar about="#mwt1">bar</foobar>2</body>',
|
2012-11-20 04:26:54 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'1',
|
|
|
|
{
|
2013-02-16 02:37:50 +00:00
|
|
|
'type': 'alienInline',
|
2013-08-02 20:49:21 +00:00
|
|
|
'attributes': { 'domElements': $( '<foobar about="#mwt1">foo</foobar><foobar about="#mwt1">bar</foobar>' ).toArray() }
|
2012-11-20 04:26:54 +00:00
|
|
|
},
|
2013-02-16 02:37:50 +00:00
|
|
|
{ 'type': '/alienInline' },
|
2012-11-20 04:26:54 +00:00
|
|
|
'2',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-20 04:26:54 +00:00
|
|
|
]
|
|
|
|
},
|
2012-10-16 06:05:29 +00:00
|
|
|
'wrapping of bare content between structural nodes': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><table></table>abc<table></table></body>',
|
2012-10-16 06:05:29 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'table' },
|
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'a',
|
|
|
|
'b',
|
|
|
|
'c',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'table' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-16 06:05:29 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'wrapping of bare content between paragraphs': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p>abc</p>def<p></p></body>',
|
2012-10-16 06:05:29 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'a',
|
|
|
|
'b',
|
|
|
|
'c',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'd',
|
|
|
|
'e',
|
|
|
|
'f',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'paragraph' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-10-16 06:05:29 +00:00
|
|
|
]
|
|
|
|
},
|
2012-11-17 03:37:38 +00:00
|
|
|
'wrapping prevents empty list items': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><ul><li></li></ul></body>',
|
2012-11-17 03:37:38 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-17 03:37:38 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'empty document': {
|
|
|
|
'html': '',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-17 03:37:38 +00:00
|
|
|
]
|
|
|
|
},
|
2013-07-15 11:06:31 +00:00
|
|
|
'empty document with meta': {
|
|
|
|
'html': '<body><!-- comment --></body>',
|
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!-- comment -->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2012-11-17 03:37:38 +00:00
|
|
|
'empty document with content added by the editor': {
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-17 03:37:38 +00:00
|
|
|
],
|
2013-02-11 19:46:58 +00:00
|
|
|
'normalizedHtml': '<body><p>Foo</p></body>'
|
2012-11-17 03:37:38 +00:00
|
|
|
},
|
|
|
|
'empty list item with content added by the editor': {
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'empty' } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-17 03:37:38 +00:00
|
|
|
],
|
2013-02-11 19:46:58 +00:00
|
|
|
'normalizedHtml': '<body><ul><li><p>Foo</p></li></ul></body>'
|
2012-11-17 03:37:38 +00:00
|
|
|
},
|
2012-08-10 23:49:14 +00:00
|
|
|
'example document': {
|
|
|
|
'html': ve.dm.example.html,
|
|
|
|
'data': ve.dm.example.data
|
|
|
|
},
|
2013-06-12 18:39:24 +00:00
|
|
|
'empty annotation': {
|
|
|
|
'html': '<body><p>Foo<span id="anchorTarget"></span>Bar</p></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'F', 'o', 'o',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<span id="anchorTarget"></span>' ).toArray()
|
2013-06-12 18:39:24 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'B', 'a', 'r',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-06-12 18:39:24 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'empty annotation in wrapper paragraph': {
|
|
|
|
'html': '<body>Foo<span id="anchorTarget"></span>Bar</body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'F', 'o', 'o',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<span id="anchorTarget"></span>' ).toArray()
|
2013-06-12 18:39:24 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'B', 'a', 'r',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-06-12 18:39:24 +00:00
|
|
|
]
|
|
|
|
},
|
2013-06-18 19:00:49 +00:00
|
|
|
'nested empty annotation': {
|
2013-06-21 18:47:10 +00:00
|
|
|
'html': '<body><p>Foo<i><b><u></u></b></i>Bar</p></body>',
|
2013-06-18 19:00:49 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'F', 'o', 'o',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<i><b><u></u></b></i>' ).toArray()
|
2013-06-18 19:00:49 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'B', 'a', 'r',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2013-06-30 06:51:34 +00:00
|
|
|
'empty annotation inside nonempty annotation': {
|
|
|
|
'html': '<body><p><i>Foo<b></b></i></p></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
[ 'F', [ ve.dm.example.italic ] ],
|
|
|
|
[ 'o', [ ve.dm.example.italic ] ],
|
|
|
|
[ 'o', [ ve.dm.example.italic ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<b></b>' ).toArray()
|
|
|
|
},
|
|
|
|
'annotations': [ ve.dm.example.italic ]
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2013-06-23 17:48:32 +00:00
|
|
|
'empty annotation with comment': {
|
2013-06-18 19:00:49 +00:00
|
|
|
'html': '<body><p>Foo<b><!-- Bar --></b>Baz</p></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'F', 'o', 'o',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<b><!-- Bar --></b>' ).toArray()
|
2013-06-18 19:00:49 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'B', 'a', 'z',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2012-08-10 23:49:14 +00:00
|
|
|
'list item with space followed by link': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'html': '<body><ul><li><p> <a href="Foobar">bar</a></p></li></ul></body>',
|
2012-08-10 23:49:14 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
2012-08-16 17:53:33 +00:00
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, ' ' ] } },
|
2012-08-10 23:49:14 +00:00
|
|
|
[
|
2012-06-08 05:00:25 +00:00
|
|
|
'b',
|
2012-08-24 02:06:36 +00:00
|
|
|
[ {
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'link',
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foobar'
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foobar'
|
2013-06-14 06:17:08 +00:00
|
|
|
} } ]
|
2012-08-24 02:06:36 +00:00
|
|
|
} ]
|
2012-08-10 23:49:14 +00:00
|
|
|
],
|
|
|
|
[
|
|
|
|
'a',
|
2012-08-24 02:06:36 +00:00
|
|
|
[ {
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'link',
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foobar'
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foobar'
|
2013-06-14 06:17:08 +00:00
|
|
|
} } ]
|
2012-08-24 02:06:36 +00:00
|
|
|
} ]
|
2012-08-10 23:49:14 +00:00
|
|
|
],
|
|
|
|
[
|
|
|
|
'r',
|
2012-08-24 02:06:36 +00:00
|
|
|
[ {
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'link',
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foobar'
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foobar'
|
2013-06-14 06:17:08 +00:00
|
|
|
} } ]
|
2012-08-24 02:06:36 +00:00
|
|
|
} ]
|
2012-08-10 23:49:14 +00:00
|
|
|
],
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-10 23:49:14 +00:00
|
|
|
]
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
},
|
2013-05-09 19:22:12 +00:00
|
|
|
'whitespace between unwrapped inline nodes': {
|
|
|
|
'html':
|
|
|
|
'<body>' +
|
2013-08-02 20:49:21 +00:00
|
|
|
'<foobar>c</foobar> <foobar>d</foobar>\n<foobar>e</foobar>' +
|
2013-05-09 19:22:12 +00:00
|
|
|
'</body>',
|
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
|
|
|
'internal': {
|
|
|
|
'generated': 'wrapper'
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'alienInline',
|
|
|
|
'attributes': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'domElements': $( '<foobar>c</foobar>' ).toArray()
|
2013-06-26 21:18:39 +00:00
|
|
|
}
|
2013-05-09 19:22:12 +00:00
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
{ 'type': '/alienInline' },
|
2013-05-09 19:22:12 +00:00
|
|
|
' ',
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'alienInline',
|
|
|
|
'attributes': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'domElements': $( '<foobar>d</foobar>' ).toArray()
|
2013-06-26 21:18:39 +00:00
|
|
|
}
|
2013-05-09 19:22:12 +00:00
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
{ 'type': '/alienInline' },
|
2013-05-09 19:22:12 +00:00
|
|
|
'\n',
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'alienInline',
|
|
|
|
'attributes': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'domElements': $( '<foobar>e</foobar>' ).toArray()
|
2013-06-26 21:18:39 +00:00
|
|
|
}
|
2013-05-09 19:22:12 +00:00
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
{ 'type': '/alienInline' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-05-09 19:22:12 +00:00
|
|
|
]
|
|
|
|
},
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
'whitespace preservation in headings': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><h2>Foo</h2><h2> Bar</h2><h2>Baz </h2><h2> Quux </h2></body>',
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'heading', 'attributes': { 'level': 2 } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{ 'type': '/heading' },
|
|
|
|
{
|
|
|
|
'type': 'heading',
|
|
|
|
'attributes': { 'level': 2 },
|
2012-08-16 17:53:33 +00:00
|
|
|
'internal': { 'whitespace': [ undefined, ' ' ] }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
},
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'r',
|
|
|
|
{ 'type': '/heading' },
|
|
|
|
{
|
|
|
|
'type': 'heading',
|
|
|
|
'attributes': { 'level': 2 },
|
2012-08-16 17:53:33 +00:00
|
|
|
'internal': { 'whitespace': [ undefined, undefined, ' ' ] }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
},
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'z',
|
|
|
|
{ 'type': '/heading' },
|
|
|
|
{
|
|
|
|
'type': 'heading',
|
|
|
|
'attributes': { 'level': 2 },
|
2012-08-16 17:53:33 +00:00
|
|
|
'internal': { 'whitespace': [ undefined, ' ', ' ' ] }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
},
|
|
|
|
'Q',
|
|
|
|
'u',
|
|
|
|
'u',
|
|
|
|
'x',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/heading' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation in list items': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><ul><li>Foo</li><li> Bar</li><li>Baz </li><li> Quux </li></ul></body>',
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
2012-08-16 20:06:18 +00:00
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ undefined, ' ' ]} },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ ' ' ], 'generated': 'wrapper' } },
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'r',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ undefined, undefined, ' ' ] } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, undefined, undefined, ' ' ], 'generated': 'wrapper' } },
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'z',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ undefined, ' ', ' '] } },
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'internal': { 'whitespace': [ ' ', undefined, undefined, ' ' ], 'generated': 'wrapper' }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
},
|
|
|
|
'Q',
|
|
|
|
'u',
|
|
|
|
'u',
|
|
|
|
'x',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with annotations': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p> <i> Foo </i> </p></body>',
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
2012-08-16 17:53:33 +00:00
|
|
|
'internal': { 'whitespace': [ undefined, ' ', ' ' ] }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
},
|
2012-10-06 00:34:12 +00:00
|
|
|
[ ' ', [ ve.dm.example.italic ] ],
|
|
|
|
[ ' ', [ ve.dm.example.italic ] ],
|
|
|
|
[ 'F', [ ve.dm.example.italic ] ],
|
|
|
|
[ 'o', [ ve.dm.example.italic ] ],
|
|
|
|
[ 'o', [ ve.dm.example.italic ] ],
|
|
|
|
[ ' ', [ ve.dm.example.italic ] ],
|
|
|
|
[ ' ', [ ve.dm.example.italic ] ],
|
|
|
|
[ ' ', [ ve.dm.example.italic ] ],
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Strip and preserve inner leading&trailing whitespace in the linear model
This makes things like
== Foo ==
* Bar
render without the leading and trailing spaces, while still
round-tripping those spaces.
* Added a .fringeWhitespace property to the linear model and ve.dm.Node
** Object containing innerPre, innerPost, outerPre, outerPost
** Only inner* are used right now, outer* are planned for future use
** Like .attributes , it's suppressed if it's an empty object
* In getDataFromDom():
** Store the stripped whitespace in .fringeWhitespace
** Move emptiness check up: empty elements with .fringeWhitespace have
to be preserved
** Move paragraph wrapping up: .fringeWhitespace has to be applied to
the generated paragraph, not its parent
** Add wrapperElement to keep track of the element .fringeWhitespace has
to be added to; this is either dataElement or the generated paragraph
or nothing, but we can't modify dataElement because it's used later
* In getDomFromData():
** When processing an opening, store the fringeWhitespace data in the
generated DOM node
** When processing a closing, add the stored whitespace back in
* In the ve.dm.Document constructor, pass through .fringeWhitespace from
the linear model data to the generated nodes
Tests:
* Change one existing test case to account for this change
* Add three new test cases for this behavior
* Add normalizedHtml field so I can test behavior with bare content
Change-Id: I0411544652dd72b923c831c495d69ee4322a2c14
2012-08-10 21:09:04 +00:00
|
|
|
]
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
},
|
|
|
|
'outer whitespace preservation in a list with bare text and a wrapper paragraph': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body>\n<ul>\n\n<li>\n\n\nBa re\n\n\n\n</li>\n\n\n\n\n<li>\t<p>\t\tP\t\t\t</p>\t\t\t\t</li>\t\n</ul>\t\n\t\n</body>',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' }, 'internal': { 'whitespace': [ '\n', '\n\n', '\t\n', '\t\n\t\n' ] } },
|
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ '\n\n', '\n\n\n', '\n\n\n\n', '\n\n\n\n\n' ] } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper', 'whitespace': [ '\n\n\n', undefined, undefined, '\n\n\n\n' ] } },
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
' ',
|
|
|
|
'r',
|
|
|
|
'e',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ '\n\n\n\n\n', '\t', '\t\t\t\t', '\t\n' ] } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ '\t', '\t\t', '\t\t\t', '\t\t\t\t' ] } },
|
|
|
|
'P',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'outer whitespace preservation in a list with bare text and a sublist': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><ul>\n<li>\n\nBa re\n\n\n<ul>\n\n\n\n<li> <p> P </p> </li>\t</ul>\t\t</li>\t\t\t</ul></body>',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' }, 'internal': { 'whitespace': [ undefined, '\n', '\t\t\t' ] } },
|
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ '\n', '\n\n', '\t\t', '\t\t\t' ] } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper', 'whitespace': [ '\n\n', undefined, undefined, '\n\n\n' ] } },
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
' ',
|
|
|
|
'r',
|
|
|
|
'e',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' }, 'internal': { 'whitespace': [ '\n\n\n', '\n\n\n\n', '\t', '\t\t' ] } },
|
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ '\n\n\n\n', ' ', ' ', '\t' ] } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ ' ', ' ', ' ', ' '] } },
|
|
|
|
'P',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation leaves non-edge content whitespace alone': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p> A B <b> C\t</b>\t\tD\t\t\t</p>\nE\n\nF\n\n\n<b>\n\n\n\nG </b> H </body>',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, ' ', '\t\t\t', '\n' ] } },
|
|
|
|
'A',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
'B',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
' ',
|
2012-10-06 00:34:12 +00:00
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'C', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'\t',
|
|
|
|
'\t',
|
|
|
|
'D',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper', 'whitespace': [ '\n', undefined, undefined, ' ' ] } },
|
|
|
|
'E',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'F',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
2012-10-06 00:34:12 +00:00
|
|
|
[ '\n', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\n', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\n', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\n', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'G', [ ve.dm.example.bold ] ],
|
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
'H',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with non-edge content whitespace with nested annotations': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p> A B <b> C\t<i>\t\tD\t\t\t</i>\t\t\t\tE\n</b>\n\nF\n\n\n</p></body>',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, ' ', '\n\n\n' ] } },
|
|
|
|
'A',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
'B',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
' ',
|
2012-10-06 00:34:12 +00:00
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ ' ', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'C', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ 'D', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'E', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\n', [ ve.dm.example.bold ] ],
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'F',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with tightly nested annotations': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p> A B <b><i>\t\tC\t\t\t</i></b>\n\nD\n\n\n</p></body>',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, ' ', '\n\n\n' ] } },
|
|
|
|
'A',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
'B',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
' ',
|
2012-10-06 00:34:12 +00:00
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ 'C', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'D',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with nested annotations with whitespace on the left side': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p> A B <b>\n\t<i>\t\tC\t\t\t</i></b>\n\nD\n\n\n</p></body>',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, ' ', '\n\n\n' ] } },
|
|
|
|
'A',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
'B',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
' ',
|
2012-10-06 00:34:12 +00:00
|
|
|
[ '\n', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ 'C', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'D',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with nested annotations with whitespace on the right side': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><p> A B <b><i>\t\tC\t\t\t</i>\n\t</b>\n\nD\n\n\n</p></body>',
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ undefined, ' ', '\n\n\n' ] } },
|
|
|
|
'A',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
'B',
|
|
|
|
' ',
|
|
|
|
' ',
|
|
|
|
' ',
|
2012-10-06 00:34:12 +00:00
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ 'C', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold, ve.dm.example.italic ] ],
|
|
|
|
[ '\n', [ ve.dm.example.bold ] ],
|
|
|
|
[ '\t', [ ve.dm.example.bold ] ],
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'D',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
]
|
|
|
|
},
|
2012-09-07 21:58:27 +00:00
|
|
|
'whitespace preservation with aliens': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'html': '<body> <figure> <br> </figure> <p>\tFoo\t\t<foobar>\t\t\tBar\t\t\t\t</foobar>\nBaz\n\n<foobar>\n\n\nQuux\n\n\n\n</foobar> \tWhee \n</p>\t\n<figure>\n\tYay \t </figure> \n </body>',
|
2012-09-07 21:58:27 +00:00
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'alienBlock',
|
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'domElements': $( '<figure> <br> </figure>' ).toArray()
|
2012-09-07 21:58:27 +00:00
|
|
|
},
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [ ' ', undefined, undefined, ' ' ]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ ' ', '\t', ' \n', '\t\n' ] } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
'\t',
|
|
|
|
'\t',
|
2013-08-02 20:49:21 +00:00
|
|
|
{ 'type': 'alienInline', 'attributes': { 'domElements': $( '<foobar>\t\t\tBar\t\t\t\t</foobar>' ).toArray() } },
|
2012-09-07 21:58:27 +00:00
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
'\n',
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'z',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
|
|
|
'attributes': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'domElements': $( '<foobar>\n\n\nQuux\n\n\n\n</foobar>' ).toArray()
|
2012-09-07 21:58:27 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
' ',
|
|
|
|
'\t',
|
|
|
|
'W',
|
|
|
|
'h',
|
|
|
|
'e',
|
|
|
|
'e',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{
|
|
|
|
'type': 'alienBlock',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<figure>\n\tYay \t </figure>' ).toArray()
|
2012-09-07 21:58:27 +00:00
|
|
|
},
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [ '\t\n', undefined, undefined, ' \n ' ]
|
|
|
|
}
|
|
|
|
},
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-09-07 21:58:27 +00:00
|
|
|
]
|
|
|
|
},
|
2012-11-07 20:03:58 +00:00
|
|
|
'whitespace preservation not triggered inside <pre>': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body>\n<pre>\n\n\nFoo\n\n\nBar\n\n\n\n</pre>\n\n\n\n\n</body>',
|
2012-11-07 20:03:58 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'preformatted', 'internal': { 'whitespace': ['\n', undefined, undefined, '\n\n\n\n\n' ] } },
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'r',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
|
|
|
'\n',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/preformatted' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-04-18 01:46:50 +00:00
|
|
|
]
|
2012-11-07 20:03:58 +00:00
|
|
|
},
|
2013-04-18 00:08:47 +00:00
|
|
|
'whitespace preservation in table cell starting with text and ending with annotation': {
|
|
|
|
'html': '<body><table><tbody><tr><td>Foo <b>Bar</b></td></tr></tbody></table></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'table' },
|
|
|
|
{ 'type': 'tableSection', 'attributes': { 'style': 'body' } },
|
|
|
|
{ 'type': 'tableRow' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
' ',
|
|
|
|
[ 'B', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'a', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'r', [ ve.dm.example.bold ] ],
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': '/tableRow' },
|
|
|
|
{ 'type': '/tableSection' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-04-18 00:08:47 +00:00
|
|
|
]
|
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
'whitespace preservation with wrapped text and comments': {
|
|
|
|
'html': '<body><!-- Foo --> <!-- Bar -->\nFoo</body>',
|
2013-04-18 23:06:58 +00:00
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'internal': { 'whitespace': [ undefined, undefined, undefined, ' ' ] },
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- Foo -->' ).toArray()
|
2013-04-18 23:06:58 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'internal': { 'whitespace': [ ' ', undefined, undefined, '\n' ] },
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- Bar -->' ).toArray()
|
2013-04-18 23:06:58 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
|
|
|
'internal': {
|
|
|
|
'generated': 'wrapper',
|
2013-06-26 21:18:39 +00:00
|
|
|
'whitespace': [ '\n' ]
|
2013-04-18 23:06:58 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
{ 'type': '/paragraph' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-04-18 23:06:58 +00:00
|
|
|
]
|
|
|
|
},
|
2013-05-01 23:00:33 +00:00
|
|
|
'whitespace preservation with comments at end of wrapper paragraph': {
|
|
|
|
'html': '<body><ul><li> bar<!-- baz -->quux </li></ul></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{
|
|
|
|
'type': 'listItem',
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [
|
|
|
|
undefined,
|
|
|
|
' ',
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
|
|
|
'internal': {
|
|
|
|
'generated': 'wrapper',
|
|
|
|
'whitespace': [
|
|
|
|
' ',
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
'b', 'a', 'r',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- baz -->' ).toArray()
|
2013-05-01 23:00:33 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'q', 'u', 'u', 'x',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-05-01 23:00:33 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with comment at end of wrapper paragraph': {
|
|
|
|
'html': '<body><ul><li> bar<!-- baz --> </li></ul></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{
|
|
|
|
'type': 'listItem',
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [
|
|
|
|
undefined,
|
|
|
|
' ',
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
|
|
|
'internal': {
|
|
|
|
'generated': 'wrapper',
|
|
|
|
'whitespace': [
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
'b', 'a', 'r',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- baz -->' ).toArray()
|
2013-05-01 23:00:33 +00:00
|
|
|
},
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-05-01 23:00:33 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with multiple comments at end of wrapper paragraph': {
|
|
|
|
'html': '<body><ul><li> foo <!-- bar --> <!-- baz --> </li></ul></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{
|
|
|
|
'type': 'listItem',
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [
|
|
|
|
undefined,
|
|
|
|
' ',
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
|
|
|
'internal': {
|
|
|
|
'generated': 'wrapper',
|
|
|
|
'whitespace': [
|
|
|
|
' ',
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
'f', 'o', 'o',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- bar -->' ).toArray()
|
2013-05-01 23:00:33 +00:00
|
|
|
},
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [
|
|
|
|
' ',
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- baz -->' ).toArray()
|
2013-05-01 23:00:33 +00:00
|
|
|
},
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [
|
|
|
|
' ',
|
|
|
|
undefined,
|
|
|
|
undefined,
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-05-01 23:00:33 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with comment at start or end of element': {
|
|
|
|
'html': '<body><p> <!-- foo -->bar<!-- baz --> </p></body>',
|
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [
|
|
|
|
undefined,
|
|
|
|
' ',
|
|
|
|
' '
|
|
|
|
]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- foo -->' ).toArray()
|
2013-05-01 23:00:33 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'b', 'a', 'r',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<!-- baz -->' ).toArray()
|
2013-05-01 23:00:33 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-05-01 23:00:33 +00:00
|
|
|
]
|
|
|
|
},
|
2013-07-26 23:24:27 +00:00
|
|
|
'whitespace surrounding metadata in a wrapper': {
|
|
|
|
'html': '<body><b>Foo</b> <!-- comment -->\n<i>Bar</i></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
[ 'F', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'o', [ ve.dm.example.bold ] ],
|
|
|
|
[ 'o', [ ve.dm.example.bold ] ],
|
|
|
|
' ',
|
|
|
|
{
|
|
|
|
'type': 'alienMeta',
|
|
|
|
'attributes': {
|
|
|
|
'domElements': $( '<!-- comment -->' ).toArray()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienMeta' },
|
|
|
|
'\n',
|
|
|
|
[ 'B', [ ve.dm.example.italic ] ],
|
|
|
|
[ 'a', [ ve.dm.example.italic ] ],
|
|
|
|
[ 'r', [ ve.dm.example.italic ] ],
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
2013-06-30 07:29:38 +00:00
|
|
|
'whitespace preservation in empty branch node': {
|
|
|
|
'html': '<body><table>\n\n</table></body>',
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'table', 'internal': { 'whitespace': [ undefined, '\n\n' ] } },
|
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
]
|
|
|
|
},
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
'mismatching whitespace data is ignored': {
|
|
|
|
'data': [
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' }, 'internal': { 'whitespace': [ ' ', ' ', ' ', ' ' ] } },
|
|
|
|
{ 'type': 'listItem', 'internal': { 'whitespace': [ ' ', ' ', ' ', ' ' ] } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ ' ', '\t', '\n', ' ' ] } },
|
|
|
|
'A',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'whitespace': [ ' ' ] } },
|
|
|
|
'B',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
Preserve whitespace between elements
This commit fully utilizes all four positions in the internal.whitespace
array. Outer whitespace is now preserved as well, and is duplicated
either in the adjacent sibling (one node's outerPost is the next
sibling's outerPre) or in the parent (a branch node's innerPre is its
first child's outerPre, and its innerPost is its last child's
outerPost). Before restoring saved whitespace, we check that these two
agree with each other, and if they disagree we assume the user has been
moving stuff around and don't restore any whitespace in that spot. The
whitespace at the very beginning and the very end of the document (i.e.
the first node's outerPre and the last node's outerPost) isn't
duplicated anywhere, nor is inner whitespace in content nodes.
The basic outline of the implementation is:
* When we encounter whitespace, strip it and store it in the previous
node's outerPost. Also store it in nextWhitespace so we can put it in
the next node's outerPre once we encounter that node.
* When we encounter whitespace in wrapped bare text, we don't know in
advance if it's gonna be succeeded by more non-whitespace (in which
case it needs to be output verbatim), or not (in which case it's
leading whitespace and needs to be stripped and stored). The fact that
annotations are nodes in HTML makes this trickier. So we write the
whitespace to the temporary linmod and store it in wrappedWhitespace,
then if it turns out to be trailing whitespace we take it back out of
the data array and record it the usual way.
* Because text nodes can contain any combination of leading whitespace
actual text and trailing whitespace, and because we may or may not
already have opened a wrapping paragraph, there are a lot of different
combinations to handle. We handle all of them but the resulting code
is pretty dense and verbose.
More low-level list of changes:
In getDataFromDom():
* Added helper function addWhitespace() for storing whitespace for an
element
* Added helper function processNextWhitespace() for processing any
whitespace passed on from the previous node via the nextWhitespace var
* Rename paragraph to wrappingParagraph. Make wrapping default to
alreadyWrapped so we can simplify wrapping||alreadyWrapped and
!wrapping&&!alreadyWrapped. Add wrappingIsOurs to track whether the
wrapping originated in this recursion level (needed for deciding when
to close the wrapper).
* Add prevElement to track the previous element so we can propagate
whitespace to it, and nextWhitespace so we can propagate whitespace to
the next element.
* Remove previous newline stripping hacks
* Integrate the logic for wrapping bare content with the outer
whitespace preservation code
* Remove wrapperElement, no longer needed because we have a dedicated
variable for the wrapping paragraph now and what was previously inner
whitespace preservation for wrapper paragraphs is now covered by the
outer whitespace preservation code.
In getDomFromData():
* Reinsert whitespace where appropriate
** outerPre is inserted when opening the element
** This covers outerPost as well except for the last child's outerPost,
which is handled as the parent's innerPost when closing the parent.
** innerPre and innerPost are inserted when closing the element. Care is
taken not to insert these if they're duplicates of something else.
* Propagate each node's outerPost to the next node (either the next
sibling or the parent) using parentDomElement.lastOuterPost. We can't
get this using .lastChild because we will have destroyed that child's
.veInternal by then, and we can't tell whether a node will be its
parent's last child when we process it (all other processing,
including first child handling is done when processing the node itself,
but this cannot be).
* Special handling is needed for the last node's outerPost, which ends
up in the container's .lastOuterPost property.
Tests:
* Allow .html to be null in data<->DOM converter tests. This indicates
that the test is a one-way data->DOM test, not a DOM->data->DOM
round-trip test. The data will be converted to HTML and checked
against .normalizedHtml
* Update existing tests as needed
* Add tests for outer whitespace preservation and storage
* Add test for squashing of whitespace in case of disagreement (this
requires .html=null)
Change-Id: I4db4fe372a421182e80a2535657af7784ff15f95
2012-08-21 00:37:42 +00:00
|
|
|
],
|
2013-02-11 19:46:58 +00:00
|
|
|
'normalizedHtml': '<body> <ul><li><p>\tA\n</p> <p>B</p></li></ul> </body>'
|
2012-08-31 19:22:40 +00:00
|
|
|
},
|
|
|
|
'order of nested annotations is preserved': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'html': '<body><p><b><u><i>Foo</i></u></b></p></body>',
|
2012-08-31 19:22:40 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
[
|
|
|
|
'F',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.bold,
|
2013-06-26 21:18:39 +00:00
|
|
|
ve.dm.example.underline,
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'o',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.bold,
|
2013-06-26 21:18:39 +00:00
|
|
|
ve.dm.example.underline,
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic
|
2013-06-26 21:18:39 +00:00
|
|
|
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'o',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.bold,
|
2013-06-26 21:18:39 +00:00
|
|
|
ve.dm.example.underline,
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic
|
2013-06-26 21:18:39 +00:00
|
|
|
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'nested annotations are closed and reopened in the correct order': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'html': '<body><p><a href="Foo">F<b>o<i>o</i></b><i>b</i></a><i>a<b>r</b>b<u>a</u>z</i></p></body>',
|
2012-08-31 19:22:40 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
[
|
|
|
|
'F',
|
|
|
|
[
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'link',
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-06-14 06:17:08 +00:00
|
|
|
} } ]
|
2012-08-31 19:22:40 +00:00
|
|
|
}
|
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'o',
|
|
|
|
[
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'link',
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-06-14 06:17:08 +00:00
|
|
|
} } ]
|
2012-08-31 19:22:40 +00:00
|
|
|
},
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.bold
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'o',
|
|
|
|
[
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'link',
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-06-14 06:17:08 +00:00
|
|
|
} } ]
|
2012-08-31 19:22:40 +00:00
|
|
|
},
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.bold,
|
|
|
|
ve.dm.example.italic
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'b',
|
|
|
|
[
|
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'link',
|
Great Annotation Refactor of 2013
This changes the annotation API to be the same as the node API, sans
a few boolean flags that don't apply. The APIs were different, but
there was really no good reason why, so this makes things simpler for
API users. It also means we'll be able to factor a bunch of things out
because they're now duplicated between nodes, meta items and annotations.
Linear model annotations are now objects with 'type' and 'attributes'
properties (rather than 'name' and 'data'), for consistency with elements.
They now also contain html/0/* attributes for HTML attribute preservation,
which obsoletes the htmlTagName and htmlAttributes properties.
dm.Annotation subclasses take a reference to such an object and implement
conversion using .static.toDataElement and .static.toDomElements just
like nodes do. The custom .getHash() functions are no longer necessary
because of the way HTML attribute preservation was reimplemented.
CE rendering has been moved out of dm.Annotation (it never made sense to
have CE rendering functions in DM classes, this was bothering me) and into
separate ce.Annotation subclasses. These are very similar to CE nodes in
that they have a this.$ generated based on something in the DM; the main
difference is that nodes listen to events and update themselves, whereas
annotations are static and are simply destroyed and rebuilt when they
change. This change also adds whitelisted HTML attribute rendering for
annotations, as well as class="ve-ce-FooAnnotation" attributes.
Now that annotation classes produce real DOM nodes rather than weird
objects describing HTML tags, we can't generate HTML as a string in
ce.ContentBranchNode anymore. getRenderedContents() has been rewritten
to be much more similar to the way the converter renders annotations;
in fact, significant parts of it were copied from the converter, so that
should be factored out in the future. This change actually fixes an
annotation rendering discrepancy between ce.ContentBranchNode and
dm.Converter; see the diff of ve.ce.ContentBranchNode.test.js.
ve.ce.MWEntityNode.js:
* Remove stray property
ve.dm.MWExternalLinkAnnotation.js:
* Store 'rel' attribute
ve.dm.TextStyleAnnotation.js:
* Put all the conversion logic in the abstract base class
ve.dm.Converter.js:
* Also feed annotations through getDomElementsFromDataElement() and
createDataElement()
ve.dm.Node.js:
* Fix undocumented property
ve.ce.ContentBranchNode.test.js:
* Add descriptive messages for each test case
* Compare DOM trees, not HTML strings
* Compare without all the class="ve-ce-WhateverAnnotation" clutter
ve.ui.LinkInspector.js:
* Replace direct .getHash() calls (evil!) with ve.getHash()
Bug: 46464
Bug: 44808
Change-Id: I31991488579b8cce6d98ed8b29b486ba5ec38cdc
2013-04-02 17:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'href': 'Foo'
|
2013-06-14 06:17:08 +00:00
|
|
|
} } ]
|
2012-08-31 19:22:40 +00:00
|
|
|
},
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'a',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'r',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic,
|
|
|
|
ve.dm.example.bold
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'b',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'a',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic,
|
|
|
|
ve.dm.example.underline
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'z',
|
|
|
|
[
|
2012-10-06 00:34:12 +00:00
|
|
|
ve.dm.example.italic
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
|
|
|
],
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-08-31 19:22:40 +00:00
|
|
|
]
|
2012-09-06 21:07:39 +00:00
|
|
|
},
|
2012-11-08 02:03:05 +00:00
|
|
|
'about grouping': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'html': '<body><figure about="#mwt1">Foo</figure>' +
|
|
|
|
'<figure about="#mwt1">Bar</figure>' +
|
|
|
|
'<figure about="#mwt2">Baz</figure>' +
|
2013-08-02 20:49:21 +00:00
|
|
|
'<foobar about="#mwt2">Quux</foobar>' +
|
2013-06-26 21:18:39 +00:00
|
|
|
'<p>Whee</p>' +
|
2013-08-02 20:49:21 +00:00
|
|
|
'<foobar about="#mwt2">Yay</foobar>' +
|
2013-06-26 21:18:39 +00:00
|
|
|
'<figure about="#mwt2">Blah</figure>' +
|
2013-08-02 20:49:21 +00:00
|
|
|
'<foobar about="#mwt3">Meh</foobar></body>',
|
2012-11-08 02:03:05 +00:00
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'alienBlock',
|
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'domElements': $( '<figure about="#mwt1">Foo</figure>' +
|
|
|
|
'<figure about="#mwt1">Bar</figure>' ).toArray()
|
2012-11-08 02:03:05 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
{
|
|
|
|
'type': 'alienBlock',
|
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'domElements': $( '<figure about="#mwt2">Baz</figure>' +
|
2013-08-02 20:49:21 +00:00
|
|
|
'<foobar about="#mwt2">Quux</foobar>' ).toArray()
|
2012-11-08 02:03:05 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'W',
|
|
|
|
'h',
|
|
|
|
'e',
|
|
|
|
'e',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{
|
|
|
|
'type': 'alienBlock',
|
|
|
|
'attributes': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'domElements': $( '<foobar about="#mwt2">Yay</foobar>' +
|
2013-06-26 21:18:39 +00:00
|
|
|
'<figure about="#mwt2">Blah</figure>' ).toArray()
|
2012-11-08 02:03:05 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{ 'type': '/alienBlock' },
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2012-11-08 02:03:05 +00:00
|
|
|
{
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
'type': 'alienInline',
|
2012-11-08 02:03:05 +00:00
|
|
|
'attributes': {
|
2013-08-02 20:49:21 +00:00
|
|
|
'domElements': $( '<foobar about="#mwt3">Meh</foobar>' ).toArray()
|
2012-11-08 02:03:05 +00:00
|
|
|
}
|
|
|
|
},
|
(bug 43056) Inline tags like <span> are block-alienated sometimes
This happens when the <span> is the start of unwrapped content. The
converter logic to look at the tag name in wrapping mode doesn't kick in
because we're not yet in wrapping mode at that point.
The core issue was that previously, we relied on the document
structure/state to choose between alienBlock and alienInline, and only
used the tag name where the document structure was ambiguous (wrapping).
Changed this to be the other way around: we now rely primarily on the
tag name, and if that doesn't match what we expect based on the document
structure, we work around that if possible. Specifically:
* inline tag in our wrapper --> inline alien
* block tag in our wrapper --> close wrapper, block alien
* inline tag in wrapper that's not ours --> inline alien
* block tag in wrapper that's not ours --> *inline* alien
* inline tag in structural location --> open wrapper, inline alien
* block tag in structural location --> block alien
* inline tag in content location --> inline alien
* block tag in content location --> *inline* alien
only in the fourth and the last case do we need to use the "wrong" alien type to
preserve document validity, and it will always be inline where block was
expected, which should reduce UI issues.
The condensed version of the above, which is used in the code, is:
* If in a non-wrapper content location, use inline
* If in a wrapper that's not ours, use inline
* Otherwise, decide based on tag name
* Open or close wrapper if needed
ve.dm.Converter:
* Replace isInline logic in createAlien() with the above
* Factor out code to start wrapping (was duplicated) into startWrapping()
* Call startWrapping() if createAlien() returns an alienInline and we're
in a structural location
Tests:
* Add test cases with aliens at the start and end of unwrapped content
** The first one failed prior to these changes and now passes, the
second one was already passing
* Fix about group test case, was exhibiting the bug that this commit fixes
Change-Id: I657aa0ff5bc2b57cd48ef8a99c8ca930936c03b8
2012-12-20 00:59:58 +00:00
|
|
|
{ 'type': '/alienInline' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-08 02:03:05 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'whitespace preservation with an about group': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'html': '<body> <figure about="#mwt1">\tFoo\t\t</figure>\t\t\t' +
|
|
|
|
'<figure about="#mwt1"> Bar </figure> </body>',
|
2012-11-08 02:03:05 +00:00
|
|
|
'data': [
|
|
|
|
{
|
|
|
|
'type': 'alienBlock',
|
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'domElements': $( '<figure about="#mwt1">\tFoo\t\t</figure>\t\t\t' +
|
|
|
|
'<figure about="#mwt1"> Bar </figure>' ).toArray()
|
2012-11-08 02:03:05 +00:00
|
|
|
},
|
|
|
|
'internal': {
|
|
|
|
'whitespace': [ ' ', undefined, undefined, ' ' ]
|
|
|
|
}
|
|
|
|
},
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/alienBlock' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-11-08 02:03:05 +00:00
|
|
|
]
|
2012-11-20 23:37:06 +00:00
|
|
|
},
|
2012-12-05 22:35:10 +00:00
|
|
|
'block node inside annotation node is alienated': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><span>\n<p>Bar</p></span></body>',
|
2012-12-05 22:35:10 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
[ '\n', [ ve.dm.example.span ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<p>Bar</p>' ).toArray()
|
2012-12-05 22:35:10 +00:00
|
|
|
},
|
|
|
|
'annotations': [ ve.dm.example.span ]
|
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-12-05 22:35:10 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'block node inside annotation node surrounded by tables': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body><table></table><span>\n<p>Bar</p></span><table></table></body>',
|
2012-12-05 22:35:10 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'table' },
|
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
[ '\n', [ ve.dm.example.span ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<p>Bar</p>' ).toArray()
|
2012-12-05 22:35:10 +00:00
|
|
|
},
|
|
|
|
'annotations': [ ve.dm.example.span ]
|
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'table' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-12-05 22:35:10 +00:00
|
|
|
]
|
|
|
|
},
|
|
|
|
'block node inside annotation node is alienated and continues wrapping': {
|
2013-02-11 19:46:58 +00:00
|
|
|
'html': '<body>Foo<span>\n<p>Bar</p></span>Baz</body>',
|
2012-12-05 22:35:10 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
|
|
|
[ '\n', [ ve.dm.example.span ] ],
|
|
|
|
{
|
|
|
|
'type': 'alienInline',
|
|
|
|
'attributes': {
|
2013-06-22 01:03:59 +00:00
|
|
|
'domElements': $( '<p>Bar</p>' ).toArray()
|
2012-12-05 22:35:10 +00:00
|
|
|
},
|
|
|
|
'annotations': [ ve.dm.example.span ]
|
|
|
|
},
|
|
|
|
{ 'type': '/alienInline' },
|
|
|
|
'B',
|
|
|
|
'a',
|
|
|
|
'z',
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-12-05 22:35:10 +00:00
|
|
|
]
|
2012-12-11 18:23:33 +00:00
|
|
|
},
|
|
|
|
'whitespace before meta node in wrapping mode': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'html': '<body><table><tbody><tr><td>Foo\n<meta content="bar" /></td></tr></tbody></table></body>',
|
2012-12-11 18:23:33 +00:00
|
|
|
'data': [
|
|
|
|
{ 'type': 'table' },
|
|
|
|
{ 'type': 'tableSection', 'attributes': { 'style': 'body' } },
|
|
|
|
{ 'type': 'tableRow' },
|
|
|
|
{
|
|
|
|
'type': 'tableCell',
|
|
|
|
'attributes': { 'style': 'data' },
|
|
|
|
'internal': { 'whitespace': [ undefined, undefined, '\n' ] }
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'type': 'paragraph',
|
|
|
|
'internal': {
|
|
|
|
'generated': 'wrapper',
|
|
|
|
'whitespace': [ undefined, undefined, undefined, '\n' ]
|
|
|
|
}
|
|
|
|
},
|
|
|
|
'F',
|
|
|
|
'o',
|
|
|
|
'o',
|
2013-04-18 23:06:58 +00:00
|
|
|
{ 'type': '/paragraph' },
|
2012-12-11 18:23:33 +00:00
|
|
|
{
|
2013-06-26 21:18:39 +00:00
|
|
|
'type': 'alienMeta',
|
2013-04-18 23:06:58 +00:00
|
|
|
'internal': { 'whitespace': [ '\n' ] },
|
2012-12-11 18:23:33 +00:00
|
|
|
'attributes': {
|
2013-06-26 21:18:39 +00:00
|
|
|
'domElements': $( '<meta content="bar" />' ).toArray()
|
2013-06-05 17:22:01 +00:00
|
|
|
}
|
2012-12-11 18:23:33 +00:00
|
|
|
},
|
2013-06-26 21:18:39 +00:00
|
|
|
{ 'type': '/alienMeta' },
|
2012-12-11 18:23:33 +00:00
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': '/tableRow' },
|
|
|
|
{ 'type': '/tableSection' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2012-12-11 18:23:33 +00:00
|
|
|
]
|
2013-04-25 22:24:37 +00:00
|
|
|
},
|
|
|
|
'table with caption, head, foot and body': {
|
|
|
|
'html': ve.dm.example.complexTableHtml,
|
|
|
|
'data': ve.dm.example.complexTable
|
2013-04-29 14:33:37 +00:00
|
|
|
},
|
2013-05-01 01:32:06 +00:00
|
|
|
'div set to RTL with paragraph inside': {
|
|
|
|
'html': '<body><div style="direction: rtl;"><p>a<b>b</b>c<i>d</i>e</p></body>',
|
|
|
|
'data': [
|
2013-05-18 03:49:25 +00:00
|
|
|
{
|
|
|
|
'type': 'div',
|
2013-06-14 06:17:08 +00:00
|
|
|
'htmlAttributes': [ { 'values': { 'style': 'direction: rtl;' } } ]
|
2013-05-18 03:49:25 +00:00
|
|
|
},
|
2013-05-01 01:32:06 +00:00
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'a',
|
|
|
|
['b', [ ve.dm.example.bold ]],
|
|
|
|
'c',
|
|
|
|
['d', [ ve.dm.example.italic ]],
|
|
|
|
'e',
|
|
|
|
{ 'type': '/paragraph' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/div' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
2013-05-01 01:32:06 +00:00
|
|
|
]
|
2012-08-10 23:49:14 +00:00
|
|
|
}
|
2012-06-08 05:00:25 +00:00
|
|
|
};
|
2013-02-21 01:30:02 +00:00
|
|
|
|
2013-05-28 11:49:35 +00:00
|
|
|
ve.dm.example.isolationHtml =
|
2013-02-21 01:30:02 +00:00
|
|
|
'<ul><li>Item 1</li><li>Item 2</li><li>Item 3</li></ul>' +
|
|
|
|
'Paragraph' +
|
|
|
|
'<ul><li>Item 4</li><li>Item 5</li><li>Item 6</li></ul>' +
|
|
|
|
'<table><tbody><tr><td>Cell 1</td><td>Cell 2</td><td>Cell 3</td></tr><tr><td>Cell 4</td></tr></tbody></table>' +
|
|
|
|
'Not allowed by dm:' +
|
2013-03-01 01:20:59 +00:00
|
|
|
'<ul><li><h1>Title in list</h1></li><li><pre>Preformatted in list</pre></li></ul>' +
|
|
|
|
'<ul><li><ol><li>Nested 1</li><li>Nested 2</li><li>Nested 3</li></ol></li></ul>' +
|
|
|
|
'<ul><li><p>P1</p><p>P2</p><p>P3</p></li></ul>';
|
2013-02-21 01:30:02 +00:00
|
|
|
|
|
|
|
ve.dm.example.isolationData = [
|
2013-05-12 19:47:29 +00:00
|
|
|
// 0
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'I', 't', 'e', 'm', ' ', '1',
|
|
|
|
{ 'type': '/paragraph' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 10
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'I', 't', 'e', 'm', ' ', '2',
|
|
|
|
{ 'type': '/paragraph' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 20
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'I', 't', 'e', 'm', ' ', '3',
|
|
|
|
{ 'type': '/paragraph' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 30
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'P', 'a', 'r', 'a', 'g', 'r', 'a',
|
|
|
|
// 40
|
|
|
|
'p', 'h',
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'I', 't', 'e', 'm',
|
|
|
|
// 50
|
|
|
|
' ', '4',
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'I', 't', 'e', 'm',
|
|
|
|
// 60
|
|
|
|
' ', '5',
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'I', 't', 'e', 'm',
|
|
|
|
// 70
|
|
|
|
' ', '6',
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'table' },
|
|
|
|
{ 'type': 'tableSection', 'attributes': { 'style': 'body' } },
|
|
|
|
{ 'type': 'tableRow' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 80
|
2013-02-21 01:30:02 +00:00
|
|
|
'C', 'e', 'l', 'l', ' ', '1',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 90
|
2013-02-21 01:30:02 +00:00
|
|
|
'C', 'e', 'l', 'l', ' ', '2',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 100
|
2013-02-21 01:30:02 +00:00
|
|
|
'C', 'e', 'l', 'l', ' ', '3',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
|
|
|
{ 'type': '/tableRow' },
|
|
|
|
{ 'type': 'tableRow' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 110
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': 'tableCell', 'attributes': { 'style': 'data' } },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'C', 'e', 'l', 'l', ' ', '4',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/tableCell' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 120
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/tableRow' },
|
|
|
|
{ 'type': '/tableSection' },
|
|
|
|
{ 'type': '/table' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'N', 'o', 't', ' ', 'a', 'l',
|
|
|
|
// 130
|
|
|
|
'l', 'o', 'w', 'e', 'd', ' ', 'b', 'y', ' ', 'd',
|
|
|
|
// 140
|
|
|
|
'm', ':',
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'heading', 'attributes': { 'level': 1 } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'T', 'i', 't', 'l',
|
|
|
|
// 150
|
|
|
|
'e', ' ', 'i', 'n', ' ', 'l', 'i', 's', 't',
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/heading' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 160
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'preformatted' },
|
2013-05-12 19:47:29 +00:00
|
|
|
'P', 'r', 'e', 'f', 'o', 'r', 'm',
|
|
|
|
// 170
|
|
|
|
'a', 't', 't', 'e', 'd', ' ', 'i', 'n', ' ', 'l',
|
|
|
|
// 180
|
|
|
|
'i', 's', 't',
|
2013-02-21 01:30:02 +00:00
|
|
|
{ 'type': '/preformatted' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-03-01 01:20:59 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'number' } },
|
|
|
|
{ 'type': 'listItem' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 190
|
2013-03-01 01:20:59 +00:00
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
|
|
|
'N', 'e', 's', 't', 'e', 'd', ' ', '1',
|
|
|
|
{ 'type': '/paragraph' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 200
|
2013-03-01 01:20:59 +00:00
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'N', 'e', 's', 't', 'e', 'd', ' ',
|
|
|
|
// 210
|
|
|
|
'2',
|
2013-03-01 01:20:59 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': 'listItem' },
|
|
|
|
{ 'type': 'paragraph', 'internal': { 'generated': 'wrapper' } },
|
2013-05-12 19:47:29 +00:00
|
|
|
'N', 'e', 's', 't', 'e',
|
|
|
|
// 220
|
|
|
|
'd', ' ', '3',
|
2013-03-01 01:20:59 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': '/listItem' },
|
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'list', 'attributes': { 'style': 'bullet' } },
|
|
|
|
{ 'type': 'listItem' },
|
2013-05-12 19:47:29 +00:00
|
|
|
// 230
|
2013-03-01 01:20:59 +00:00
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'P', '1',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'paragraph' },
|
|
|
|
'P', '2',
|
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': 'paragraph' },
|
2013-05-12 19:47:29 +00:00
|
|
|
'P',
|
|
|
|
// 240
|
|
|
|
'3',
|
2013-03-01 01:20:59 +00:00
|
|
|
{ 'type': '/paragraph' },
|
|
|
|
{ 'type': '/listItem' },
|
2013-06-10 23:05:42 +00:00
|
|
|
{ 'type': '/list' },
|
|
|
|
{ 'type': 'internalList' },
|
|
|
|
{ 'type': '/internalList' }
|
|
|
|
// 246
|
2013-02-22 23:26:18 +00:00
|
|
|
];
|
2013-06-07 16:58:34 +00:00
|
|
|
|
2013-06-14 00:29:32 +00:00
|
|
|
ve.dm.example.selectNodesCases = [
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 1 ),
|
|
|
|
'mode': 'branches',
|
|
|
|
'expected': [
|
|
|
|
// heading
|
|
|
|
{
|
|
|
|
'node': [ 0 ],
|
|
|
|
'range': new ve.Range( 1 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 5 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
}
|
|
|
|
]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 10 ),
|
|
|
|
'mode': 'branches',
|
|
|
|
'expected': [
|
|
|
|
// table/tableSection/tableRow/tableCell/paragraph
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 0 ],
|
|
|
|
'range': new ve.Range( 10 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 10, 11 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 9, 12 ),
|
|
|
|
'parentOuterRange': new ve.Range( 8, 34 )
|
|
|
|
}
|
|
|
|
]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 20 ),
|
|
|
|
'mode': 'branches',
|
|
|
|
'expected': [
|
|
|
|
// table/tableSection/tableRow/tableCell/list/listItem/list/listItem/paragraph
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 1, 0, 1, 0, 0 ],
|
|
|
|
'range': new ve.Range( 20 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 20, 21 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 19, 22 ),
|
|
|
|
'parentOuterRange': new ve.Range( 18, 23 )
|
|
|
|
}
|
|
|
|
]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 1, 20 ),
|
|
|
|
'mode': 'branches',
|
|
|
|
'expected': [
|
|
|
|
// heading
|
|
|
|
{
|
|
|
|
'node': [ 0 ],
|
|
|
|
'range': new ve.Range( 1, 4 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 5 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
|
|
|
|
// table/tableSection/tableRow/tableCell/paragraph
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 0 ],
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 10, 11 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 9, 12 ),
|
|
|
|
'parentOuterRange': new ve.Range( 8, 34 )
|
|
|
|
},
|
|
|
|
|
|
|
|
// table/tableSection/tableRow/tableCell/list/listItem/paragraph
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 1, 0, 0 ],
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 15, 16 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 14, 17 ),
|
|
|
|
'parentOuterRange': new ve.Range( 13, 25 )
|
|
|
|
},
|
|
|
|
|
|
|
|
// table/tableSection/tableRow/tableCell/list/listItem/list/listItem/paragraph
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 1, 0, 1, 0, 0 ],
|
|
|
|
'range': new ve.Range( 20 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 20, 21 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 19, 22 ),
|
|
|
|
'parentOuterRange': new ve.Range( 18, 23 )
|
|
|
|
}
|
|
|
|
]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 1 ),
|
|
|
|
'mode': 'branches',
|
|
|
|
'expected': [
|
|
|
|
// heading
|
|
|
|
{
|
|
|
|
'node': [ 0 ],
|
|
|
|
'range': new ve.Range( 1 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 5 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
}
|
|
|
|
]
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 0, 3 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// heading/text
|
|
|
|
{
|
|
|
|
'node': [ 0, 0 ],
|
|
|
|
'range': new ve.Range( 1, 3 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 1, 4 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 5 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'partial leaf results have ranges with global offsets'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 0, 11 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// heading/text
|
|
|
|
{
|
|
|
|
'node': [ 0, 0 ],
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 1, 4 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 5 )
|
|
|
|
},
|
|
|
|
// table/tableSection/tableRow/tableCell/paragraph/text
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 0, 0 ],
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 10, 11 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 10, 11 ),
|
|
|
|
'parentOuterRange': new ve.Range( 9, 12 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'leaf nodes do not have ranges, leaf nodes from different levels'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 29, 43 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// table/tableSection/tableRow/tableCell/list/listItem/paragraph/text
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 2, 0, 0, 0 ],
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 29, 30 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 29, 30 ),
|
|
|
|
'parentOuterRange': new ve.Range( 28, 31 )
|
|
|
|
},
|
|
|
|
// preformatted/text
|
|
|
|
{
|
|
|
|
'node': [ 2, 0 ],
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 38, 39 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 38, 39 ),
|
|
|
|
'parentOuterRange': new ve.Range( 37, 43 )
|
|
|
|
},
|
|
|
|
// preformatted/image
|
|
|
|
{
|
|
|
|
'node': [ 2, 1 ],
|
|
|
|
'index': 1,
|
|
|
|
'nodeRange': new ve.Range( 40, 40 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 39, 41 ),
|
|
|
|
'parentOuterRange': new ve.Range( 37, 43 )
|
|
|
|
},
|
|
|
|
// preformatted/text
|
|
|
|
{
|
|
|
|
'node': [ 2, 2 ],
|
|
|
|
'index': 2,
|
|
|
|
'nodeRange': new ve.Range( 41, 42 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 41, 42 ),
|
|
|
|
'parentOuterRange': new ve.Range( 37, 43 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'leaf nodes that are not text nodes'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 2, 16 ),
|
|
|
|
'mode': 'siblings',
|
|
|
|
'expected': [
|
|
|
|
// heading
|
|
|
|
{
|
|
|
|
'node': [ 0 ],
|
|
|
|
'range': new ve.Range( 2, 4 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 5 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
// table
|
|
|
|
{
|
|
|
|
'node': [ 1 ],
|
|
|
|
'range': new ve.Range( 6, 16 ),
|
|
|
|
'index': 1,
|
|
|
|
'nodeRange': new ve.Range( 6, 36 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 5, 37 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'siblings at the document level'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 2, 51 ),
|
|
|
|
'mode': 'siblings',
|
|
|
|
'expected': [
|
|
|
|
// heading
|
|
|
|
{
|
|
|
|
'node': [ 0 ],
|
|
|
|
'range': new ve.Range( 2, 4 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 5 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
// table
|
|
|
|
{
|
|
|
|
'node': [ 1 ],
|
|
|
|
'index': 1,
|
|
|
|
'nodeRange': new ve.Range( 6, 36 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 5, 37 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
// preformatted
|
|
|
|
{
|
|
|
|
'node': [ 2 ],
|
|
|
|
'index': 2,
|
|
|
|
'nodeRange': new ve.Range( 38, 42 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 37, 43 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
// definitionList
|
|
|
|
{
|
|
|
|
'node': [ 3 ],
|
|
|
|
'range': new ve.Range( 44, 51 ),
|
|
|
|
'index': 3,
|
|
|
|
'nodeRange': new ve.Range( 44, 54 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 43, 55 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'more than 2 siblings at the document level'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 1, 1 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// heading/text
|
|
|
|
{
|
|
|
|
'node': [ 0, 0 ],
|
|
|
|
'range': new ve.Range( 1, 1 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 1, 4 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 5 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'zero-length range at the start of a text node returns text node rather than parent'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 4, 4 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// heading/text
|
|
|
|
{
|
|
|
|
'node': [ 0, 0 ],
|
|
|
|
'range': new ve.Range( 4, 4 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 1, 4 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 5 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'zero-length range at the end of a text node returns text node rather than parent'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 2, 3 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// heading/text
|
|
|
|
{
|
|
|
|
'node': [ 0, 0 ],
|
|
|
|
'range': new ve.Range( 2, 3 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 1, 4 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 5 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'range entirely within one leaf node'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 5, 5 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// document
|
|
|
|
{
|
|
|
|
'node': [],
|
|
|
|
'range': new ve.Range( 5, 5 ),
|
|
|
|
// no 'index' because documentNode has no parent
|
|
|
|
'indexInNode': 1,
|
|
|
|
'nodeRange': new ve.Range( 0, 63 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 63 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'zero-length range between two children of the document'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 0, 0 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// document
|
|
|
|
{
|
|
|
|
'node': [],
|
|
|
|
'range': new ve.Range( 0, 0 ),
|
|
|
|
// no 'index' because documentNode has no parent
|
|
|
|
'indexInNode': 0,
|
|
|
|
'nodeRange': new ve.Range( 0, 63 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 63 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'zero-length range at the start of the document'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 32, 39 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// table/tableSection/tableRow/tableCell/list
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 2 ],
|
|
|
|
'range': new ve.Range( 32, 32 ),
|
|
|
|
'index': 2,
|
|
|
|
'indexInNode': 1,
|
|
|
|
'nodeRange': new ve.Range( 27, 32 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 26, 33 )
|
|
|
|
},
|
|
|
|
// preformatted/text
|
|
|
|
{
|
|
|
|
'node': [ 2, 0 ],
|
|
|
|
// no 'range' because the text node is covered completely
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 38, 39 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 38, 39 ),
|
|
|
|
'parentOuterRange': new ve.Range( 37, 43 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'range with 5 closings and a text node'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 2, 57 ),
|
|
|
|
'mode': 'covered',
|
|
|
|
'expected': [
|
|
|
|
// heading/text
|
|
|
|
{
|
|
|
|
'node': [ 0, 0 ],
|
|
|
|
'range': new ve.Range( 2, 4 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 4 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 1, 4 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 5 )
|
|
|
|
},
|
|
|
|
// table
|
|
|
|
{
|
|
|
|
'node': [ 1 ],
|
|
|
|
// no 'range' because the table is covered completely
|
|
|
|
'index': 1,
|
|
|
|
'nodeRange': new ve.Range( 6, 36 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 5, 37 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
// preformatted
|
|
|
|
{
|
|
|
|
'node': [ 2 ],
|
|
|
|
// no 'range' because the node is covered completely
|
|
|
|
'index': 2,
|
|
|
|
'nodeRange': new ve.Range( 38, 42 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 37, 43 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
// definitionList
|
|
|
|
{
|
|
|
|
'node': [ 3 ],
|
|
|
|
// no 'range' because the node is covered completely
|
|
|
|
'index': 3,
|
|
|
|
'nodeRange': new ve.Range( 44, 54 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 43, 55 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 63 )
|
|
|
|
},
|
|
|
|
// paragraph/text
|
|
|
|
{
|
|
|
|
'node': [ 4, 0 ],
|
|
|
|
// no 'range' because the text node is covered completely
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 56, 57 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 56, 57 ),
|
|
|
|
'parentOuterRange': new ve.Range( 55, 58 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'range from the first heading into the second-to-last paragraph, in covered mode'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 14, 14 ),
|
|
|
|
'mode': 'siblings',
|
|
|
|
'expected': [
|
|
|
|
// table/tableSection/tableRow/tableCell/list/listItem
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 1, 0 ],
|
|
|
|
'range': new ve.Range( 14, 14 ),
|
|
|
|
'index': 0,
|
|
|
|
'indexInNode': 0,
|
|
|
|
'nodeRange': new ve.Range( 14, 24 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 13, 25 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'zero-length range at the beginning of a listItem, in siblings mode'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 25, 27 ),
|
|
|
|
'mode': 'covered',
|
|
|
|
'expected': [
|
|
|
|
// table/tableSection/tableRow/tableCell/list
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 1 ],
|
|
|
|
'range': new ve.Range( 25, 25 ),
|
|
|
|
'index': 1,
|
|
|
|
'indexInNode': 1,
|
|
|
|
'nodeRange': new ve.Range( 13, 25 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 12, 26 )
|
|
|
|
},
|
|
|
|
// table/tableSection/tableRow/tableCell/list
|
|
|
|
{
|
|
|
|
'node': [ 1, 0, 0, 0, 2 ],
|
|
|
|
'range': new ve.Range( 27, 27 ),
|
|
|
|
'index': 2,
|
|
|
|
'indexInNode': 0,
|
|
|
|
'nodeRange': new ve.Range( 27, 32 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 26, 33 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'range covering a list closing and a list opening'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 39, 39 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// preformatted/text
|
|
|
|
{
|
|
|
|
'node': [ 2, 0 ],
|
|
|
|
'range': new ve.Range( 39, 39 ),
|
|
|
|
'index': 0,
|
|
|
|
'nodeRange': new ve.Range( 38, 39 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 38, 39 ),
|
|
|
|
'parentOuterRange': new ve.Range( 37, 43 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'zero-length range in text node before inline node'
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'range': new ve.Range( 41, 41 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// preformatted/text
|
|
|
|
{
|
|
|
|
'node': [ 2, 2 ],
|
|
|
|
'range': new ve.Range( 41, 41 ),
|
|
|
|
'index': 2,
|
|
|
|
'nodeRange': new ve.Range( 41, 42 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 41, 42 ),
|
|
|
|
'parentOuterRange': new ve.Range( 37, 43 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'zero-length range in text node after inline node'
|
2013-06-14 01:19:39 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
'doc': 'emptyBranch',
|
|
|
|
'range': new ve.Range( 1 ),
|
|
|
|
'mode': 'leaves',
|
|
|
|
'expected': [
|
|
|
|
// table
|
|
|
|
{
|
|
|
|
'node': [ 0 ],
|
|
|
|
'range': new ve.Range( 1, 1 ),
|
|
|
|
'index': 0,
|
|
|
|
'indexInNode': 0,
|
|
|
|
'nodeRange': new ve.Range( 1, 1 ),
|
|
|
|
'nodeOuterRange': new ve.Range( 0, 2 ),
|
|
|
|
'parentOuterRange': new ve.Range( 0, 2 )
|
|
|
|
}
|
|
|
|
],
|
|
|
|
'msg': 'Zero-length range in empty branch node'
|
2013-06-14 00:29:32 +00:00
|
|
|
}
|
|
|
|
];
|