Merge branch 'jon/sidenav-pop-fix'

code-tree · code-tree · commit c3455b2c834d · 2016-04-02T20:11:00.000+07:00
Conflicts:
	src/components/sidenav/sidenav.js
diff --git a/src/components/sidenav/sidenav.js b/src/components/sidenav/sidenav.js
@@ -362,7 +362,7 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate,
 
       function onDragStart() {
         sidenavWidth = parseInt(getComputedStyle(element[0]).width);
-        if (element.hasClass('md-locked-open')) {
+        if (scope.isLockedOpen) {
           dragCancelled = true;
         } else {
           lastOpenState = scope.isOpen;
