Skip to content
This repository was archived by the owner on Dec 16, 2019. It is now read-only.

Commit b0eae73

Browse files
author
pkempenaers
committed
Merge branch 'fix'
2 parents c6d5aa2 + dfbe14a commit b0eae73

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link href='https://fonts.googleapis.com/css?family=Architects+Daughter' rel='stylesheet' type='text/css'>
1111
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
1212
<script>
13-
var staticPath = '/pages/';
13+
var staticPath = '/angularjs-dropdown-multiselect/pages/';
1414
</script>
1515
<style>
1616
.nav,

pages/javascripts/pages/home/ExampleCtrl.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
'use strict';
22

33
angular.module('exampleApp').controller('ExampleCtrl', ['$scope', function($scope) {
4-
$scope.testmodel = [];
4+
$scope.testmodel = {};
55
$scope.testdata = [
6-
{ id: 1, label: "David", disabled: true},
6+
{ id: 1, label: "David"},
77
{ id: 2, label: "Jhon"},
8-
{ id: 3, label: "Danny"}];
8+
{ id: 3, label: "Danny" }
9+
];
910
$scope.testsettings = {
10-
showEnableSearchButton: true,
11-
keyboardControls: true
11+
externalIdProp: '',
12+
selectionLimit: 1,
13+
smartButtonMaxItems: 1,
1214
};
1315

1416
$scope.testevents = {
1517
'onSelectionChanged': function () { // This event is not firing on selection of max limit
16-
alert("you changed selection");
18+
console.log("you changed selection");
1719
}
1820
}
1921

src/angularjs-dropdown-multiselect.js

+3
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ directiveModule.directive('ngDropdownMultiselect', ['$filter', '$document', '$co
402402

403403
$scope.isChecked = function(id) {
404404
if ($scope.singleSelection) {
405+
if ($scope.settings.externalIdProp === '') {
406+
return $scope.selectedModel !== null && angular.isDefined($scope.selectedModel[$scope.settings.idProp]) && $scope.selectedModel[$scope.settings.idProp] === getFindObj(id)[$scope.settings.idProp];
407+
}
405408
return $scope.selectedModel !== null && angular.isDefined($scope.selectedModel[$scope.settings.externalIdProp]) && $scope.selectedModel[$scope.settings.externalIdProp] === getFindObj(id)[$scope.settings.externalIdProp];
406409
}
407410

0 commit comments

Comments
 (0)