Skip to content

Commit 95aa126

Browse files
author
isteven
committed
fixed click listener on single selection mode
1 parent 4d3c509 commit 95aa126

File tree

2 files changed

+8
-34
lines changed

2 files changed

+8
-34
lines changed

angular-multi-select.css

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,11 @@
1818
min-width: 12px;
1919
}
2020

21-
/* ! create a "row" */
22-
.multiSelect .line {
23-
height: 26px;
24-
padding-bottom: 8px;
25-
}
26-
2721
/* ! */
2822
.multiSelect .inlineBlock {
2923
display: inline-block;
3024
}
3125

32-
/*
33-
:focus { outline:none; }
34-
::-moz-focus-inner {border:0;}
35-
*/
36-
3726
/* the multiselect button */
3827
.multiSelect .button {
3928
display: block;
@@ -117,6 +106,7 @@
117106
color: #666;
118107
background-color: #f1f1f1;
119108
line-height: 1.6;
109+
margin: 0px 0px 8px 0px;
120110
}
121111

122112
/* clear button */
@@ -149,6 +139,7 @@
149139
-moz-box-sizing: border-box; /* Firefox, other Gecko */
150140
box-sizing: border-box; /* Opera/IE 8+ */
151141
color: #888;
142+
margin: 0px 0px 8px 0px;
152143
}
153144

154145
/* helper elements on hover & focus */
@@ -257,24 +248,6 @@
257248
cursor: pointer;
258249
}
259250

260-
/* Some visual aids on item labels
261-
.multiSelect label input:focus ~ span::after,
262-
.multiSelect label span:focus::after,
263-
.multiSelect label span:hover::after {
264-
/* Enable this if you want some arrow pointer on focus
265-
content: ' \00AB';
266-
}
267-
*/
268-
269-
/* Another visual aid - highlight during TAB / SHIFT+TAB keyboard operations
270-
.multiSelect label input:focus ~ span {
271-
color: #ff0000;
272-
text-shadow: 1px 0px #ccc;
273-
/* Enable this if you want some arrow pointer on focus
274-
content: ' \00AB';
275-
}
276-
*/
277-
278251
/* checkboxes currently disabled */
279252
.multiSelect .disabled,
280253
.multiSelect .disabled:hover,

angular-multi-select.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$
7575
'<div class="checkboxLayer">' +
7676
'<form>' +
7777
'<div class="helperContainer" ng-if="displayHelper( \'filter\' ) || displayHelper( \'all\' ) || displayHelper( \'none\' ) || displayHelper( \'reset\' )">' +
78-
'<div class="line" ng-if="displayHelper( \'all\' ) || displayHelper( \'none\' ) || displayHelper( \'reset\' )">' +
78+
'<div ng-if="displayHelper( \'all\' ) || displayHelper( \'none\' ) || displayHelper( \'reset\' )">' +
7979
'<button type="button" ng-click="select( \'all\', $event );" class="helperButton" ng-if="!isDisabled && displayHelper( \'all\' )"> &#10003;&nbsp; Select All</button> ' +
8080
'<button type="button" ng-click="select( \'none\', $event );" class="helperButton" ng-if="!isDisabled && displayHelper( \'none\' )"> &times;&nbsp; Select None</button>&nbsp;' +
8181
'<button type="button" ng-click="select( \'reset\', $event );" class="helperButton" ng-if="!isDisabled && displayHelper( \'reset\' )" style="float:right">&#8630;&nbsp; Reset</button>' +
8282
'</div>' +
83-
'<div class="line" style="position:relative" ng-if="displayHelper( \'filter\' )">' +
83+
'<div style="position:relative" ng-if="displayHelper( \'filter\' )">' +
8484
'<input placeholder="Search..." type="text" ng-click="select( \'filter\', $event )" ng-model="inputLabel.labelFilter" ng-change="updateFilter();$scope.getFormElements();" class="inputFilter" />' +
8585
'<button type="button" class="clearButton" ng-click="inputLabel.labelFilter=\'\';updateFilter();prepareGrouping();prepareIndex();select( \'clear\', $event )">&times;</button> ' +
8686
'</div>' +
@@ -552,6 +552,7 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$
552552

553553
// The idea below was taken from another multi-select directive - https://github.com/amitava82/angular-multiselect
554554
// His version is awesome if you need a more simple multi-select approach.
555+
555556
// close
556557
if ( angular.element( $scope.checkBoxLayer ).hasClass( 'show' )) {
557558
angular.element( $scope.checkBoxLayer ).removeClass( 'show' );
@@ -596,9 +597,9 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$
596597
$scope.tabIndex = $scope.tabIndex + helperItemsLength - 2;
597598
}
598599
// if there's no filter then just focus on the first checkbox item
599-
else {
600-
$scope.formElements[ $scope.tabIndex ].focus();
601-
}
600+
else {
601+
$scope.formElements[ $scope.tabIndex ].focus();
602+
}
602603

603604
// open callback
604605
$scope.onOpen( { data: element } );

0 commit comments

Comments
 (0)