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

Reverting #1822 #1832

Merged
merged 2 commits into from
Oct 23, 2016
Merged

Reverting #1822 #1832

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3133048
Revert "Bug fix - Search input isn't blocked (#1822)"
Jefiozie Oct 23, 2016
a224aec
cleaning up comments
Jefiozie Oct 23, 2016
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: 1 addition & 9 deletions src/uiSelectController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ uis.controller('uiSelectCtrl',
ctrl.select = function(item, skipFocusser, $event) {
if (item === undefined || !_isItemDisabled(item)) {

if ( (!ctrl.items || !ctrl.items.length) && ! ctrl.search && ! ctrl.tagging.isActivated) return;
if ( ! ctrl.items && ! ctrl.search && ! ctrl.tagging.isActivated) return;

if (!item || !_isItemDisabled(item)) {
// if click is made on existing item, prevent from tagging, ctrl.search does not matter
Expand Down Expand Up @@ -611,11 +611,6 @@ uis.controller('uiSelectCtrl',
e.stopPropagation();
}

// if(~[KEY.ESC,KEY.TAB].indexOf(key)){
// //TODO: SEGURO?
// ctrl.close();
// }

$scope.$apply(function() {

var tagged = false;
Expand Down Expand Up @@ -645,9 +640,6 @@ uis.controller('uiSelectCtrl',
});
}
}
}else{
e.preventDefault();
e.stopPropagation();
}

});
Expand Down