[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Unwrap Parsoid sections

2017-11-23 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386690 )

Change subject: Unwrap Parsoid sections
..


Unwrap Parsoid sections

Section wrapping will be introduced in I0f4c19f7.

Change-Id: I43ced131d07a20318af37e830318e30db2eb451f
---
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ve.MWutils.js
2 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 3663177..682e786 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -196,6 +196,8 @@
} else {
// Parsoid documents are XHTML so we can use parseXhtml which 
fixed some IE issues.
doc = ve.parseXhtml( documentString );
+   // Strip Parsoid sections
+   ve.unwrapParsoidSections( doc.body );
}
// Fix relative or missing base URL if needed
this.fixBase( doc );
diff --git a/modules/ve-mw/ve.MWutils.js b/modules/ve-mw/ve.MWutils.js
index 2699892..40d239e 100644
--- a/modules/ve-mw/ve.MWutils.js
+++ b/modules/ve-mw/ve.MWutils.js
@@ -29,3 +29,18 @@
}
return s.replace( /_/g, ' ' );
 };
+
+/**
+ * Unwrap Parsoid sections
+ *
+ * @param {HTMLElement} element Parent element, e.g. document body
+ */
+ve.unwrapParsoidSections = function ( element ) {
+   Array.prototype.forEach.call( element.querySelectorAll( 
'section[data-mw-section-id]' ), function ( section ) {
+   var parent = section.parentNode;
+   while ( section.firstChild ) {
+   parent.insertBefore( section.firstChild, section );
+   }
+   parent.removeChild( section );
+   } );
+};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ced131d07a20318af37e830318e30db2eb451f
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Unwrap Parsoid sections

2017-10-26 Thread Esanders (Code Review)
Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386690 )

Change subject: Unwrap Parsoid sections
..

Unwrap Parsoid sections

Secion wrapping will be introduced in I0f4c19f7.

Change-Id: I43ced131d07a20318af37e830318e30db2eb451f
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 08d17f2..cb20b15 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -199,6 +199,14 @@
} else {
// Parsoid documents are XHTML so we can use parseXhtml which 
fixed some IE issues.
doc = ve.parseXhtml( documentString );
+   // Strip Parsoid sections
+   Array.prototype.forEach.call( doc.querySelectorAll( 
'section[data-section-number]' ), function ( element ) {
+   var parent = element.parentNode;
+   while ( element.firstChild ) {
+   parent.insertBefore( element.firstChild, 
element );
+   }
+   parent.removeChild( element );
+   } );
}
// Fix relative or missing base URL if needed
this.fixBase( doc );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43ced131d07a20318af37e830318e30db2eb451f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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