[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Add and [srcset] to DOMPurify exceptions

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

Change subject: Add  and [srcset] to DOMPurify exceptions
..


Add  and [srcset] to DOMPurify exceptions

Change-Id: I680430540542f5fa7cdae923ed5faecacf928bc5
---
M src/dm/ve.dm.Change.js
1 file changed, 11 insertions(+), 4 deletions(-)

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



diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index cf41931..5400321 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -131,16 +131,23 @@
 };
 
 ve.dm.Change.static.deserializeValue = function ( serialized ) {
-   var rdfaAttrs;
+   var addTags, addAttrs;
if ( serialized.type === 'annotation' ) {
return ve.dm.annotationFactory.createFromElement( 
serialized.value );
} else if ( serialized.type === 'domNodeArray' ) {
-   rdfaAttrs = [ 'about', 'rel', 'resource', 'property', 
'content', 'datatype', 'typeof' ];
+   // TODO: Move MW-specific rules to ve-mw
+   addTags = [ 'figure-inline' ];
+   addAttrs = [
+   'srcset',
+   // RDFa
+   'about', 'rel', 'resource', 'property', 'content', 
'datatype', 'typeof'
+   ];
 
return serialized.value.map( function ( nodeHtml ) {
return DOMPurify.sanitize( $.parseHTML( nodeHtml )[ 0 
], {
-   ADD_ATTR: rdfaAttrs,
-   ADD_URI_SAFE_ATTR: rdfaAttrs,
+   ADD_TAGS: addTags,
+   ADD_ATTR: addAttrs,
+   ADD_URI_SAFE_ATTR: addAttrs,
FORBID_TAGS: [ 'style' ],
RETURN_DOM_FRAGMENT: true
} ).childNodes[ 0 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I680430540542f5fa7cdae923ed5faecacf928bc5
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Add and [srcset] to DOMPurify exceptions

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

Change subject: Add  and [srcset] to DOMPurify exceptions
..

Add  and [srcset] to DOMPurify exceptions

Change-Id: I680430540542f5fa7cdae923ed5faecacf928bc5
---
M src/dm/ve.dm.Change.js
1 file changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/31/383131/1

diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index cf41931..5400321 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -131,16 +131,23 @@
 };
 
 ve.dm.Change.static.deserializeValue = function ( serialized ) {
-   var rdfaAttrs;
+   var addTags, addAttrs;
if ( serialized.type === 'annotation' ) {
return ve.dm.annotationFactory.createFromElement( 
serialized.value );
} else if ( serialized.type === 'domNodeArray' ) {
-   rdfaAttrs = [ 'about', 'rel', 'resource', 'property', 
'content', 'datatype', 'typeof' ];
+   // TODO: Move MW-specific rules to ve-mw
+   addTags = [ 'figure-inline' ];
+   addAttrs = [
+   'srcset',
+   // RDFa
+   'about', 'rel', 'resource', 'property', 'content', 
'datatype', 'typeof'
+   ];
 
return serialized.value.map( function ( nodeHtml ) {
return DOMPurify.sanitize( $.parseHTML( nodeHtml )[ 0 
], {
-   ADD_ATTR: rdfaAttrs,
-   ADD_URI_SAFE_ATTR: rdfaAttrs,
+   ADD_TAGS: addTags,
+   ADD_ATTR: addAttrs,
+   ADD_URI_SAFE_ATTR: addAttrs,
FORBID_TAGS: [ 'style' ],
RETURN_DOM_FRAGMENT: true
} ).childNodes[ 0 ];

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

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

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