squash! wip

Author: chirayuk

src/AngularPublic.js

@@ -139,6 +139,7 @@ function publishExternalAPI(angular) {
     'uppercase': uppercase,
     'callbacks': {counter: 0},
     'getTestability': getTestability,
+    '$$interpolateMinErrors': $$interpolateMinErrors,
     '$$minErr': minErr,
     '$$csp': csp,
     'reloadWithDebugInfo': reloadWithDebugInfo

src/ng/interpolate.js

@@ -1,15 +1,16 @@
 'use strict';
 
-var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
-$interpolateMinErr.noconcat = function(text) {
-  return $interpolateMinErr('noconcat',
-      "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
-      "interpolations that concatenate multiple expressions when a trusted value is " +
-      "required.  See http://docs.angularjs.org/api/ng.$sce", text);
-};
-
-$interpolateMinErr.interr = function(text, err) {
-  return $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, err.toString());
+var $interpolateMinErr = minErr('$interpolate');
+var $$interpolateMinErrors = {
+  noconcat: function(text) {
+    return $interpolateMinErr('noconcat',
+        "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
+        "interpolations that concatenate multiple expressions when a trusted value is " +
+        "required.  See http://docs.angularjs.org/api/ng.$sce", text);
+  },
+  interr: function(text, err) {
+    return $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, err.toString());
+  }
 };
 
 /**

src/ngMessageFormat/messageFormatCommon.js

@@ -5,7 +5,8 @@
 // This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
 // constructs incompatible with that mode.
 
-var $interpolateMinErr = angular['$interpolateMinErr'];
+var $$interpolateMinErrors = angular['$$interpolateMinErrors'];
+var $interpolateMinErr = angular['$$minErr']('$interpolate');
 
 var noop = angular['noop'],
     isFunction = angular['isFunction'],

src/ngMessageFormat/messageFormatInterpolationParts.js

@@ -5,7 +5,7 @@
 // This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
 // constructs incompatible with that mode.
 
-/* global $interpolateMinErr: false */
+/* global $$interpolateMinErrors: false */
 /* global isFunction: false */
 /* global parseTextLiteral: false */
 
@@ -82,7 +82,7 @@ InterpolationParts.prototype.toParsedFn = function toParsedFn(mustHaveExpression
     return parseTextLiteral('');
   }
   if (this.trustedContext && this.textParts.length > 1) {
-    throw $interpolateMinErr['noconcat'](originalText);
+    throw $$interpolateMinErrors['noconcat'](originalText);
   }
   if (this.expressionFns.length === 0) {
     if (this.textParts.length != 1) { this.errorInParseLogic(); }

src/ngMessageFormat/messageFormatService.js

@@ -5,6 +5,7 @@
 // This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
 // constructs incompatible with that mode.
 
+/* global $$interpolateMinErrors: false */
 /* global $interpolateMinErr: false */
 /* global MessageFormatParser: false */
 /* global stringify: false */
@@ -28,7 +29,7 @@ function $$MessageFormatProvider() {
           value = trustedContext ? $sce['getTrusted'](trustedContext, value) : $sce['valueOf'](value);
           return allOrNothing && (value === void 0) ? value : stringify(value);
         } catch (err) {
-          $exceptionHandler($interpolateMinErr['interr'](text, err));
+          $exceptionHandler($$interpolateMinErrors['interr'](text, err));
         }
       };
     }