Merge pull request #424 from wagenet/version-check-v2

wycats · wycats · commit 448e43c41eae · 2013-01-30T22:57:24.000-08:00
Improved precompile template version check
diff --git a/dist/handlebars.js b/dist/handlebars.js
@@ -1381,10 +1381,7 @@ Handlebars.JavaScriptCompiler = function() {};
       var source = this.mergeSource();
 
       if (!this.isChild) {
-        source = "if (Handlebars.VERSION !== '"+Handlebars.VERSION+"') {\n"+
-                   "throw 'Template was compiled with "+Handlebars.VERSION+", but runtime is '+Handlebars.VERSION;\n"+
-                 "}\n"+
-                 source;
+        source = "this.compiledVersion = '"+Handlebars.VERSION+"';\n"+source;
       }
 
       if (asObject) {
@@ -2126,12 +2123,17 @@ Handlebars.VM = {
         }
       },
       programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop
+      noop: Handlebars.VM.noop,
+      compiledVersion: null
     };
 
     return function(context, options) {
       options = options || {};
-      return templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      if (container.compiledVersion !== Handlebars.VERSION) {
+        throw "Template was compiled with "+(container.compiledVersion || 'unknown version')+", but runtime is "+Handlebars.VERSION;
+      }
+      return result;
     };
   },
 
diff --git a/dist/handlebars.runtime.js b/dist/handlebars.runtime.js
@@ -249,12 +249,17 @@ Handlebars.VM = {
         }
       },
       programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop
+      noop: Handlebars.VM.noop,
+      compiledVersion: null
     };
 
     return function(context, options) {
       options = options || {};
-      return templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      if (container.compiledVersion !== Handlebars.VERSION) {
+        throw "Template was compiled with "+(container.compiledVersion || 'unknown version')+", but runtime is "+Handlebars.VERSION;
+      }
+      return result;
     };
   },
 
diff --git a/lib/handlebars/compiler/compiler.js b/lib/handlebars/compiler/compiler.js
@@ -539,10 +539,7 @@ Handlebars.JavaScriptCompiler = function() {};
       var source = this.mergeSource();
 
       if (!this.isChild) {
-        source = "if (Handlebars.VERSION !== '"+Handlebars.VERSION+"') {\n"+
-                   "throw 'Template was compiled with "+Handlebars.VERSION+", but runtime is '+Handlebars.VERSION;\n"+
-                 "}\n"+
-                 source;
+        source = "this.compiledVersion = '"+Handlebars.VERSION+"';\n"+source;
       }
 
       if (asObject) {
diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
@@ -20,12 +20,17 @@ Handlebars.VM = {
         }
       },
       programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop
+      noop: Handlebars.VM.noop,
+      compiledVersion: null
     };
 
     return function(context, options) {
       options = options || {};
-      return templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
+      if (container.compiledVersion !== Handlebars.VERSION) {
+        throw "Template was compiled with "+(container.compiledVersion || 'unknown version')+", but runtime is "+Handlebars.VERSION;
+      }
+      return result;
     };
   },
 
