Commit 7b702141 authored by Robert Lyon's avatar Robert Lyon Committed by Aaron Wells
Browse files

Bug 1423410: eliminate bulk permission syncing on view/access.php page



Also allow the default selected option (this view/collection) from
being removable in the select2 selector

Change-Id: I08187f8e8e131a508abafd3883a3c97e6df7922d
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 73488781
......@@ -13,13 +13,3 @@ Changes:
* Removed package manager metadata files
* Added styling to decrease size of text in the menus
* Added a 'readonly' status to an option to hide the 'x' (stop it being removable)
* Accessibility improvements
* Modify the AJAX data adapter and search box so that items are read out when moving up and
down through them with the keyboard
* Link select2 instances to the label(s) of the original <select>
* Allow removing tags with the keyboard
* Hide original <select> completely instead of leaving it accessible to screen readers
* Keep focus position when loading more elements with infinite scrolling
* Add label to "Remove tag" button
* Make "Remove tag" button work with the keyboard
* Adding the 'aria-hidden="true"' to presentation icons
\ No newline at end of file
......@@ -1606,11 +1606,14 @@ S2.define('select2/selection/multiple',[
return escapeMarkup(template(data, container));
};
MultipleSelection.prototype.selectionContainer = function () {
MultipleSelection.prototype.selectionContainer = function (readonly) {
readonly = (typeof readonly !== 'undefined') ? readonly : false;
var state = (readonly) ? 'readonly' : 'remove';
var button = (readonly) ? '' : '&times;';
var $container = $(
'<li class="select2-selection__choice">' +
'<span class="select2-selection__choice__remove" role="presentation">' +
'&times;' +
'<span class="select2-selection__choice__' + state + '" role="presentation">' +
button +
'</span>' +
'</li>'
);
......@@ -1630,7 +1633,8 @@ S2.define('select2/selection/multiple',[
for (var d = 0; d < data.length; d++) {
var selection = data[d];
var $selection = this.selectionContainer();
var readonly = $(selection.element).hasClass('readonly');
var $selection = this.selectionContainer(readonly);
var formatted = this.display(selection, $selection);
$selection.append(formatted);
......
......@@ -42,7 +42,9 @@ Version: 4.0.0 Timestamp: Jul 1 13:43:36 EDT 2015
overflow: hidden;
padding-left: 8px;
text-overflow: ellipsis;
white-space: nowrap; }
white-space: nowrap;
max-width: 100%;
width: auto; }
.select2-container .select2-search--inline {
float: left; }
.select2-container .select2-search--inline .select2-search__field {
......@@ -189,8 +191,8 @@ Version: 4.0.0 Timestamp: Jul 1 13:43:36 EDT 2015
box-sizing: border-box;
list-style: none;
margin: 0;
padding: 0 5px;
width: 100%; }
padding: 0 28px 0 5px;
width: auto; }
.select2-container--default .select2-selection--multiple .select2-selection__placeholder {
color: #999;
margin-top: 5px;
......@@ -209,7 +211,12 @@ Version: 4.0.0 Timestamp: Jul 1 13:43:36 EDT 2015
float: left;
margin-right: 5px;
margin-top: 5px;
padding: 0 5px; }
padding: 0 5px;
max-width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: auto; }
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
color: #999;
cursor: pointer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment