Merge branch 'pascalpp-template-variable'

emaphp · Oct 23, 2015 · 0889024 · 0889024
2 parents fcbf57e + 7bfd8ed
commit 0889024
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -32,6 +32,11 @@ module.exports = function(content) {
             _.templateSettings[key] = new RegExp(value, 'g');
         });
 
+        // Apply template variable
+        if (query.variable !== undefined) {
+            _.templateSettings.variable = query.variable;
+        }
+
         // Set tag+attribute to parse for external resources
         if (query.attributes !== undefined) {
             attributes = _.isArray(query.attributes) ? query.attributes : [];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "underscore-template-loader",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "An Underscore and Lodash template loader for Webpack",
   "main": "index.js",
   "homepage": "https://github.com/emaphp/underscore-template-loader",
@@ -18,6 +18,9 @@
     },
     {
       "name": "Kees Kluskens (SpaceK33z)"
+    },
+    {
+	  "name": "Pascal (pascalpp)"
     }
   ],
   "repository": {