betetr var

fex-team · Jul 14, 2016 · 05a4f6f · 05a4f6f
1 parent 4d65486
commit 05a4f6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tags/pagelet.js b/tags/pagelet.js
@@ -6,7 +6,7 @@ exports.compile = function (compiler, args, content, parents, options, blockName
         attr[args[i].k] = args[i].v;
     }
     attr.mode = attr.mode || 'async';
-    var attrStr = JSON.stringify(attr).replace(/"<<VAR:(.*?)>>"/g, '(typeof _ctx.$1 !== "undefined" && typeof _ctx.$1 !== "null") ? _ctx.$1 : ((typeof $1 !== "undefined" && typeof $1 !== "null") ? $1 : "")');
+    var attrStr = JSON.stringify(attr).replace(/"<<VAR:(.*?)>>"/g, '((typeof _ctx.$1 !== "undefined" && typeof _ctx.$1 !== "null") ? _ctx.$1 : ((typeof $1 !== "undefined" && typeof $1 !== "null") ? $1 : ""))');
     var compiledContent = compiler(content, parents, options, blockName);
     var output = '_output += _swig._w(_ctx._yog, function(_ctx) { var _output = ""; ' + compiledContent +
         ';return _output;}, ' + attrStr + ', ' + JSON.stringify(options) + ')(_ctx);';

diff --git a/tags/widget.js b/tags/widget.js
@@ -44,14 +44,14 @@ exports.compile = function (compiler, args) {
         if (w.k && w.k !== 'data')  {
             w_args[w.k] = w.v;
         } else if (w.k == 'data') {
-            withData = JSON.stringify(w.v).replace(/"<<VAR:(.*?)>>"/g, '(typeof _ctx.$1 !== "undefined" && typeof _ctx.$1 !== "null") ? _ctx.$1 : ((typeof $1 !== "undefined" && typeof $1 !== "null") ? $1 : "")');
+            withData = JSON.stringify(w.v).replace(/"<<VAR:(.*?)>>"/g, '((typeof _ctx.$1 !== "undefined" && typeof _ctx.$1 !== "null") ? _ctx.$1 : ((typeof $1 !== "undefined" && typeof $1 !== "null") ? $1 : ""))');
         }
     });
     if (!withData) {
         withData = w;
     }
     // 处理_VAR_:标记，将其转变为获取ctx变量
-    var w_args_str = JSON.stringify(w_args).replace(/"<<VAR:(.*?)>>"/g, '(typeof _ctx.$1 !== "undefined" && typeof _ctx.$1 !== "null") ? _ctx.$1 : ((typeof $1 !== "undefined" && typeof $1 !== "null") ? $1 : "")');
+    var w_args_str = JSON.stringify(w_args).replace(/"<<VAR:(.*?)>>"/g, '((typeof _ctx.$1 !== "undefined" && typeof _ctx.$1 !== "null") ? _ctx.$1 : ((typeof $1 !== "undefined" && typeof $1 !== "null") ? $1 : ""))');
     return (ignore ? '  try {\n' : '') +
         '_output += _swig._w(_ctx._yog, ' + file + ',' + w_args_str + ', {' +
         'resolveFrom: "' + parentFile + '"' +