fix(ripple): ripple container self-removal NPE fixed.

angular · Sep 24, 2014 · 664ab99 · 664ab99
1 parent ecea594
commit 664ab99
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/components/animate/inkCssRipple.js b/src/components/animate/inkCssRipple.js
@@ -78,19 +78,22 @@ function InkRippleService($window, $$rAF, $materialEffects, $timeout) {
     var node = element[0];
 
     if (options.mousedown) {
-      enableMousedown(true);
+      listenPointerDown(true);
     }
 
     // Publish self-detach method if desired...
     return function detach() {
-      enableMousedown(false);
+      listenPointerDown(false);
 
-      rippleContainer
-         .parent
+      if ( rippleContainer ) {
+        // Self-removal of injected container...
+        rippleContainer
+         .parent()
          .remove( rippleContainer );
-    }
+      }
+    };
 
-    function enableMousedown(active) {
+    function listenPointerDown(active) {
       if ( !active) element.off(POINTERDOWN_EVENT, onPointerDown);
       else          element.on(POINTERDOWN_EVENT, onPointerDown);
     }