use html filter default

ecomfe · Mar 9, 2013 · 49ddbfb · 49ddbfb
1 parent 76c0a89
commit 49ddbfb
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/template.js b/src/template.js
@@ -1164,7 +1164,7 @@ define(
                     case EXPR_T.number:
                         return eval(expr.text);
                     case EXPR_T.variable:
-                        return getVariableValue(scope, expr.text);
+                        return getVariableValue(scope, expr.text, 'raw');
                 }
             }
         }());
@@ -1205,10 +1205,8 @@ define(
             }
 
             // 过滤处理
-            if (filterName) {
-                filterName = filterContainer[filterName.substr(1)];
-                filterName && (value = filterName(value));
-            }
+            var filter = filterContainer[filterName || 'html'];
+            filter && (value = filter(value));
 
             return value;
         }
@@ -1290,14 +1288,13 @@ define(
          */
         function replaceVariable(text, scope) {
             return text.replace(
-                /\$\{([.a-z0-9\[\]'"_]+)\s*(\|[a-z]+)?\s*\}/ig,
-                function($0, $1, $2) {
-                    return getVariableValue(scope, $1, $2);
+                /\$\{([.a-z0-9\[\]'"_]+)\s*(\|([a-z]+))?\s*\}/ig,
+                function($0, $1, $2, $3) {
+                    return getVariableValue(scope, $1, $3);
                 }
             );
         }
 
-
         /**
          * 执行import
          *