Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154421
Change subject: Rename 'image' to 'inlineImage'
......................................................................
Rename 'image' to 'inlineImage'
Makes room for blockImage and makes it consistent with MW images.
Change-Id: Icf94e498ad9be06a7d187e45cc0368773b9c5678
---
M .docs/eg-iframe.html
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
R src/ce/nodes/ve.ce.InlineImageNode.js
R src/dm/nodes/ve.dm.InlineImageNode.js
M tests/dm/lineardata/ve.dm.ElementLinearData.test.js
M tests/dm/lineardata/ve.dm.FlatLinearData.test.js
M tests/dm/ve.dm.Document.test.js
M tests/dm/ve.dm.Transaction.test.js
M tests/dm/ve.dm.TransactionProcessor.test.js
M tests/dm/ve.dm.example.js
M tests/index.html
13 files changed, 66 insertions(+), 66 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/21/154421/1
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 3dae30d..2e57b36 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -22,7 +22,7 @@
<link rel=stylesheet
href="../src/ce/styles/nodes/ve.ce.CommentNode.css">
<link rel=stylesheet
href="../src/ce/styles/nodes/ve.ce.DocumentNode.css">
<link rel=stylesheet
href="../src/ce/styles/nodes/ve.ce.GeneratedContentNode.css">
- <link rel=stylesheet
href="../src/ce/styles/nodes/ve.ce.ImageNode.css">
+ <link rel=stylesheet
href="../src/ce/styles/nodes/ve.ce.InlineImageNode.css">
<link rel=stylesheet
href="../src/ce/styles/annotations/ve.ce.LanguageAnnotation.css">
<link rel=stylesheet
href="../src/ce/styles/nodes/ve.ce.ResizableNode.css">
<link rel=stylesheet
href="../src/ce/styles/nodes/ve.ce.TableCellNode.css">
@@ -163,7 +163,7 @@
<script src="../src/dm/nodes/ve.dm.DivNode.js"></script>
<script src="../src/dm/nodes/ve.dm.DocumentNode.js"></script>
<script src="../src/dm/nodes/ve.dm.HeadingNode.js"></script>
- <script src="../src/dm/nodes/ve.dm.ImageNode.js"></script>
+ <script src="../src/dm/nodes/ve.dm.InlineImageNode.js"></script>
<script
src="../src/dm/nodes/ve.dm.InternalItemNode.js"></script>
<script
src="../src/dm/nodes/ve.dm.InternalListNode.js"></script>
<script src="../src/dm/nodes/ve.dm.ListItemNode.js"></script>
@@ -225,7 +225,7 @@
<script src="../src/ce/nodes/ve.ce.DivNode.js"></script>
<script src="../src/ce/nodes/ve.ce.DocumentNode.js"></script>
<script src="../src/ce/nodes/ve.ce.HeadingNode.js"></script>
- <script src="../src/ce/nodes/ve.ce.ImageNode.js"></script>
+ <script src="../src/ce/nodes/ve.ce.InlineImageNode.js"></script>
<script
src="../src/ce/nodes/ve.ce.InternalItemNode.js"></script>
<script
src="../src/ce/nodes/ve.ce.InternalListNode.js"></script>
<script src="../src/ce/nodes/ve.ce.ListItemNode.js"></script>
diff --git a/build/modules.json b/build/modules.json
index 4209ff7..f5df92c 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -184,7 +184,7 @@
"src/dm/nodes/ve.dm.DivNode.js",
"src/dm/nodes/ve.dm.DocumentNode.js",
"src/dm/nodes/ve.dm.HeadingNode.js",
- "src/dm/nodes/ve.dm.ImageNode.js",
+ "src/dm/nodes/ve.dm.InlineImageNode.js",
"src/dm/nodes/ve.dm.InternalItemNode.js",
"src/dm/nodes/ve.dm.InternalListNode.js",
"src/dm/nodes/ve.dm.ListItemNode.js",
@@ -246,7 +246,7 @@
"src/ce/nodes/ve.ce.DivNode.js",
"src/ce/nodes/ve.ce.DocumentNode.js",
"src/ce/nodes/ve.ce.HeadingNode.js",
- "src/ce/nodes/ve.ce.ImageNode.js",
+ "src/ce/nodes/ve.ce.InlineImageNode.js",
"src/ce/nodes/ve.ce.InternalItemNode.js",
"src/ce/nodes/ve.ce.InternalListNode.js",
"src/ce/nodes/ve.ce.ListItemNode.js",
@@ -342,7 +342,7 @@
"src/ce/styles/nodes/ve.ce.CommentNode.css",
"src/ce/styles/nodes/ve.ce.DocumentNode.css",
"src/ce/styles/nodes/ve.ce.GeneratedContentNode.css",
- "src/ce/styles/nodes/ve.ce.ImageNode.css",
+ "src/ce/styles/nodes/ve.ce.InlineImageNode.css",
"src/ce/styles/annotations/ve.ce.LanguageAnnotation.css",
"src/ce/styles/nodes/ve.ce.ResizableNode.css",
"src/ce/styles/nodes/ve.ce.TableCellNode.css",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index c5eb5ae..a70491f 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -32,7 +32,7 @@
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.CommentNode.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.DocumentNode.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.GeneratedContentNode.css">
- <link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.ImageNode.css">
+ <link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.InlineImageNode.css">
<link rel=stylesheet
href="../../src/ce/styles/annotations/ve.ce.LanguageAnnotation.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.ResizableNode.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.TableCellNode.css">
@@ -175,7 +175,7 @@
<script src="../../src/dm/nodes/ve.dm.DivNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.DocumentNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.HeadingNode.js"></script>
- <script src="../../src/dm/nodes/ve.dm.ImageNode.js"></script>
+ <script
src="../../src/dm/nodes/ve.dm.InlineImageNode.js"></script>
<script
src="../../src/dm/nodes/ve.dm.InternalItemNode.js"></script>
<script
src="../../src/dm/nodes/ve.dm.InternalListNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.ListItemNode.js"></script>
@@ -237,7 +237,7 @@
<script src="../../src/ce/nodes/ve.ce.DivNode.js"></script>
<script src="../../src/ce/nodes/ve.ce.DocumentNode.js"></script>
<script src="../../src/ce/nodes/ve.ce.HeadingNode.js"></script>
- <script src="../../src/ce/nodes/ve.ce.ImageNode.js"></script>
+ <script
src="../../src/ce/nodes/ve.ce.InlineImageNode.js"></script>
<script
src="../../src/ce/nodes/ve.ce.InternalItemNode.js"></script>
<script
src="../../src/ce/nodes/ve.ce.InternalListNode.js"></script>
<script src="../../src/ce/nodes/ve.ce.ListItemNode.js"></script>
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 6c34df9..6064922 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -32,7 +32,7 @@
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.CommentNode.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.DocumentNode.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.GeneratedContentNode.css">
- <link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.ImageNode.css">
+ <link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.InlineImageNode.css">
<link rel=stylesheet
href="../../src/ce/styles/annotations/ve.ce.LanguageAnnotation.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.ResizableNode.css">
<link rel=stylesheet
href="../../src/ce/styles/nodes/ve.ce.TableCellNode.css">
@@ -176,7 +176,7 @@
<script src="../../src/dm/nodes/ve.dm.DivNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.DocumentNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.HeadingNode.js"></script>
- <script src="../../src/dm/nodes/ve.dm.ImageNode.js"></script>
+ <script
src="../../src/dm/nodes/ve.dm.InlineImageNode.js"></script>
<script
src="../../src/dm/nodes/ve.dm.InternalItemNode.js"></script>
<script
src="../../src/dm/nodes/ve.dm.InternalListNode.js"></script>
<script src="../../src/dm/nodes/ve.dm.ListItemNode.js"></script>
@@ -238,7 +238,7 @@
<script src="../../src/ce/nodes/ve.ce.DivNode.js"></script>
<script src="../../src/ce/nodes/ve.ce.DocumentNode.js"></script>
<script src="../../src/ce/nodes/ve.ce.HeadingNode.js"></script>
- <script src="../../src/ce/nodes/ve.ce.ImageNode.js"></script>
+ <script
src="../../src/ce/nodes/ve.ce.InlineImageNode.js"></script>
<script
src="../../src/ce/nodes/ve.ce.InternalItemNode.js"></script>
<script
src="../../src/ce/nodes/ve.ce.InternalListNode.js"></script>
<script src="../../src/ce/nodes/ve.ce.ListItemNode.js"></script>
diff --git a/src/ce/nodes/ve.ce.ImageNode.js
b/src/ce/nodes/ve.ce.InlineImageNode.js
similarity index 77%
rename from src/ce/nodes/ve.ce.ImageNode.js
rename to src/ce/nodes/ve.ce.InlineImageNode.js
index 0e71329..1c8d4ca 100644
--- a/src/ce/nodes/ve.ce.ImageNode.js
+++ b/src/ce/nodes/ve.ce.InlineImageNode.js
@@ -14,10 +14,10 @@
* @mixins ve.ce.ResizableNode
*
* @constructor
- * @param {ve.dm.ImageNode} model Model to observe
+ * @param {ve.dm.InlineImageNode} model Model to observe
* @param {Object} [config] Configuration options
*/
-ve.ce.ImageNode = function VeCeImageNode( model, config ) {
+ve.ce.InlineImageNode = function VeCeImageNode( model, config ) {
config = ve.extendObject( {
minDimensions: { width: 1, height: 1 }
}, config );
@@ -51,16 +51,16 @@
/* Inheritance */
-OO.inheritClass( ve.ce.ImageNode, ve.ce.LeafNode );
+OO.inheritClass( ve.ce.InlineImageNode, ve.ce.LeafNode );
-OO.mixinClass( ve.ce.ImageNode, ve.ce.FocusableNode );
-OO.mixinClass( ve.ce.ImageNode, ve.ce.ResizableNode );
+OO.mixinClass( ve.ce.InlineImageNode, ve.ce.FocusableNode );
+OO.mixinClass( ve.ce.InlineImageNode, ve.ce.ResizableNode );
/* Static Properties */
-ve.ce.ImageNode.static.name = 'image';
+ve.ce.InlineImageNode.static.name = 'inlineImage';
-ve.ce.ImageNode.static.tagName = 'img';
+ve.ce.InlineImageNode.static.tagName = 'img';
/* Methods */
@@ -72,7 +72,7 @@
* @param {string} from Old value
* @param {string} to New value
*/
-ve.ce.ImageNode.prototype.onAttributeChange = function ( key, from, to ) {
+ve.ce.InlineImageNode.prototype.onAttributeChange = function ( key, from, to )
{
if ( key === 'src' ) {
this.$element.attr( 'src', this.getResolvedAttribute( 'src' ) );
}
@@ -87,7 +87,7 @@
* @method
* @param {jQuery.Event} e Click event
*/
-ve.ce.ImageNode.prototype.onClick = function ( e ) {
+ve.ce.InlineImageNode.prototype.onClick = function ( e ) {
var surfaceModel = this.getRoot().getSurface().getModel(),
selectionRange = surfaceModel.getSelection(),
nodeRange = this.model.getOuterRange();
@@ -107,7 +107,7 @@
* @method
* @param {jQuery.Event} e Load event
*/
-ve.ce.ImageNode.prototype.onLoad = function () {
+ve.ce.InlineImageNode.prototype.onLoad = function () {
this.setOriginalDimensions( {
width: this.$element.prop( 'naturalWidth' ),
height: this.$element.prop( 'naturalHeight' )
@@ -116,4 +116,4 @@
/* Registration */
-ve.ce.nodeFactory.register( ve.ce.ImageNode );
+ve.ce.nodeFactory.register( ve.ce.InlineImageNode );
diff --git a/src/dm/nodes/ve.dm.ImageNode.js
b/src/dm/nodes/ve.dm.InlineImageNode.js
similarity index 69%
rename from src/dm/nodes/ve.dm.ImageNode.js
rename to src/dm/nodes/ve.dm.InlineImageNode.js
index 6a64ce1..cbd7f35 100644
--- a/src/dm/nodes/ve.dm.ImageNode.js
+++ b/src/dm/nodes/ve.dm.InlineImageNode.js
@@ -15,7 +15,7 @@
* @constructor
* @param {Object} [element] Reference to element in linear model
*/
-ve.dm.ImageNode = function VeDmImageNode() {
+ve.dm.InlineImageNode = function VeDmImageNode() {
// Parent constructor
ve.dm.LeafNode.apply( this, arguments );
@@ -25,19 +25,19 @@
/* Inheritance */
-OO.inheritClass( ve.dm.ImageNode, ve.dm.LeafNode );
+OO.inheritClass( ve.dm.InlineImageNode, ve.dm.LeafNode );
-OO.mixinClass( ve.dm.ImageNode, ve.dm.ResizableNode );
+OO.mixinClass( ve.dm.InlineImageNode, ve.dm.ResizableNode );
/* Static Properties */
-ve.dm.ImageNode.static.name = 'image';
+ve.dm.InlineImageNode.static.name = 'inlineImage';
-ve.dm.ImageNode.static.isContent = true;
+ve.dm.InlineImageNode.static.isContent = true;
-ve.dm.ImageNode.static.matchTagNames = [ 'img' ];
+ve.dm.InlineImageNode.static.matchTagNames = [ 'img' ];
-ve.dm.ImageNode.static.toDataElement = function ( domElements ) {
+ve.dm.InlineImageNode.static.toDataElement = function ( domElements ) {
var $node = $( domElements[0] ),
alt = $node.attr( 'alt' ),
width = $node.attr( 'width' ),
@@ -54,7 +54,7 @@
};
};
-ve.dm.ImageNode.static.toDomElements = function ( dataElement, doc ) {
+ve.dm.InlineImageNode.static.toDomElements = function ( dataElement, doc ) {
var domElement = doc.createElement( 'img' );
ve.setDomAttributes( domElement, dataElement.attributes, [ 'alt',
'src', 'width', 'height' ] );
return [ domElement ];
@@ -63,7 +63,7 @@
/**
* @inheritdoc
*/
-ve.dm.ImageNode.prototype.createScalable = function () {
+ve.dm.InlineImageNode.prototype.createScalable = function () {
return new ve.dm.Scalable( {
currentDimensions: {
width: this.getAttribute( 'width' ),
@@ -78,4 +78,4 @@
/* Registration */
-ve.dm.modelRegistry.register( ve.dm.ImageNode );
+ve.dm.modelRegistry.register( ve.dm.InlineImageNode );
diff --git a/tests/dm/lineardata/ve.dm.ElementLinearData.test.js
b/tests/dm/lineardata/ve.dm.ElementLinearData.test.js
index a3a09d9..592bebd 100644
--- a/tests/dm/lineardata/ve.dm.ElementLinearData.test.js
+++ b/tests/dm/lineardata/ve.dm.ElementLinearData.test.js
@@ -260,8 +260,8 @@
msg: 'no common coverage due to un-annotated
content node',
data: [
['a', [ { type: 'textStyle/bold' } ] ],
- { type: 'image' },
- { type: '/image' }
+ { type: 'inlineImage' },
+ { type: '/inlineImage' }
],
expected: []
},
@@ -419,12 +419,12 @@
['o', [ { type: 'textStyle/bold' } ]],
// 3
{
- type: 'image',
+ type: 'inlineImage',
attributes: { src:
ve.dm.example.imgSrc },
annotations: [ { type:
'textStyle/bold' }]
},
// 4
- { type: '/image' },
+ { type: '/inlineImage' },
// 5
['l', [ { type: 'textStyle/bold' } ]],
// 6
@@ -560,16 +560,16 @@
data = new ve.dm.ElementLinearData( new
ve.dm.IndexValueStore(), [
{ type: 'heading' },
'a',
- { type: 'image' },
- { type: '/image' },
+ { type: 'inlineImage' },
+ { type: '/inlineImage' },
'b',
'c',
{ type: '/heading' },
{ type: 'paragraph' },
{ type: '/paragraph' },
{ type: 'preformatted' },
- { type: 'image' },
- { type: '/image' },
+ { type: 'inlineImage' },
+ { type: '/inlineImage' },
{ type: '/preformatted' },
{ type: 'list' },
{ type: 'listItem' },
@@ -633,16 +633,16 @@
data = new ve.dm.ElementLinearData( new
ve.dm.IndexValueStore(), [
{ type: 'heading' },
'a',
- { type: 'image' },
- { type: '/image' },
+ { type: 'inlineImage' },
+ { type: '/inlineImage' },
'b',
'c',
{ type: '/heading' },
{ type: 'paragraph' },
{ type: '/paragraph' },
{ type: 'preformatted' },
- { type: 'image' },
- { type: '/image' },
+ { type: 'inlineImage' },
+ { type: '/inlineImage' },
{ type: '/preformatted' },
{ type: 'list' },
{ type: 'listItem' },
@@ -726,7 +726,7 @@
},
{
msg: 'non-text leaf',
- data: ['a', { type: 'image' }, { type: '/image'
}, 'c'],
+ data: ['a', { type: 'inlineImage' }, { type:
'/inlineImage' }, 'c'],
expected: true
}
];
@@ -1374,7 +1374,7 @@
{ type: 'internalList' },
{ type: '/internalList' }
],
- rules: { blacklist: ['alienInline', 'image'] },
+ rules: { blacklist: ['alienInline',
'inlineImage'] },
msg: 'Blacklisted nodes removed'
},
{
diff --git a/tests/dm/lineardata/ve.dm.FlatLinearData.test.js
b/tests/dm/lineardata/ve.dm.FlatLinearData.test.js
index e3a721a..1957fa3 100644
--- a/tests/dm/lineardata/ve.dm.FlatLinearData.test.js
+++ b/tests/dm/lineardata/ve.dm.FlatLinearData.test.js
@@ -33,16 +33,16 @@
data = new ve.dm.FlatLinearData( new ve.dm.IndexValueStore(), [
{ type: 'heading' },
'a',
- { type: 'image' },
- { type: '/image' },
+ { type: 'inlineImage' },
+ { type: '/inlineImage' },
'b',
'c',
{ type: '/heading' },
{ type: 'paragraph' },
{ type: '/paragraph' },
{ type: 'preformatted' },
- { type: 'image' },
- { type: '/image' },
+ { type: 'inlineImage' },
+ { type: '/inlineImage' },
{ type: '/preformatted' },
{ type: 'list' },
{ type: 'listItem' },
@@ -99,7 +99,7 @@
},
{
msg: 'non-text leaf',
- data: ['a', { type: 'image' }, { type: '/image'
}, 'c'],
+ data: ['a', { type: 'inlineImage' }, { type:
'/inlineImage' }, 'c'],
expected: true
}
];
diff --git a/tests/dm/ve.dm.Document.test.js b/tests/dm/ve.dm.Document.test.js
index 8a4bc43..bea259b 100644
--- a/tests/dm/ve.dm.Document.test.js
+++ b/tests/dm/ve.dm.Document.test.js
@@ -447,7 +447,7 @@
range: new ve.Range( 1, 3 ),
expected: [
ve.dm.example.image.data,
- { type: '/image' }
+ { type: '/inlineImage' }
],
originalRange: new ve.Range( 0, 2 ),
balancedRange: new ve.Range( 0, 2 )
@@ -469,7 +469,7 @@
range: new ve.Range( 1, 5 ),
expected: [
ve.dm.example.image.data,
- { type: '/image' },
+ { type: '/inlineImage' },
'F', 'o'
],
originalRange: new ve.Range( 0, 4 ),
diff --git a/tests/dm/ve.dm.Transaction.test.js
b/tests/dm/ve.dm.Transaction.test.js
index 006b944..4891c0d 100644
--- a/tests/dm/ve.dm.Transaction.test.js
+++ b/tests/dm/ve.dm.Transaction.test.js
@@ -481,7 +481,7 @@
remove: [
'h',
ve.dm.example.image.data,
- { type: '/image' },
+ { type: '/inlineImage'
},
'i'
],
insert: []
diff --git a/tests/dm/ve.dm.TransactionProcessor.test.js
b/tests/dm/ve.dm.TransactionProcessor.test.js
index fc3715f..b8a684f 100644
--- a/tests/dm/ve.dm.TransactionProcessor.test.js
+++ b/tests/dm/ve.dm.TransactionProcessor.test.js
@@ -262,10 +262,10 @@
'inserting mixed content': {
calls: [
['pushRetain', 1],
- ['pushReplace', 1, 1, ['F', 'O', 'O', {
type: 'image' }, { type: '/image' }, 'B', 'A', 'R']]
+ ['pushReplace', 1, 1, ['F', 'O', 'O', {
type: 'inlineImage' }, { type: '/inlineImage' }, 'B', 'A', 'R']]
],
expected: function ( data ) {
- data.splice( 1, 1, 'F', 'O', 'O', {
type: 'image' }, { type: '/image' }, 'B', 'A', 'R' );
+ data.splice( 1, 1, 'F', 'O', 'O', {
type: 'inlineImage' }, { type: '/inlineImage' }, 'B', 'A', 'R' );
}
},
'converting an element': {
diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index 01df682..abad751 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -176,7 +176,7 @@
ve.dm.example.image = {
html: '<img src="' + ve.dm.example.imgSrc + '" alt="Example"
width="100" height="50">',
data: {
- type: 'image',
+ type: 'inlineImage',
attributes: {
src: ve.dm.example.imgSrc,
alt: 'Example',
@@ -339,7 +339,7 @@
// 39 - Beginning of inline image
ve.dm.example.image.data,
// 40 - End of inline image
- { type: '/image' },
+ { type: '/inlineImage' },
// 41 - Plain "i"
'i',
// 42 - End of preformatted
@@ -807,7 +807,7 @@
// 1
ve.dm.example.image.data,
// 2
- { type: '/image' },
+ { type: '/inlineImage' },
// 3
'F', 'o', 'o',
// 6
@@ -892,7 +892,7 @@
// Preformatted with "h[example.png]i"
new ve.dm.PreformattedNode( ve.dm.example.data[37], [
new ve.dm.TextNode( 1 ),
- new ve.dm.ImageNode( ve.dm.example.data[39] ),
+ new ve.dm.InlineImageNode( ve.dm.example.data[39] ),
new ve.dm.TextNode( 1 )
] ),
new ve.dm.DefinitionListNode( ve.dm.example.data[43], [
@@ -949,7 +949,7 @@
},
image: {
domElement: ve.dm.example.createDomElement( 'img' ),
- dataElement: { type: 'image' }
+ dataElement: { type: 'inlineImage' }
},
listItem: {
domElement: ve.dm.example.createDomElement( 'li' ),
@@ -1091,7 +1091,7 @@
data: [
{ type: 'paragraph', internal: { generated: 'wrapper' }
},
ve.dm.example.image.data,
- { type: '/image' },
+ { type: '/inlineImage' },
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
@@ -1310,7 +1310,7 @@
data: [
{ type: 'paragraph', internal: { generated: 'wrapper' }
},
ve.dm.example.image.data,
- { type: '/image' },
+ { type: '/inlineImage' },
'1',
'2',
{ type: '/paragraph' },
diff --git a/tests/index.html b/tests/index.html
index 7cc46d0..c2a0152 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -123,7 +123,7 @@
<script src="../src/dm/nodes/ve.dm.DivNode.js"></script>
<script src="../src/dm/nodes/ve.dm.DocumentNode.js"></script>
<script src="../src/dm/nodes/ve.dm.HeadingNode.js"></script>
- <script src="../src/dm/nodes/ve.dm.ImageNode.js"></script>
+ <script src="../src/dm/nodes/ve.dm.InlineImageNode.js"></script>
<script
src="../src/dm/nodes/ve.dm.InternalItemNode.js"></script>
<script
src="../src/dm/nodes/ve.dm.InternalListNode.js"></script>
<script src="../src/dm/nodes/ve.dm.ListItemNode.js"></script>
@@ -185,7 +185,7 @@
<script src="../src/ce/nodes/ve.ce.DivNode.js"></script>
<script src="../src/ce/nodes/ve.ce.DocumentNode.js"></script>
<script src="../src/ce/nodes/ve.ce.HeadingNode.js"></script>
- <script src="../src/ce/nodes/ve.ce.ImageNode.js"></script>
+ <script src="../src/ce/nodes/ve.ce.InlineImageNode.js"></script>
<script
src="../src/ce/nodes/ve.ce.InternalItemNode.js"></script>
<script
src="../src/ce/nodes/ve.ce.InternalListNode.js"></script>
<script src="../src/ce/nodes/ve.ce.ListItemNode.js"></script>
--
To view, visit https://gerrit.wikimedia.org/r/154421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf94e498ad9be06a7d187e45cc0368773b9c5678
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
