Test non-prefixed attributes before prefixed (vuejs#2668)

simplesmiler · yyx990803 · commit 0cf2502926e7 · 2016-04-14T00:00:04.000-04:00
diff --git a/src/directives/internal/style.js b/src/directives/internal/style.js
@@ -112,6 +112,12 @@ function prefix (prop) {
   }
   var i = prefixes.length
   var prefixed
+  if (camel !== 'filter' && (camel in testEl.style)) {
+    return {
+      kebab: prop,
+      camel: camel
+    }
+  }
   while (i--) {
     prefixed = camelPrefixes[i] + upper
     if (prefixed in testEl.style) {
@@ -121,10 +127,4 @@ function prefix (prop) {
       }
     }
   }
-  if (camel in testEl.style) {
-    return {
-      kebab: prop,
-      camel: camel
-    }
-  }
 }
diff --git a/test/unit/specs/directives/internal/style_spec.js b/test/unit/specs/directives/internal/style_spec.js
@@ -121,4 +121,10 @@ describe(':style', function () {
       done()
     })
   })
+
+  // #2654
+  it('background size with only one value', function () {
+    dir.update({ backgroundSize: '100%' })
+    expect(el.style.cssText.replace(/\s/g, '')).toBe('background-size:100%;')
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,12 @@ function prefix (prop) {`
`112`	`112`	`}`
`113`	`113`	`var i = prefixes.length`
`114`	`114`	`var prefixed`
	`115`	`+ if (camel !== 'filter' && (camel in testEl.style)) {`
	`116`	`+ return {`
	`117`	`+ kebab: prop,`
	`118`	`+ camel: camel`
	`119`	`+ }`
	`120`	`+ }`
`115`	`121`	`while (i--) {`
`116`	`122`	`prefixed = camelPrefixes[i] + upper`
`117`	`123`	`if (prefixed in testEl.style) {`
`@@ -121,10 +127,4 @@ function prefix (prop) {`
`121`	`127`	`}`
`122`	`128`	`}`
`123`	`129`	`}`
`124`		`- if (camel in testEl.style) {`
`125`		`- return {`
`126`		`- kebab: prop,`
`127`		`- camel: camel`
`128`		`- }`
`129`		`- }`
`130`	`130`	`}`