优化parseExpr

Author: RubyLouvre

dist/avalon.js

@@ -16,9 +16,8 @@ module.exports = function (config) {
             'karma/seed/config.js',
             'karma/filters/index.js',
             'karma/vdom/index.js',
-              
+            'karma/dom/index.js',
             'karma/$watch.js',
-            'karma/other.js',
             'karma/directives/text.js',
             'karma/directives/controller.js',
             'karma/directives/expr.js',

dist/avalon.modern.js

@@ -58,6 +58,12 @@ describe('测试dom模块', function () {
             expect(avalon.parseHTML('<div></div>').nodeType).to.equal(11)
             expect(avalon.parseHTML('<div></div>').nodeType).to.equal(11)
 
+            var table = document.createElement('table')
+            avalon.innerHTML(table, '<tr><td>111</td></tr>')
+            expect(table.getElementsByTagName('td').length).to.equal(1)
+            avalon.clearHTML(table)
+            expect(table.childNodes.length).to.equal(0)
+
             expect(avalon.parseHTML).to.be.a('function')
             expect(avalon.innerHTML).to.be.a('function')
             expect(avalon.clearHTML).to.be.a('function')
@@ -82,8 +88,8 @@ describe('测试dom模块', function () {
             it('it is the reverse of escape-html', function () {
                 var str1 = '<strong> & <a> are examples of "HTML Tags"'
                 var str2 = '&amp; & &gt; are examples of \'HTML entities\''
-                expect(fn(avalon.filters.escape(str1)+"!!")).to.be.equal(str1+"!!")
-                
+                expect(fn(avalon.filters.escape(str1) + "!!")).to.be.equal(str1 + "!!")
+
                 expect(fn(avalon.filters.escape(str2))).to.be.equal(str2)
             })
         })

dist/avalon.next.js

@@ -1,5 +1,5 @@
 var update = require('./_update')
-var reconcile = require('../strategy/reconcile')
+//var reconcile = require('../strategy/reconcile')
 
 avalon.directive('html', {
     parse: function (copy, src, binding) {

dist/avalon.test.js

@@ -47,8 +47,7 @@ function parseExpr(str, category) {
         binding = str
         str = binding.expr
     }
-    if (typeof str !== 'string')
-        return ''
+   
     var cacheID = str
     var cacheStr = evaluatorPool.get(category + ':' + cacheID)
 
@@ -84,12 +83,12 @@ function parseExpr(str, category) {
     }
 
     body = body.replace(rAt, '$1__vmodel__.')
-    if (category === 'js') {
-        return evaluatorPool.put(category + ':' + cacheID, body)
-    } else if (category === 'on') {
+   
+    if (category === 'on') {
         collectLocal(_body, local)
+    } else  if (category === 'js') {
+        return evaluatorPool.put(category + ':' + cacheID, body)
     }
-
 //处理表达式的过滤器部分
 
     var filters = input.map(function (str) {