Comparing version 1.5.0 to 1.6.0
@@ -5,3 +5,3 @@ { | ||
"description": "Jade template runtime", | ||
"version": "1.5.0", | ||
"version": "1.6.0", | ||
"keywords": [ | ||
@@ -17,2 +17,2 @@ "template" | ||
"main": "lib/runtime.js" | ||
} | ||
} |
@@ -8,3 +8,3 @@ 'use strict'; | ||
var utils = require('./utils'); | ||
var selfClosing = require('./self-closing'); | ||
var selfClosing = require('void-elements'); | ||
var parseJSExpression = require('character-parser').parseMax; | ||
@@ -11,0 +11,0 @@ var constantinople = require('constantinople'); |
@@ -6,7 +6,6 @@ 'use strict'; | ||
if (typeof filter[name] === 'function') { | ||
var res = filter[name](str, options); | ||
return filter[name](str, options); | ||
} else { | ||
throw new Error('unknown filter ":' + name + '"'); | ||
} | ||
return res; | ||
} |
@@ -8,9 +8,8 @@ 'use strict'; | ||
if (typeof filter[name] === 'function') { | ||
var res = filter[name](str, options); | ||
return filter[name](str, options); | ||
} else if (transformers[name]) { | ||
var res = transformers[name].renderSync(str, options); | ||
return transformers[name].renderSync(str, options); | ||
} else { | ||
throw new Error('unknown filter ":' + name + '"'); | ||
} | ||
return res; | ||
} |
@@ -24,3 +24,3 @@ 'use strict'; | ||
exports.selfClosing = require('./self-closing'); | ||
exports.selfClosing = require('void-elements'); | ||
@@ -27,0 +27,0 @@ /** |
@@ -372,4 +372,4 @@ 'use strict'; | ||
var captures; | ||
if (captures = /^block\s*(\n|$)/.exec(this.input)) { | ||
this.consume(captures[0].length - 1); | ||
if (captures = /^block[ \t]*(\n|$)/.exec(this.input)) { | ||
this.consume(captures[0].length - captures[1].length); | ||
return this.tok('mixin-block'); | ||
@@ -452,8 +452,8 @@ } | ||
var tok, captures; | ||
if (captures = /^\+(([-\w]+)|(#\{))/.exec(this.input)) { | ||
if (captures = /^\+(\s*)(([-\w]+)|(#\{))/.exec(this.input)) { | ||
// try to consume simple or interpolated call | ||
if (captures[2]) { | ||
if (captures[3]) { | ||
// simple call | ||
this.consume(captures[0].length); | ||
tok = this.tok('call', captures[2]); | ||
tok = this.tok('call', captures[3]); | ||
} else { | ||
@@ -463,3 +463,3 @@ // interpolated call | ||
try { | ||
match = this.bracketExpression(2); | ||
match = this.bracketExpression(2 + captures[1].length); | ||
} catch (ex) { | ||
@@ -466,0 +466,0 @@ return;//not an interpolation expression, just an unmatched open interpolation |
@@ -492,2 +492,3 @@ 'use strict'; | ||
parser.blocks = this.blocks; | ||
parser.included = this.included; | ||
parser.contexts = this.contexts; | ||
@@ -494,0 +495,0 @@ this.extending = parser; |
{ | ||
"name": "jade", | ||
"description": "Jade template engine", | ||
"version": "1.5.0", | ||
"version": "1.6.0", | ||
"author": "TJ Holowaychuk <tj@vision-media.ca>", | ||
@@ -21,9 +21,10 @@ "maintainers": [ | ||
"dependencies": { | ||
"character-parser": "1.2.0", | ||
"commander": "2.1.0", | ||
"constantinople": "~2.0.0", | ||
"mkdirp": "~0.5.0", | ||
"monocle": "1.1.51", | ||
"transformers": "2.1.0", | ||
"character-parser": "1.2.0", | ||
"monocle": "1.1.51", | ||
"with": "~3.0.0", | ||
"constantinople": "~2.0.0" | ||
"void-elements": "~1.0.0", | ||
"with": "~3.0.0" | ||
}, | ||
@@ -30,0 +31,0 @@ "devDependencies": { |
@@ -1,2 +0,2 @@ | ||
!function(e){if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.jade=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){ | ||
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.jade=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){ | ||
'use strict'; | ||
@@ -181,3 +181,3 @@ | ||
try { | ||
str = str || _dereq_('fs').readFileSync(filename, 'utf8') | ||
str = str || require('fs').readFileSync(filename, 'utf8') | ||
} catch (ex) { | ||
@@ -207,6 +207,5 @@ rethrow(err, null, lineno) | ||
},{"fs":2}],2:[function(_dereq_,module,exports){ | ||
},{"fs":2}],2:[function(require,module,exports){ | ||
},{}]},{},[1]) | ||
(1) | ||
},{}]},{},[1])(1) | ||
}); |
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
668165
17275
8
40
20
+ Addedvoid-elements@~1.0.0
+ Addedvoid-elements@1.0.0(transitive)