fix($interpolate): don't ReferenceError when context is undefined

caitp · caitp · commit 924ee6db06a2 · 2014-05-02T13:58:13.000-04:00
546cb42 introduced a regression, which would cause the function returned from $interpolate to throw a ReferenceError if `context` is undefined. This change prevents the error from being thrown. Closes angular#7230 Closes angular#7237
diff --git a/src/ng/interpolate.js b/src/ng/interpolate.js
@@ -199,7 +199,7 @@ function $InterpolateProvider() {
         };
 
         return extend(function interpolationFn(context) {
-            var scopeId = context.$id || 'notAScope';
+            var scopeId = (context && context.$id) || 'notAScope';
             var lastValues = lastValuesCache.values[scopeId];
             var lastResult = lastValuesCache.results[scopeId];
             var i = 0;
@@ -214,7 +214,7 @@ function $InterpolateProvider() {
             if (!lastValues) {
               lastValues = [];
               inputsChanged = true;
-              if (context.$on) {
+              if (context && context.$on) {
                 context.$on('$destroy', function() {
                   lastValuesCache.values[scopeId] = null;
                   lastValuesCache.results[scopeId] = null;
diff --git a/test/ng/interpolateSpec.js b/test/ng/interpolateSpec.js
@@ -51,6 +51,11 @@ describe('$interpolate', function() {
   }));
 
 
+  it('should interpolate with undefined context', inject(function($interpolate) {
+    expect($interpolate("Hello, world!{{bloop}}")()).toBe("Hello, world!");
+  }));
+
+
   describe('interpolating in a trusted context', function() {
     var sce;
     beforeEach(function() {
