Skip to content

Check the undefined variables and fix it. #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zzbo wants to merge 4 commits into
base: master
Choose a base branch
from
+6 −15
Open

Check the undefined variables and fix it. #186

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
888fb86
Check the undefined variables and fix it.
zzbo Aug 13, 2014
88b1bfd
fix bug
zzbo Aug 13, 2014
a4f057f
fix the scene like Obj.a
zzbo Aug 13, 2014
d1c004c
a better way to display error.
zzbo Aug 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions lib/ejs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/*!
* EJS
* Copyright(c) 2012 TJ Holowaychuk <tj@vision-media.ca>
Expand Down Expand Up @@ -126,8 +127,10 @@ var parse = exports.parse = function(str, options){
var prefix, postfix, line = (compileDebug ? '__stack.lineno=' : '') + lineno;
switch (str[i]) {
case '=':
prefix = "', escape((" + line + ', ';
postfix = ")), '";
/*prefix = "', escape((" + line + ', ';
postfix = ")), '";*/
prefix = "', (function () {try{return ";
postfix = "}catch(e){return e.message}})(), '";
++i;
break;
case '-':
Expand Down Expand Up @@ -167,19 +170,7 @@ var parse = exports.parse = function(str, options){
}

while (~(n = js.indexOf("\n", n))) n++, lineno++;

switch(js.substr(0, 1)) {
case ':':
js = filtered(js);
break;
case '%':
js = " buf.push('<%" + js.substring(1).replace(/'/g, "\\'") + "%>');";
break;
case '#':
js = "";
break;
}

if (js.substr(0, 1) == ':') js = filtered(js);
if (js) {
if (js.lastIndexOf('//') > js.lastIndexOf('\n')) js += '\n';
buf += prefix;
Expand Down