Revert "Mark node with static props as static (#4662)"

This reverts commit 9265724.
vuejs · Jan 13, 2017 · 4e830ba · 4e830ba
1 parent bb42625
commit 4e830ba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 20 deletions.
diff --git a/flow/compiler.js b/flow/compiler.js
@@ -82,7 +82,6 @@ declare type ASTElement = {
   plain?: boolean;
   pre?: true;
   ns?: string;
-  staticProps?: Array<string>;
 
   component?: string;
   inlineTemplate?: true;

diff --git a/src/compiler/helpers.js b/src/compiler/helpers.js
@@ -15,10 +15,7 @@ export function pluckModuleFunction<F: Function> (
     : []
 }
 
-export function addProp (el: ASTElement, name: string, value: string, fromStaticAttr?: boolean) {
-  if (fromStaticAttr) {
-    (el.staticProps || (el.staticProps = [])).push(name)
-  }
+export function addProp (el: ASTElement, name: string, value: string) {
   (el.props || (el.props = [])).push({ name, value })
 }
 

diff --git a/src/compiler/optimizer.js b/src/compiler/optimizer.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { makeMap, isBuiltInTag, cached, no, remove } from 'shared/util'
+import { makeMap, isBuiltInTag, cached, no } from 'shared/util'
 
 let isStaticKey
 let isPlatformReservedTag
@@ -30,7 +30,7 @@ export function optimize (root: ?ASTElement, options: CompilerOptions) {
 
 function genStaticKeys (keys: string): Function {
   return makeMap(
-    'type,tag,attrsList,attrsMap,plain,parent,children,attrs,staticProps' +
+    'type,tag,attrsList,attrsMap,plain,parent,children,attrs' +
     (keys ? ',' + keys : '')
   )
 }
@@ -99,17 +99,13 @@ function isStatic (node: ASTNode): boolean {
   if (node.type === 3) { // text
     return true
   }
-  const nodeAttrs = Object.keys(node)
-  if (node.staticProps && node.props && node.staticProps.length === node.props.length) {
-    remove(nodeAttrs, 'props')
-  }
   return !!(node.pre || (
     !node.hasBindings && // no dynamic bindings
     !node.if && !node.for && // not v-if or v-for or v-else
     !isBuiltInTag(node.tag) && // not a built-in
     isPlatformReservedTag(node.tag) && // not a component
     !isDirectChildOfTemplateFor(node) &&
-    nodeAttrs.every(isStaticKey)
+    Object.keys(node).every(isStaticKey)
   ))
 }
 

diff --git a/src/compiler/parser/index.js b/src/compiler/parser/index.js
@@ -481,9 +481,9 @@ function processAttrs (el) {
       // so that patches between dynamic/static are consistent
       if (platformMustUseProp(el.tag, name)) {
         if (name === 'value') {
-          addProp(el, name, JSON.stringify(value), true)
+          addProp(el, name, JSON.stringify(value))
         } else {
-          addProp(el, name, 'true', true)
+          addProp(el, name, 'true')
         }
       }
     }

diff --git a/test/unit/modules/compiler/optimizer.spec.js b/test/unit/modules/compiler/optimizer.spec.js
@@ -191,12 +191,6 @@ describe('optimizer', () => {
     expect(ast.children[0].static).toBe(false)
   })
 
-  it('mark static with static dom property', () => {
-    const ast = parse('<input type="text" value="1">', baseOptions)
-    optimize(ast, baseOptions)
-    expect(ast.static).toBe(true)
-  })
-
   it('not root ast', () => {
     const ast = null
     optimize(ast, baseOptions)