Skip to content

Commit a8131a6

Browse files
jokob-skjokob-sk
authored
Merge pull request #1585 from sebingel/fix/ordeable-typo-refactoring
Fix elementOptions: rename typo 'ordeable' to 'orderable'
2 parents 4b6bdea + 998c38f commit a8131a6

File tree

36 files changed

+99
-99
lines changed

36 files changed

+99
-99
lines changed

‎front/js/settings_utils.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
789789
let inputType = "text";
790790
let readOnly = "";
791791
let isMultiSelect = false;
792-
let isOrdeable = false;
792+
let isOrderable = false;
793793
let cssClasses = "";
794794
let placeholder = "";
795795
let suffix = "";
@@ -820,8 +820,8 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
820820
if (option.multiple === "true") {
821821
isMultiSelect = true;
822822
}
823-
if (option.ordeable === "true") {
824-
isOrdeable = true;
823+
if (option.orderable === "true") {
824+
isOrderable = true;
825825
}
826826
if (option.editable === "true") {
827827
editable = true;
@@ -877,7 +877,7 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
877877
inputType,
878878
readOnly,
879879
isMultiSelect,
880-
isOrdeable,
880+
isOrderable,
881881
cssClasses,
882882
placeholder,
883883
suffix,
@@ -1076,7 +1076,7 @@ function collectSetting(prefix, setCodeName, setType, settingsArray) {
10761076
},
10771077
array: () => {
10781078
let temps = [];
1079-
if (opts.isOrdeable) {
1079+
if (opts.isOrderable) {
10801080
temps = $(`#${setCodeName}`).val();
10811081
} else {
10821082
const sel = $(`#${setCodeName}`).attr("my-editable") === "true" ? "" : ":selected";
@@ -1189,7 +1189,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
11891189
inputType,
11901190
readOnly,
11911191
isMultiSelect,
1192-
isOrdeable,
1192+
isOrderable,
11931193
cssClasses,
11941194
placeholder,
11951195
suffix,
@@ -1225,7 +1225,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
12251225
switch (elementType) {
12261226
case 'select':
12271227
const multi = isMultiSelect ? "multiple" : "";
1228-
const addCss = isOrdeable ? "select2 select2-hidden-accessible" : "";
1228+
const addCss = isOrderable ? "select2 select2-hidden-accessible" : "";
12291229

12301230
inputHtml += `<select onChange="settingsChanged();${onChange}"
12311231
onfocusout="${focusout}"

‎front/multiEditCore.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function getData(){
136136
inputType,
137137
readOnly,
138138
isMultiSelect,
139-
isOrdeable,
139+
isOrderable,
140140
cssClasses,
141141
placeholder,
142142
suffix,

‎front/plugins/__template/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
"elements": [
342342
{
343343
"elementType": "select",
344-
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
344+
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
345345
"transformers": []
346346
}
347347
]
@@ -372,7 +372,7 @@
372372
"elements": [
373373
{
374374
"elementType": "select",
375-
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
375+
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
376376
"transformers": []
377377
}
378378
]

‎front/plugins/adguard_import/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
"elements": [
316316
{
317317
"elementType": "select",
318-
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
318+
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
319319
"transformers": []
320320
}
321321
]
@@ -348,7 +348,7 @@
348348
"elements": [
349349
{
350350
"elementType": "select",
351-
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
351+
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
352352
"transformers": []
353353
}
354354
]

‎front/plugins/arp_scan/config.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
"elements": [
275275
{
276276
"elementType": "select",
277-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
277+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
278278
"transformers": []
279279
}
280280
]
@@ -305,7 +305,7 @@
305305
"elements": [
306306
{
307307
"elementType": "select",
308-
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
308+
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
309309
"transformers": []
310310
}
311311
]
@@ -338,7 +338,7 @@
338338
"elements": [
339339
{
340340
"elementType": "select",
341-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
341+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
342342
"transformers": []
343343
}
344344
]
@@ -387,7 +387,7 @@
387387
"elements": [
388388
{
389389
"elementType": "select",
390-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
390+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
391391
"transformers": []
392392
}
393393
]

‎front/plugins/asuswrt_import/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"elements": [
137137
{
138138
"elementType": "select",
139-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
139+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
140140
"transformers": []
141141
}
142142
]
@@ -169,7 +169,7 @@
169169
"elements": [
170170
{
171171
"elementType": "select",
172-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
172+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
173173
"transformers": []
174174
}
175175
]

‎front/plugins/avahi_scan/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"elements": [
234234
{
235235
"elementType": "select",
236-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
236+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
237237
"transformers": []
238238
}
239239
]
@@ -264,7 +264,7 @@
264264
"elements": [
265265
{
266266
"elementType": "select",
267-
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
267+
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
268268
"transformers": []
269269
}
270270
]

‎front/plugins/ddns_update/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
"elements": [
433433
{
434434
"elementType": "select",
435-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
435+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
436436
"transformers": []
437437
}
438438
]
@@ -477,7 +477,7 @@
477477
"elements": [
478478
{
479479
"elementType": "select",
480-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
480+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
481481
"transformers": []
482482
}
483483
]

‎front/plugins/dhcp_leases/config.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@
689689
"elements": [
690690
{
691691
"elementType": "select",
692-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
692+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
693693
"transformers": []
694694
}
695695
]
@@ -720,7 +720,7 @@
720720
"elements": [
721721
{
722722
"elementType": "select",
723-
"elementOptions": [{ "multiple": "true", "ordeable": "true" }],
723+
"elementOptions": [{ "multiple": "true", "orderable": "true" }],
724724
"transformers": []
725725
}
726726
]
@@ -753,7 +753,7 @@
753753
"elements": [
754754
{
755755
"elementType": "select",
756-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
756+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
757757
"transformers": []
758758
}
759759
]
@@ -802,7 +802,7 @@
802802
"elements": [
803803
{
804804
"elementType": "select",
805-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
805+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
806806
"transformers": []
807807
}
808808
]

‎front/plugins/dhcp_servers/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@
478478
"elements": [
479479
{
480480
"elementType": "select",
481-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
481+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
482482
"transformers": []
483483
}
484484
]
@@ -519,7 +519,7 @@
519519
"elements": [
520520
{
521521
"elementType": "select",
522-
"elementOptions": [{ "multiple": "true", "ordeable": "true"}],
522+
"elementOptions": [{ "multiple": "true", "orderable": "true"}],
523523
"transformers": []
524524
}
525525
]

0 commit comments

Comments
 (0)