fix(checkbox): fixes issue where double-clicking checkboxes causes te…

…xt selection Closes #588
angular · Dec 2, 2014 · 5d2e7d4 · 5d2e7d4
1 parent aa690e8
commit 5d2e7d4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/components/checkbox/_checkbox.scss b/src/components/checkbox/_checkbox.scss
@@ -7,6 +7,7 @@ md-checkbox {
   white-space: nowrap;
   cursor: pointer;
   outline: none;
+  user-select: none;
 
   .md-container {
     position: relative;
@@ -85,5 +86,6 @@ md-checkbox {
     vertical-align: middle;
     white-space: normal;
     pointer-events: none;
+    user-select: text;
   }
 }
diff --git a/src/components/checkbox/demoBasicUsage/index.html b/src/components/checkbox/demoBasicUsage/index.html
@@ -9,15 +9,15 @@
     Checkbox 2: {{ data.cb2 }}
   </md-checkbox>
 
-  <md-checkbox ng-disabled="true" aria-label="Disabled checkbox">
+  <md-checkbox ng-disabled="true" aria-label="Disabled checkbox" ng-model="data.cb3">
     Checkbox (Disabled)
   </md-checkbox>
 
   <md-checkbox ng-disabled="true" aria-label="Disabled checked checkbox" ng-model="data.cb4" ng-init="data.cb4=true">
     Checkbox (Disabled, Checked)
   </md-checkbox>
 
-  <md-checkbox md-no-ink aria-label="Checkbox No Ink">
+  <md-checkbox md-no-ink aria-label="Checkbox No Ink" ng-model="data.cb5">
     Checkbox (No Ink)
   </md-checkbox>
 

diff --git a/src/components/checkbox/demoBasicUsage/script.js b/src/components/checkbox/demoBasicUsage/script.js
@@ -6,5 +6,8 @@ angular.module('checkboxDemo1', ['ngMaterial'])
   $scope.data = {};
   $scope.data.cb1 = true;
   $scope.data.cb2 = false;
+  $scope.data.cb3 = false;
+  $scope.data.cb4 = false;
+  $scope.data.cb5 = false;
 
 });