Skip to content

Commit 7871a8b

Browse files
committed
Merge branches 'pr-add-new-keys-first', 'pr-autofocus-key-input', 'pr-clear-filter' and 'pr-remember-last-changed-multiline' into pr-quality-of-life-fixes
4 parents bda2627 + 60436f2 + dd10683 + 6891268 commit 7871a8b

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

views/project.php

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
7777
<div class="uk-width-1-4">
7878
<div class="uk-form-icon uk-form uk-text-muted uk-display-block">
79-
<i class="uk-icon-filter"></i>
79+
<a class="uk-icon-filter" style="pointer-events: all" onclick="{ clearfilter }"></a>
8080
<input class="uk-form-large uk-form-blank" type="text" ref="txtfilter" placeholder="@lang('Filter...')" onkeyup="{ updatefilter }">
8181
8282
<div class="uk-form-select filter-selector">
@@ -231,7 +231,7 @@
231231
232232
<div class="uk-form-row">
233233
<label class="uk-text-small">@lang('Key')</label>
234-
<input class="uk-width-1-1" type="text" placeholder="@lang('Key name')" bind-event="input" bind="$key.name" required>
234+
<input ref="keyfield" class="uk-width-1-1" type="text" placeholder="@lang('Key name')" bind-event="input" bind="$key.name" required>
235235
</div>
236236
237237
<div class="uk-form-row">
@@ -240,7 +240,7 @@
240240
</div>
241241
242242
<div class="uk-form-row">
243-
<field-boolean bind="$key.multiline" label="@lang('Multiline')"></field-boolean>
243+
<field-boolean bind="$key.multiline" label="@lang('Multiline')" onchange="{ changeMultiline }"></field-boolean>
244244
</div>
245245
246246
@@ -453,11 +453,12 @@
453453
this.$key = {
454454
name: '',
455455
info: '',
456-
multiline: false
456+
multiline: App.session.get('lokalize.new.multiline', false)
457457
};
458458
459459
setTimeout(function() {
460460
UIkit.modal($this.refs.modalkey).show();
461+
$this.refs.keyfield.focus();
461462
}, 100);
462463
}
463464
@@ -549,6 +550,10 @@
549550
this.$key = null;
550551
}
551552
553+
changeMultiline(e) {
554+
App.session.set('lokalize.new.multiline', e.target.checked);
555+
}
556+
552557
suggestTranslation(e) {
553558
554559
if (suggestionIdle) {
@@ -597,8 +602,16 @@
597602
}, 250);
598603
}
599604
605+
clearfilter() {
606+
this.refs.txtfilter.value = "";
607+
}
608+
600609
updatefilter(e) {
601-
$this.visible = 20;
610+
if (e.key === "Escape") {
611+
this.clearfilter();
612+
} else {
613+
$this.visible = 20;
614+
}
602615
}
603616
604617
infilter(key) {

0 commit comments

Comments
 (0)