Merge pull request #1253 from pygy/fix-1252

Fix #1252, re-fix #348
This commit is contained in:
Leo Horie 2016-08-17 22:17:44 -04:00 committed by GitHub
commit 0159cd667a

View file

@ -1090,8 +1090,14 @@
// //
// #348 don't set the value if not needed - otherwise, cursor // #348 don't set the value if not needed - otherwise, cursor
// placement breaks in Chrome // placement breaks in Chrome
// #1252 likewise when `contenteditable` is set on an element.
try { try {
if (tag !== "input" || node[attrName] !== dataAttr) { if (
tag !== "input" && !node.isContentEditable
/* eslint-disable eqeqeq */
|| node[attrName] != dataAttr
/* eslint-enable eqeqeq */
) {
node[attrName] = dataAttr node[attrName] = dataAttr
} }
} catch (e) { } catch (e) {
@ -1136,8 +1142,11 @@
if (e.message.indexOf("Invalid argument") < 0) throw e if (e.message.indexOf("Invalid argument") < 0) throw e
} }
} else if (attrName === "value" && tag === "input" && } else if (attrName === "value" && tag === "input" &&
node.value !== dataAttr) { /* eslint-disable eqeqeq */
// #348 dataAttr may not be a string, so use loose comparison node.value != dataAttr) {
// #348 dataAttr may not be a string,
// so use loose comparison
/* eslint-enable eqeqeq */
node.value = dataAttr node.value = dataAttr
} }
} }