Skip to content

Commit 0458a7b

Browse files
fixup! correct quotes, remove console.log
Signed-off-by: julia.kirschenheuter <[email protected]>
1 parent fe668b6 commit 0458a7b

File tree

8 files changed

+14
-19
lines changed

8 files changed

+14
-19
lines changed

apps/files/js/fileactions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
var menu;
371371
var $trigger = context.$file.closest('tr').find('.fileactions .action-menu');
372372
$trigger.addClass('open');
373-
$trigger.attr('aria-expanded', "true");
373+
$trigger.attr('aria-expanded', 'true');
374374

375375
menu = new OCA.Files.FileActionsMenu();
376376

@@ -379,7 +379,7 @@
379379
menu.$el.on('afterHide', function() {
380380
context.$file.removeClass('mouseOver');
381381
$trigger.removeClass('open');
382-
$trigger.attr('aria-expanded', "false");
382+
$trigger.attr('aria-expanded', 'false');
383383
menu.remove();
384384
});
385385

@@ -406,7 +406,7 @@
406406
}, false, context);
407407

408408
$el.addClass('permanent');
409-
$el.attr('aria-expanded', "false");
409+
$el.attr('aria-expanded', 'false');
410410

411411
},
412412

apps/files/js/filelist.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,7 +3853,7 @@
38533853

38543854
$actionsContainer.prepend($newButton);
38553855
$newButton.tooltip({'placement': 'bottom'});
3856-
$newButton.attr('aria-expanded', "false");
3856+
$newButton.attr('aria-expanded', 'false');
38573857
$newButton.click(_.bind(this._onClickNewButton, this));
38583858
this._newButton = $newButton;
38593859
},
@@ -3864,7 +3864,7 @@
38643864
$target = $target.closest('.button');
38653865
}
38663866
this._newButton.tooltip('hide');
3867-
$target.attr('aria-expanded', "true");
3867+
$target.attr('aria-expanded', 'true');
38683868
event.preventDefault();
38693869
if ($target.hasClass('disabled')) {
38703870
return false;

apps/files/js/navigation.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@
201201
if ($menu.hasClass('collapsible') && $menu.data('expandedstate')) {
202202
$menu.toggleClass('open');
203203
var targetAriaExpanded = $target.attr('aria-expanded');
204-
if (targetAriaExpanded === "false") {
205-
$target.attr('aria-expanded', "true");
206-
} else if (targetAriaExpanded === "true") {
207-
$target.attr('aria-expanded', "false");
204+
if (targetAriaExpanded === 'false') {
205+
$target.attr('aria-expanded', 'true');
206+
} else if (targetAriaExpanded === 'true') {
207+
$target.attr('aria-expanded', 'false');
208208
}
209-
$menu.toggleAttr('data-expanded', "true", "false");
209+
$menu.toggleAttr('data-expanded', 'true', 'false');
210210
var show = $menu.hasClass('open') ? 1 : 0;
211211
var key = $menu.data('expandedstate');
212212
$.post(OC.generateUrl("/apps/files/api/v1/toggleShowFolder/" + key), {show: show});

apps/files/templates/appnavigation.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class="nav-icon-<?php p(isset($item['icon']) && $item['icon'] !== '' ? $item['ic
9191
if (isset($item['sublist'])) {
9292
?>
9393
<button class="collapse app-navigation-noclose"
94-
<?php if (isset($item['defaultExpandedState']) && $item['defaultExpandedState']) { ?> aria-expanded="true"<?php }
95-
else { ?> aria-expanded="false"<?php } ?>
94+
<?php if (isset($item['defaultExpandedState']) && $item['defaultExpandedState']) { ?> aria-expanded='true'<?php }
95+
else { ?> aria-expanded='false'<?php } ?>
9696
aria-label="<?php p($l->t('Toggle %1$s sublist', $item['name'])) ?>"
9797
<?php if (sizeof($item['sublist']) == 0) { ?> style="display: none" <?php } ?>>
9898
</button>

apps/settings/js/federationsettingsview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
self._onScopeChanged(field, scope);
107107
});
108108
$icon.append(scopeMenu.$el);
109-
$icon.attr('aria-expanded', "false");
109+
$icon.attr('aria-expanded', 'false');
110110
$icon.on('click', _.bind(scopeMenu.show, scopeMenu));
111111
$icon.on('keydown', function(e) {
112112
if (e.keyCode === 32) {

apps/systemtags/js/admin.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
* @param {number} tagId
133133
*/
134134
_prepareForm: function (tagId) {
135-
console.log($('#systemtags').children('.select2-container'))
136135
if (tagId > 0) {
137136
$('#systemtags').attr('data-systemtag-id', tagId);
138137
$('#systemtag_delete').removeClass('hidden');

core/src/components/HeaderMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
href="#"
2929
:aria-label="ariaLabel"
3030
:aria-controls="`header-menu-${id}`"
31-
:aria-expanded="opened"
31+
:aria-expanded="opened.toString()"
3232
aria-haspopup="menu"
3333
@click.prevent="toggleMenu">
3434
<slot name="trigger" />

core/src/views/UnifiedSearch.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
exclude-click-outside-classes="popover"
2626
:open.sync="open"
2727
:aria-label="ariaLabel"
28-
:aria-expanded="ariaExpanded"
2928
@open="onOpen"
3029
@close="onClose">
3130
<!-- Header icon -->
@@ -192,7 +191,6 @@ export default {
192191
query: '',
193192
focused: null,
194193
triggered: false,
195-
ariaExpanded: 'false',
196194
197195
defaultLimit,
198196
minSearchLength,
@@ -349,13 +347,11 @@ export default {
349347
350348
methods: {
351349
async onOpen() {
352-
this.ariaExpanded = 'true'
353350
this.focusInput()
354351
// Update types list in the background
355352
this.types = await getTypes()
356353
},
357354
onClose() {
358-
this.ariaExpanded = 'false'
359355
emit('nextcloud:unified-search.close')
360356
},
361357

0 commit comments

Comments
 (0)