From bd65bf742e6211905d5eb883c9008bd7b40e2e3f Mon Sep 17 00:00:00 2001
From: Elior Boukhobza <heliosaian@gmail.com>
Date: Wed, 4 Nov 2015 11:06:27 +0200
Subject: [PATCH] fix(components): fix issue with removeClass removing previous
 classes

In certain parts of the project, a "removeClass(className)" is used to remove the class from the element. While this works fine in latest versions of jQuery, in jQuery < 1.9 this results in the element classes being removed when className is undefined, thus breaking the whole layout.

Closes #5538.
---
 src/components/checkbox/checkbox.js                  | 2 +-
 src/components/progressCircular/progress-circular.js | 4 ++--
 src/components/progressLinear/progress-linear.js     | 2 +-
 src/components/radioButton/radio-button.js           | 4 ++--
 src/components/toast/toast.js                        | 2 +-
 test/angular-material-spec.js                        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/checkbox/checkbox.js b/src/components/checkbox/checkbox.js
index 1b1401c0391..c8f80886b9d 100644
--- a/src/components/checkbox/checkbox.js
+++ b/src/components/checkbox/checkbox.js
@@ -167,7 +167,7 @@ function MdCheckboxDirective(inputDirective, $mdAria, $mdConstant, $mdTheming, $
         if(ngModelCtrl.$viewValue) {
           element.addClass(CHECKED_CSS);
         } else {
-          element.removeClass(CHECKED_CSS);
+          if (CHECKED_CSS) element.removeClass(CHECKED_CSS);
         }
       }
     };
diff --git a/src/components/progressCircular/progress-circular.js b/src/components/progressCircular/progress-circular.js
index 74e2ef808cc..78ad0388f09 100644
--- a/src/components/progressCircular/progress-circular.js
+++ b/src/components/progressCircular/progress-circular.js
@@ -118,11 +118,11 @@ function MdProgressCircularDirective($mdTheming, $mdUtil, $log) {
          case MODE_DETERMINATE:
          case MODE_INDETERMINATE:
            spinnerWrapper.removeClass('ng-hide');
-           spinnerWrapper.removeClass( lastMode );
+           if (lastMode) spinnerWrapper.removeClass(lastMode);
            spinnerWrapper.addClass( lastMode = "md-mode-" + mode );
            break;
          default:
-           spinnerWrapper.removeClass( lastMode );
+           if (lastMode) spinnerWrapper.removeClass( lastMode );
            spinnerWrapper.addClass('ng-hide');
            lastMode = undefined;
            break;
diff --git a/src/components/progressLinear/progress-linear.js b/src/components/progressLinear/progress-linear.js
index 50e25f50dfc..edc8ba3f2f9 100644
--- a/src/components/progressLinear/progress-linear.js
+++ b/src/components/progressLinear/progress-linear.js
@@ -117,7 +117,7 @@ function MdProgressLinearDirective($mdTheming, $mdUtil, $log) {
             container.addClass( lastMode = "md-mode-" + mode );
             break;
           default:
-            container.removeClass( lastMode );
+            if (lastMode) container.removeClass( lastMode );
             container.addClass('ng-hide');
             lastMode = undefined;
             break;
diff --git a/src/components/radioButton/radio-button.js b/src/components/radioButton/radio-button.js
index c5ee3458bd6..137d4efb563 100644
--- a/src/components/radioButton/radio-button.js
+++ b/src/components/radioButton/radio-button.js
@@ -302,7 +302,7 @@ function mdRadioButtonDirective($mdAria, $mdUtil, $mdTheming) {
 
       } else {
         markParentAsChecked(false);
-        element.removeClass(CHECKED_CSS);
+        if (CHECKED_CSS) element.removeClass(CHECKED_CSS);
       }
 
       /**
@@ -310,7 +310,7 @@ function mdRadioButtonDirective($mdAria, $mdUtil, $mdTheming) {
        */
       function markParentAsChecked(addClass ) {
         if ( element.parent()[0].nodeName != "MD-RADIO-GROUP") {
-          element.parent()[ !!addClass ? 'addClass' : 'removeClass'](CHECKED_CSS);
+          if (CHECKED_CSS) element.parent()[ !!addClass ? 'addClass' : 'removeClass'](CHECKED_CSS);
         }
 
       }
diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js
index 60844298c18..23a336a161b 100644
--- a/src/components/toast/toast.js
+++ b/src/components/toast/toast.js
@@ -271,7 +271,7 @@ function MdToastProvider($$interimElementProvider) {
 
     function onRemove(scope, element, options) {
       element.off(SWIPE_EVENTS, options.onSwipe);
-      options.parent.removeClass(options.openClass);
+      if (options.openClass) options.parent.removeClass(options.openClass);
 
       return (options.$destroy == true) ? element.remove() : $animate.leave(element);
     }
diff --git a/test/angular-material-spec.js b/test/angular-material-spec.js
index 7b6bbba7e2e..f2753216dde 100644
--- a/test/angular-material-spec.js
+++ b/test/angular-material-spec.js
@@ -64,7 +64,7 @@
 
           // Prepare auto-restore
           enableAnimations = function() {
-            body.removeClass(DISABLE_ANIMATIONS);
+            if (DISABLE_ANIMATIONS) body.removeClass(DISABLE_ANIMATIONS);
             styleSheet.remove();
           };
         };