From e9a1d4f4c31077042eccdeef9e1785d98cfc9d15 Mon Sep 17 00:00:00 2001
From: Elad Bezalel <elad.bezalel@gmail.com>
Date: Wed, 27 Apr 2016 17:22:03 +0300
Subject: [PATCH] fix(colors): parsed watched expression

- Moved expression parsing inside the watch, this way the watch could really trigger changes when the interpolated expression had changed

fixes #8212

Closes #8235
---
 src/components/colors/colors.js      | 30 +++++++++++-----------------
 src/components/colors/colors.spec.js |  2 +-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/components/colors/colors.js b/src/components/colors/colors.js
index eae87caf300..cd61f731eb8 100644
--- a/src/components/colors/colors.js
+++ b/src/components/colors/colors.js
@@ -39,7 +39,7 @@
    *  </hljs>
    *
    */
-  function MdColorsService($mdTheming, $mdUtil, $parse, $log) {
+  function MdColorsService($mdTheming, $mdUtil, $log) {
     colorPalettes = colorPalettes || Object.keys($mdTheming.PALETTES);
 
     // Publish service instance
@@ -61,10 +61,8 @@
      * Then calculate the rgba() values based on the theme color parts
      *
      * @param {DOMElement} element the element to apply the styles on.
-     * @param {scope} scope a scope is needed in case there are interpolated values in the expression.
-     * @param {string|object} colorExpression json object, keys are css properties and values are string of the wanted color,
-     * for example: `{color: 'red-A200-0.3'}`. Note that the color keys must be upperCamelCase instead of snake-case.
-     * e.g. `{background-color: 'grey-300'}` --> `{backgroundColor: 'grey-300'}`
+     * @param {object} colorExpression json object, keys are css properties and values are string of the wanted color,
+     * for example: `{color: 'red-A200-0.3'}`.
      *
      * @usage
      * <hljs lang="js">
@@ -78,16 +76,10 @@
      *   });
      * </hljs>
      */
-    function applyThemeColors(element, scope, colorExpression) {
+    function applyThemeColors(element, colorExpression) {
       try {
-        // Json.parse() does not work because the keys are not quoted;
-        // use $parse to convert to a hash map
-        // NOTE: keys cannot be snake-case, upperCamelCase are required
-        //        e.g.   {background-color: 'grey-300'} --> {backgroundColor: 'grey-300'}
-        var themeColors = $parse(colorExpression)(scope);
-
         // Assign the calculate RGBA color values directly as inline CSS
-        element.css(interpolateColors(themeColors));
+        element.css(interpolateColors(colorExpression));
       } catch( e ) {
         $log.error(e.message);
       }
@@ -265,7 +257,7 @@
    * </hljs>
    *
    */
-  function MdColorsDirective($mdColors, $mdUtil, $log) {
+  function MdColorsDirective($mdColors, $mdUtil, $log, $parse) {
     return {
       restrict: 'A',
       compile: function (tElem, tAttrs) {
@@ -273,17 +265,19 @@
 
         return function (scope, element, attrs) {
           var colorExpression = function () {
-            return attrs.mdColors;
+            // Json.parse() does not work because the keys are not quoted;
+            // use $parse to convert to a hash map
+            return $parse(attrs.mdColors)(scope);
           };
 
           try {
             if (shouldWatch) {
               scope.$watch(colorExpression, angular.bind(this,
-                $mdColors.applyThemeColors, element, scope
-              ));
+                $mdColors.applyThemeColors, element
+              ), true);
             }
             else {
-              $mdColors.applyThemeColors(element, scope, colorExpression());
+              $mdColors.applyThemeColors(element, colorExpression());
             }
 
           }
diff --git a/src/components/colors/colors.spec.js b/src/components/colors/colors.spec.js
index abd2a068816..73f3616828a 100644
--- a/src/components/colors/colors.spec.js
+++ b/src/components/colors/colors.spec.js
@@ -398,7 +398,7 @@ describe('md-colors', function () {
       var color = $mdColorPalette['red']['200'].value;
       var expectedRGB = supplant('rgb({0}, {1}, {2})', [color[0], color[1], color[2]]);
 
-      $mdColors.applyThemeColors(element, scope, '{background: \'red-200\'}');
+      $mdColors.applyThemeColors(element, { background: 'red-200' });
       expect(element[0].style.background).toContain( expectedRGB );
     }));