iframe parsing

Fixes #33
mquandalle · May 22, 2014 · 2cdcb4f · 2cdcb4f
1 parent c993807
commit 2cdcb4f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/plugin/lexer.js b/plugin/lexer.js
@@ -8,15 +8,20 @@
 
 Lexer = Npm.require('jade').Lexer;
 
+// XXX Remove this function when inline JavaScript expression support lands
+var unwrap = function (value) {
+  return value && /^\(?(.+?)\)?$/.exec(value.trim())[1];
+};
+
 // Build-in components
 Lexer.prototype.builtInComponents = function () {
   var self = this;
   var tok;
-  var captures = /^(if|unless|else if|else|with|each) *\(?([^\n\)]*)\)?/.exec(self.input);
+  var captures = /^(if|unless|else if|else|with|each)\b(.*)/.exec(self.input);
   if (captures) {
     self.consume(captures[0].length);
     tok = self.tok('mixin', captures[1]);
-    tok.args = captures[2];
+    tok.args = unwrap(captures[2]);
     return tok;
   }
 };

diff --git a/tests/match.html b/tests/match.html
@@ -16,6 +16,8 @@
 
 <template name="match-html-inlineBracketsTags"><div>styling <span><span>tags</span></span></div></template>
 
+<template name="match-html-iframe"><iframe width="13" height="37"></iframe></template>
+
 <template name="match-html-justText">Hello world</template>
 
 <template name="match-html-multipleChildren"><p>Hello

diff --git a/tests/match.jade b/tests/match.jade
@@ -30,6 +30,9 @@ template(name="match-jade-inlineColonTags")
 template(name="match-jade-inlineBracketsTags")
   div styling #[span #[span tags]]
 
+template(name="match-jade-iframe")
+  iframe(width="13" height="37")
+
 template(name="match-jade-justText-1")
   | Hello world