Commitcfd73c2

committed

fix: handle encoded tabs and newlines in attributes for Chrome a[href] and IE/Edge

1 parent83ed926 commitcfd73c2Copy full SHA for cfd73c2

File tree

+21

-15

lines changed

+21

-15

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ declare type CompilerOptions = {`
`14`	`14`	`preserveWhitespace?:boolean;`
`15`	`15`	`isFromDOM?:boolean;`
`16`	`16`	`shouldDecodeTags?:boolean;`
`17`		`-shouldDecodeNewlines?:boolean;`
	`17`	`+shouldDecodeNewlines?:boolean;`
	`18`	`+shouldDecodeNewlinesForHref?:boolean;`
`18`	`19`
`19`	`20`	`// for ssr optimization compiler`
`20`	`21`	`scopeId?:string;`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,11 @@ const decodingMap = {`
`39`	`39`	`'>':'>',`
`40`	`40`	`'"':'"',`
`41`	`41`	`'&':'&',`
`42`		`-' ':'\n'`
	`42`	`+' ':'\n',`
	`43`	`+' ':'\t'`
`43`	`44`	`}`
`44`	`45`	`constencodedAttr=/&(?:lt\|gt\|quot\|amp);/g`
`45`		`-constencodedAttrWithNewLines=/&(?:lt\|gt\|quot\|amp\|#10);/g`
	`46`	`+constencodedAttrWithNewLines=/&(?:lt\|gt\|quot\|amp\|#10\|#9);/g`
`46`	`47`
`47`	`48`	`// #5992`
`48`	`49`	`constisIgnoreNewlineTag=makeMap('pre,textarea',true)`
`@@ -233,12 +234,12 @@ export function parseHTML (html, options) {`
`233`	`234`	`if(args[5]===''){deleteargs[5]}`
`234`	`235`	`}`
`235`	`236`	`constvalue=args[3]\|\|args[4]\|\|args[5]\|\|''`
	`237`	`+constshouldDecodeNewlines=tagName==='a'&&args[1]==='href'`
	`238`	`+ ?options.shouldDecodeNewlinesForHref`
	`239`	`+ :options.shouldDecodeNewlines`
`236`	`240`	`attrs[i]={`
`237`	`241`	`name:args[1],`
`238`		`-value:decodeAttr(`
`239`		`-value,`
`240`		`-options.shouldDecodeNewlines`
`241`		`-)`
	`242`	`+value:decodeAttr(value,shouldDecodeNewlines)`
`242`	`243`	`}`
`243`	`244`	`}`
`244`	`245`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ export function parse (`
`107`	`107`	`isUnaryTag:options.isUnaryTag,`
`108`	`108`	`canBeLeftOpenTag:options.canBeLeftOpenTag,`
`109`	`109`	`shouldDecodeNewlines:options.shouldDecodeNewlines,`
	`110`	`+shouldDecodeNewlinesForHref:options.shouldDecodeNewlinesForHref,`
`110`	`111`	`shouldKeepComment:options.comments,`
`111`	`112`	`start(tag,attrs,unary){`
`112`	`113`	`// check namespace.`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import { mark, measure } from 'core/util/perf'`
`6`	`6`
`7`	`7`	`importVuefrom'./runtime/index'`
`8`	`8`	`import{query}from'./util/index'`
`9`		`-import{shouldDecodeNewlines}from'./util/compat'`
`10`	`9`	`import{compileToFunctions}from'./compiler/index'`
	`10`	`+import{shouldDecodeNewlines,shouldDecodeNewlinesForHref}from'./util/compat'`
`11`	`11`
`12`	`12`	`constidToTemplate=cached(id=>{`
`13`	`13`	`constel=query(id)`
`@@ -64,6 +64,7 @@ Vue.prototype.$mount = function (`
`64`	`64`
`65`	`65`	`const{render,staticRenderFns}=compileToFunctions(template,{`
`66`	`66`	`shouldDecodeNewlines,`
	`67`	`+ shouldDecodeNewlinesForHref,`
`67`	`68`	`delimiters:options.delimiters,`
`68`	`69`	`comments:options.comments`
`69`	`70`	`},this)`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,14 @@`
`3`	`3`	`import{inBrowser}from'core/util/index'`
`4`	`4`
`5`	`5`	`// check whether current browser encodes a char inside attribute values`
`6`		`-functionshouldDecode(content:string,encoded:string):boolean{`
`7`		`-constdiv=document.createElement('div')`
`8`		-div.innerHTML=`<div a="${content}"/>`
`9`		`-returndiv.innerHTML.indexOf(encoded)>0`
	`6`	`+letdiv`
	`7`	`+functiongetShouldDecode(href:boolean):boolean{`
	`8`	`+div=div\|\|document.createElement('div')`
	`9`	+div.innerHTML=href ?`<a href="\n"/>` :`<div a="\n"/>`
	`10`	`+returndiv.innerHTML.indexOf(' ')>0`
`10`	`11`	`}`
`11`	`12`
`12`		`-// #3663`
`13`		`-// IE encodes newlines inside attribute values while other browsers don't`
`14`		`-exportconstshouldDecodeNewlines=inBrowser ?shouldDecode('\n',' ') :false`
	`13`	`+// #3663: IE encodes newlines inside attribute values while other browsers don't`
	`14`	`+exportconstshouldDecodeNewlines=inBrowser ?getShouldDecode(false) :false`
	`15`	`+// #6828: chrome encodes content in a[href]`
	`16`	`+exportconstshouldDecodeNewlinesForHref=inBrowser ?getShouldDecode(true) :false`

Comments

(0)