Merge branch 'master' into 2.1.x

sstephenson · Oct 11, 2011 · 794c26d · 794c26d
2 parents 17ab387 + 9f3474d
commit 794c26d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/sprockets/jst_processor.rb b/lib/sprockets/jst_processor.rb
@@ -6,14 +6,21 @@ def self.default_mime_type
       'application/javascript'
     end
 
+    def self.default_namespace
+      'this.JST'
+    end
+
     def prepare
+      @namespace = self.class.default_namespace
     end
 
+    attr_reader :namespace
+
     def evaluate(scope, locals, &block)
       <<-JST
 (function() {
-  this.JST || (this.JST = {});
+  #{namespace} || (#{namespace} = {});
-  this.JST[#{scope.logical_path.inspect}] = #{indent(data)};
+  #{namespace}[#{scope.logical_path.inspect}] = #{indent(data)};
 }).call(this);
       JST
     end