[MediaWiki-commits] [Gerrit] Fix exception thrown by converter when data ends in text - change (mediawiki...VisualEditor)

2013-09-20 Thread Esanders (Code Review) 
Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/85210


Change subject: Fix exception thrown by converter when data ends in text
..

Fix exception thrown by converter when data ends in text

Conversions usually end in a close tag so this hans't been a problem
before, but the mini-conversion we do in onCopy may not be balanced.

Change-Id: Ia2db29f116ca84ee886b4c5cafd4ac45cd926b79
---
M modules/ve/dm/ve.dm.Converter.js
1 file changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/10/85210/1

diff --git a/modules/ve/dm/ve.dm.Converter.js b/modules/ve/dm/ve.dm.Converter.js
index 9c3639b..e2b1169 100644
--- a/modules/ve/dm/ve.dm.Converter.js
+++ b/modules/ve/dm/ve.dm.Converter.js
@@ -1183,11 +1183,13 @@
annotatedDomElements = [];
annotatedDomElementStack = [ annotatedDomElements ];
while (
-   ve.isArray( data[i] ) ||
-   (
-   data[i].annotations !== undefined  (
-   this.metaItemFactory.lookup( 
data[i].type ) ||
-   this.nodeFactory.isNodeContent( 
data[i].type )
+   data[i] !== undefined  (
+   ve.isArray( data[i] ) ||
+   (
+   data[i].annotations !== 
undefined  (
+   
this.metaItemFactory.lookup( data[i].type ) ||
+   
this.nodeFactory.isNodeContent( data[i].type )
+   )
)
)
) {

-- 
To view, visit https://gerrit.wikimedia.org/r/85210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2db29f116ca84ee886b4c5cafd4ac45cd926b79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/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

[MediaWiki-commits] [Gerrit] Fix exception thrown by converter when data ends in text - change (mediawiki...VisualEditor)

2013-09-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix exception thrown by converter when data ends in text
..


Fix exception thrown by converter when data ends in text

Conversions usually end in a close tag so this hasn't been a problem
before, but the mini-conversion we do in onCopy may not be balanced.

Change-Id: Ia2db29f116ca84ee886b4c5cafd4ac45cd926b79
---
M modules/ve/dm/ve.dm.Converter.js
1 file changed, 7 insertions(+), 5 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/dm/ve.dm.Converter.js b/modules/ve/dm/ve.dm.Converter.js
index 9c3639b..e2b1169 100644
--- a/modules/ve/dm/ve.dm.Converter.js
+++ b/modules/ve/dm/ve.dm.Converter.js
@@ -1183,11 +1183,13 @@
annotatedDomElements = [];
annotatedDomElementStack = [ annotatedDomElements ];
while (
-   ve.isArray( data[i] ) ||
-   (
-   data[i].annotations !== undefined  (
-   this.metaItemFactory.lookup( 
data[i].type ) ||
-   this.nodeFactory.isNodeContent( 
data[i].type )
+   data[i] !== undefined  (
+   ve.isArray( data[i] ) ||
+   (
+   data[i].annotations !== 
undefined  (
+   
this.metaItemFactory.lookup( data[i].type ) ||
+   
this.nodeFactory.isNodeContent( data[i].type )
+   )
)
)
) {

-- 
To view, visit https://gerrit.wikimedia.org/r/85210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2db29f116ca84ee886b4c5cafd4ac45cd926b79
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits