Skip to content

Support multiple selections in both dd-select and dd-menu #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support multiple selections in both dd-select and dd-menu #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0619163
Multiple selections
jeffhuys Jul 21, 2015
2e4bbcc
Multiple selections now possible on both dd-select and dd-menu
jeffhuys Jul 22, 2015
0c2ef3f
Code warnings resolved
jeffhuys Jul 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions angular-dropdowns.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@
background: #f3f8f8;
}

.wrap-dd-select .dropdown li.selected {
background-color: #ffaaaa;
border-radius: 7px;
}

.wrap-dd-select .dropdown:after {
content: "";
width: 0;
Expand Down Expand Up @@ -167,6 +172,11 @@
padding: 10px 0;
}

.wrap-dd-menu .dropdown li.selected {
background-color: #ffaaaa;
border-radius: 7px;
}

.wrap-dd-menu .dropdown li a {
display: block;
padding: 10px;
Expand Down
100 changes: 89 additions & 11 deletions angular-dropdowns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@
dd.run(['$templateCache', function ($templateCache) {
$templateCache.put('ngDropdowns/templates/dropdownSelect.html', [
'<div ng-class="{\'disabled\': dropdownDisabled}" class="wrap-dd-select">',
'<span class="selected">{{dropdownModel[labelField]}}</span>',
'<span class="selected" ng-if="!dropdownMultiple">{{dropdownModel[labelField]}}</span>',
'<span class="selected" ng-if="dropdownMultiple">{{list(dropdownModel)}}</span>',
'<ul class="dropdown">',
'<li ng-repeat="item in dropdownSelect"',
' class="dropdown-item"',
' dropdown-select-item="item"',
' dropdown-item-label="labelField">',
' dropdown-item-label="labelField"',
' dropdown-select-item-multiple="dropdownMultiple">',
'</li>',
'</ul>',
'</div>'
].join(''));

$templateCache.put('ngDropdowns/templates/dropdownSelectItem.html', [
'<li ng-class="{divider: (dropdownSelectItem.divider && !dropdownSelectItem[dropdownItemLabel]), \'divider-label\': (dropdownSelectItem.divider && dropdownSelectItem[dropdownItemLabel])}">',
'<li ng-class="{selected: dropdownSelectItem.selected, divider: (dropdownSelectItem.divider && !dropdownSelectItem[dropdownItemLabel]), \'divider-label\': (dropdownSelectItem.divider && dropdownSelectItem[dropdownItemLabel])}">',
'<a href="" class="dropdown-item"',
' ng-if="!dropdownSelectItem.divider"',
' ng-href="{{dropdownSelectItem.href}}"',
Expand All @@ -39,13 +41,14 @@
'<li ng-repeat="item in dropdownMenu"',
' class="dropdown-item"',
' dropdown-item-label="labelField"',
' dropdown-menu-item="item">',
' dropdown-menu-item="item"',
' dropdown-menu-item-multiple="dropdownMultiple">',
'</li>',
'</ul>'
].join(''));

$templateCache.put('ngDropdowns/templates/dropdownMenuItem.html', [
'<li ng-class="{divider: dropdownMenuItem.divider, \'divider-label\': dropdownMenuItem.divider && dropdownMenuItem[dropdownItemLabel]}">',
'<li ng-class="{divider: dropdownMenuItem.divider, \'divider-label\': dropdownMenuItem.divider && dropdownMenuItem[dropdownItemLabel], selected: dropdownMenuItem.selected}">',
'<a href="" class="dropdown-item"',
' ng-if="!dropdownMenuItem.divider"',
' ng-href="{{dropdownMenuItem.href}}"',
Expand All @@ -70,18 +73,43 @@
dropdownModel: '=',
dropdownItemLabel: '@',
dropdownOnchange: '&',
dropdownDisabled: '='
dropdownDisabled: '=',
dropdownMultiple: '=',
dropdownMultipleStandardLabel: '@'
},

controller: ['$scope', '$element', function ($scope, $element) {
$scope.labelField = $scope.dropdownItemLabel || 'text';

if($scope.dropdownMultiple) {
$scope.dropdownModel = [];
}

DropdownService.register($element);

this.select = function (selected) {
if (!angular.equals(selected, $scope.dropdownModel)) {
if (!angular.equals(selected, $scope.dropdownModel) && !$scope.dropdownMultiple) {
$scope.dropdownModel = selected;
}

if($scope.dropdownMultiple) {
var exists = -1;
for(var i = 0; i < $scope.dropdownModel.length; i++) {
if($scope.dropdownModel[i] === selected) {
exists = i;
break;
}
}

if(exists === -1) {
selected.selected = true;
$scope.dropdownModel.push(selected);
} else {
selected.selected = false;
$scope.dropdownModel.splice(exists, 1);
}
}

$scope.dropdownOnchange({
selected: selected
});
Expand All @@ -97,6 +125,14 @@
$scope.$on('$destroy', function () {
DropdownService.unregister($element);
});

$scope.list = function() {
var returnString = "";
$scope.dropdownModel.forEach(function(obj) {
returnString += obj.text + ", ";
});
return returnString !== ""? returnString.substring(0, returnString.length - 2) : $scope.dropdownMultipleStandardLabel;
};
}],
templateUrl: 'ngDropdowns/templates/dropdownSelect.html'
};
Expand All @@ -110,7 +146,8 @@
replace: true,
scope: {
dropdownItemLabel: '=',
dropdownSelectItem: '='
dropdownSelectItem: '=',
dropdownSelectItemMultiple: '='
},

link: function (scope, element, attrs, dropdownSelectCtrl) {
Expand All @@ -122,6 +159,14 @@
};
},

controller: ['$scope', '$element', function ($scope, $element) {
$element.bind('click', function (event) {
if($scope.dropdownSelectItemMultiple) {
event.stopPropagation();
}
});
}],

templateUrl: 'ngDropdowns/templates/dropdownSelectItem.html'
};
}
Expand All @@ -137,7 +182,8 @@
dropdownModel: '=',
dropdownItemLabel: '@',
dropdownOnchange: '&',
dropdownDisabled: '='
dropdownDisabled: '=',
dropdownMultiple: '='
},

controller: ['$scope', '$element', function ($scope, $element) {
Expand All @@ -156,12 +202,35 @@
$wrap.append($element);
$wrap.append($template);

if($scope.dropdownMultiple) {
$scope.dropdownModel = [];
}

DropdownService.register(tpl);

this.select = function (selected) {
if (!angular.equals(selected, $scope.dropdownModel)) {
if (!angular.equals(selected, $scope.dropdownModel) && !$scope.dropdownMultiple) {
$scope.dropdownModel = selected;
}

if($scope.dropdownMultiple) {
var exists = -1;
for(var i = 0; i < $scope.dropdownModel.length; i++) {
if($scope.dropdownModel[i] === selected) {
exists = i;
break;
}
}

if(exists === -1) {
selected.selected = true;
$scope.dropdownModel.push(selected);
} else {
selected.selected = false;
$scope.dropdownModel.splice(exists, 1);
}
}

$scope.dropdownOnchange({
selected: selected
});
Expand Down Expand Up @@ -189,7 +258,8 @@
replace: true,
scope: {
dropdownMenuItem: '=',
dropdownItemLabel: '='
dropdownItemLabel: '=',
dropdownMenuItemMultiple: '='
},

link: function (scope, element, attrs, dropdownMenuCtrl) {
Expand All @@ -201,6 +271,14 @@
};
},

controller: ['$scope', '$element', function ($scope, $element) {
$element.bind('click', function (event) {
if($scope.dropdownMenuItemMultiple) {
event.stopPropagation();
}
});
}],

templateUrl: 'ngDropdowns/templates/dropdownMenuItem.html'
};
}
Expand Down
10 changes: 10 additions & 0 deletions dist/angular-dropdowns.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@
background: #f3f8f8;
}

.wrap-dd-select .dropdown li.selected {
background-color: #ffaaaa;
border-radius: 7px;
}

.wrap-dd-select .dropdown:after {
content: "";
width: 0;
Expand Down Expand Up @@ -167,6 +172,11 @@
padding: 10px 0;
}

.wrap-dd-menu .dropdown li.selected {
background-color: #ffaaaa;
border-radius: 7px;
}

.wrap-dd-menu .dropdown li a {
display: block;
padding: 10px;
Expand Down
Loading