Browse Source

minor changes

Evan You 12 years ago
parent
commit
37466cb506
2 changed files with 6 additions and 13 deletions
  1. 5 11
      src/instance/compile.js
  2. 1 2
      test/unit/specs/util_option_spec.js

+ 5 - 11
src/instance/compile.js

@@ -30,17 +30,11 @@ exports._compile = function () {
  */
 
 exports._compileNode = function (node) {
-  switch (node.nodeType) {
-    case 1: // element
-      if (node.tagName !== 'SCRIPT') {
-        this._compileElement(node)
-      }
-      break
-    case 3: // text
-      if (config.interpolate) {
-        this._compileTextNode(node)
-      }
-      break
+  var type = node.nodeType
+  if (type === 1 && node.tagName !== 'SCRIPT') {
+    this._compileElement(node)
+  } else if (type === 3 && config.interpolate) {
+    this._compileTextNode(node)
   }
 }
 

+ 1 - 2
test/unit/specs/util_option_spec.js

@@ -1,8 +1,7 @@
 var _ = require('../../../src/util')
+var merge = require('../../../src/util/merge-option')
 
 describe('Util - Option merging', function () {
-
-  var merge = _.mergeOptions
   
   it('default strat', function () {
     // child undefined