Visitar URL original
Fix some errors reported by TypeScript · phpmyadmin/phpmyadmin@b321a67 · GitHub
Skip to content

Commit b321a67

Browse files
MauricioFauthMauricioFauth
committed
Fix some errors reported by TypeScript
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent fdb25d0 commit b321a67

7 files changed

Lines changed: 77 additions & 68 deletions

File tree

‎js/src/datetimepicker.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ function registerDatePickerTranslations () {
7575
$.datepicker.regional[''].showMonthAfterYear = window.Messages.strMonthAfterYear === 'calendar-year-month';
7676
$.datepicker.regional[''].yearSuffix = window.Messages.strYearSuffix !== 'none' ? window.Messages.strYearSuffix : '';
7777

78-
// eslint-disable-next-line no-underscore-dangle
79-
$.extend($.datepicker._defaults, $.datepicker.regional['']);
78+
// @ts-ignore
79+
$.extend($.datepicker._defaults, $.datepicker.regional['']); // eslint-disable-line no-underscore-dangle
8080
}
8181

8282
function registerTimePickerTranslations () {

‎js/src/designer/history.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,19 @@ const historyEdit = function (index): void {
185185
gIndex = index;
186186
var type = DesignerHistory.historyArray[index].getType();
187187
if (type === 'Where') {
188-
document.getElementById('eQuery').value = DesignerHistory.historyArray[index].getObj().getQuery();
189-
document.getElementById('erel_opt').value = DesignerHistory.historyArray[index].getObj().getRelationOperator();
188+
(document.getElementById('eQuery') as HTMLTextAreaElement).value = DesignerHistory.historyArray[index].getObj().getQuery();
189+
(document.getElementById('erel_opt') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getRelationOperator();
190190
DesignerHistory.changeStyle('query_where');
191191
} else if (type === 'Having') {
192-
document.getElementById('hQuery').value = DesignerHistory.historyArray[index].getObj().getQuery();
193-
document.getElementById('hrel_opt').value = DesignerHistory.historyArray[index].getObj().getRelationOperator();
194-
document.getElementById('hoperator').value = DesignerHistory.historyArray[index].getObj().getOperator();
192+
(document.getElementById('hQuery') as HTMLTextAreaElement).value = DesignerHistory.historyArray[index].getObj().getQuery();
193+
(document.getElementById('hrel_opt') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getRelationOperator();
194+
(document.getElementById('hoperator') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getOperator();
195195
DesignerHistory.changeStyle('query_having');
196196
} else if (type === 'Rename') {
197-
document.getElementById('e_rename').value = DesignerHistory.historyArray[index].getObj().getRenameTo();
197+
(document.getElementById('e_rename') as HTMLInputElement).value = DesignerHistory.historyArray[index].getObj().getRenameTo();
198198
DesignerHistory.changeStyle('query_rename_to');
199199
} else if (type === 'Aggregate') {
200-
document.getElementById('e_operator').value = DesignerHistory.historyArray[index].getObj().getOperator();
200+
(document.getElementById('e_operator') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getOperator();
201201
DesignerHistory.changeStyle('query_Aggregate');
202202
}
203203
};
@@ -210,31 +210,31 @@ const historyEdit = function (index): void {
210210
*/
211211
const edit = function (type): void {
212212
if (type === 'Rename') {
213-
if (document.getElementById('e_rename').value !== '') {
214-
DesignerHistory.historyArray[gIndex].getObj().setRenameTo(document.getElementById('e_rename').value);
215-
document.getElementById('e_rename').value = '';
213+
if ((document.getElementById('e_rename') as HTMLInputElement).value !== '') {
214+
DesignerHistory.historyArray[gIndex].getObj().setRenameTo((document.getElementById('e_rename') as HTMLInputElement).value);
215+
(document.getElementById('e_rename') as HTMLInputElement).value = '';
216216
}
217217

218218
document.getElementById('query_rename_to').style.visibility = 'hidden';
219219
} else if (type === 'Aggregate') {
220-
if (document.getElementById('e_operator').value !== '---') {
221-
DesignerHistory.historyArray[gIndex].getObj().setOperator(document.getElementById('e_operator').value);
222-
document.getElementById('e_operator').value = '---';
220+
if ((document.getElementById('e_operator') as HTMLSelectElement).value !== '---') {
221+
DesignerHistory.historyArray[gIndex].getObj().setOperator((document.getElementById('e_operator') as HTMLSelectElement).value);
222+
(document.getElementById('e_operator') as HTMLSelectElement).value = '---';
223223
}
224224

225225
document.getElementById('query_Aggregate').style.visibility = 'hidden';
226226
} else if (type === 'Where') {
227-
if (document.getElementById('erel_opt').value !== '--' && document.getElementById('eQuery').value !== '') {
228-
DesignerHistory.historyArray[gIndex].getObj().setQuery(document.getElementById('eQuery').value);
229-
DesignerHistory.historyArray[gIndex].getObj().setRelationOperator(document.getElementById('erel_opt').value);
227+
if ((document.getElementById('erel_opt') as HTMLSelectElement).value !== '--' && (document.getElementById('eQuery') as HTMLTextAreaElement).value !== '') {
228+
DesignerHistory.historyArray[gIndex].getObj().setQuery((document.getElementById('eQuery') as HTMLTextAreaElement).value);
229+
DesignerHistory.historyArray[gIndex].getObj().setRelationOperator((document.getElementById('erel_opt') as HTMLSelectElement).value);
230230
}
231231

232232
document.getElementById('query_where').style.visibility = 'hidden';
233233
} else if (type === 'Having') {
234-
if (document.getElementById('hrel_opt').value !== '--' && document.getElementById('hQuery').value !== '') {
235-
DesignerHistory.historyArray[gIndex].getObj().setQuery(document.getElementById('hQuery').value);
236-
DesignerHistory.historyArray[gIndex].getObj().setRelationOperator(document.getElementById('hrel_opt').value);
237-
DesignerHistory.historyArray[gIndex].getObj().setOperator(document.getElementById('hoperator').value);
234+
if ((document.getElementById('hrel_opt') as HTMLSelectElement).value !== '--' && (document.getElementById('hQuery') as HTMLTextAreaElement).value !== '') {
235+
DesignerHistory.historyArray[gIndex].getObj().setQuery((document.getElementById('hQuery') as HTMLTextAreaElement).value);
236+
DesignerHistory.historyArray[gIndex].getObj().setRelationOperator((document.getElementById('hrel_opt') as HTMLSelectElement).value);
237+
DesignerHistory.historyArray[gIndex].getObj().setOperator((document.getElementById('hoperator') as HTMLSelectElement).value);
238238
}
239239

240240
document.getElementById('query_having').style.visibility = 'hidden';

‎js/src/designer/move.ts‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ const mouseUp = function () {
147147
// ------------------------------------------------------------------------------
148148

149149
const canvasPos = function () {
150-
canvasWidth = document.getElementById('canvas').width = osnTabWidth - 3;
151-
canvasHeight = document.getElementById('canvas').height = osnTabHeight - 3;
150+
canvasWidth = (document.getElementById('canvas') as HTMLCanvasElement).width = osnTabWidth - 3;
151+
canvasHeight = (document.getElementById('canvas') as HTMLCanvasElement).height = osnTabHeight - 3;
152152
};
153153

154154
const osnTabPos = function () {
@@ -272,8 +272,8 @@ const reload = function () {
272272
// table name
273273
for (key3 in DesignerConfig.contr[K][key][key2]) {
274274
// field name
275-
if (! document.getElementById('check_vis_' + key2).checked ||
276-
! document.getElementById('check_vis_' + DesignerConfig.contr[K][key][key2][key3][0]).checked) {
275+
if (! (document.getElementById('check_vis_' + key2) as HTMLInputElement).checked ||
276+
! (document.getElementById('check_vis_' + DesignerConfig.contr[K][key][key2][key3][0]) as HTMLInputElement).checked) {
277277
// if hide
278278
continue;
279279
}
@@ -373,7 +373,7 @@ const reload = function () {
373373
* @param colorLine
374374
*/
375375
const line = function (x1, y1, x2, y2, colorLine) {
376-
var canvas = document.getElementById('canvas');
376+
var canvas = (document.getElementById('canvas') as HTMLCanvasElement);
377377
var ctx = canvas.getContext('2d');
378378
ctx.strokeStyle = colorLine;
379379
ctx.lineWidth = 1;
@@ -488,7 +488,7 @@ const line3 = function (x1, y1, x2, y2, colorLine) {
488488
};
489489

490490
const circle = function (x, y, r, w, color) {
491-
var ctx = document.getElementById('canvas').getContext('2d');
491+
var ctx = (document.getElementById('canvas') as HTMLCanvasElement).getContext('2d');
492492
ctx.beginPath();
493493
ctx.moveTo(x, y);
494494
ctx.lineWidth = w;
@@ -498,13 +498,13 @@ const circle = function (x, y, r, w, color) {
498498
};
499499

500500
const clear = function () {
501-
var canvas = document.getElementById('canvas');
501+
var canvas = (document.getElementById('canvas') as HTMLCanvasElement);
502502
var ctx = canvas.getContext('2d');
503503
ctx.clearRect(0, 0, canvasWidth, canvasHeight);
504504
};
505505

506506
const rect = function (x1, y1, w, h, color) {
507-
var ctx = document.getElementById('canvas').getContext('2d');
507+
var ctx = (document.getElementById('canvas') as HTMLCanvasElement).getContext('2d');
508508
ctx.fillStyle = color;
509509
ctx.fillRect(x1, y1, w, h);
510510
};
@@ -711,13 +711,13 @@ const newPage = function () {
711711
// (del?) no for pdf
712712
const save = function (url) {
713713
for (var key in DesignerConfig.jTabs) {
714-
document.getElementById('t_x_' + key + '_').value = parseInt(document.getElementById(key).style.left, 10);
715-
document.getElementById('t_y_' + key + '_').value = parseInt(document.getElementById(key).style.top, 10);
716-
document.getElementById('t_v_' + key + '_').value = document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1;
717-
document.getElementById('t_h_' + key + '_').value = document.getElementById('check_vis_' + key).checked ? 1 : 0;
714+
(document.getElementById('t_x_' + key + '_') as HTMLInputElement).value = parseInt(document.getElementById(key).style.left, 10);
715+
(document.getElementById('t_y_' + key + '_') as HTMLInputElement).value = parseInt(document.getElementById(key).style.top, 10);
716+
(document.getElementById('t_v_' + key + '_') as HTMLInputElement).value = document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1;
717+
(document.getElementById('t_h_' + key + '_') as HTMLInputElement).value = (document.getElementById('check_vis_' + key) as HTMLInputElement).checked ? 1 : 0;
718718
}
719719

720-
document.getElementById('container-form').action = url;
720+
(document.getElementById('container-form') as HTMLFormElement).action = url;
721721
$('#container-form').trigger('submit');
722722
};
723723

@@ -1800,15 +1800,15 @@ const clickOption = function (dbName, tableName, columnName, tableDbNameUrl, opt
18001800

18011801
const closeOption = function () {
18021802
document.getElementById('designer_optionse').style.display = 'none';
1803-
document.getElementById('rel_opt').value = '--';
1804-
document.getElementById('Query').value = '';
1805-
document.getElementById('new_name').value = '';
1806-
document.getElementById('operator').value = '---';
1807-
document.getElementById('groupby').checked = false;
1808-
document.getElementById('h_rel_opt').value = '--';
1809-
document.getElementById('h_operator').value = '---';
1810-
document.getElementById('having').value = '';
1811-
document.getElementById('orderby').value = '---';
1803+
(document.getElementById('rel_opt') as HTMLSelectElement).value = '--';
1804+
(document.getElementById('Query') as HTMLTextAreaElement).value = '';
1805+
(document.getElementById('new_name') as HTMLInputElement).value = '';
1806+
(document.getElementById('operator') as HTMLSelectElement).value = '---';
1807+
(document.getElementById('groupby') as HTMLInputElement).checked = false;
1808+
(document.getElementById('h_rel_opt') as HTMLSelectElement).value = '--';
1809+
(document.getElementById('h_operator') as HTMLSelectElement).value = '---';
1810+
(document.getElementById('having') as HTMLTextAreaElement).value = '';
1811+
(document.getElementById('orderby') as HTMLSelectElement).value = '---';
18121812
};
18131813

18141814
const selectAll = function (tableName, dbName, idSelectAll) {
@@ -1877,7 +1877,7 @@ const storeColumn = function (tableName, colName, checkboxId) {
18771877
var i;
18781878
var k;
18791879
var selectKeyField = '`' + tableName + '`.`' + colName + '`';
1880-
if (document.getElementById(checkboxId).checked === true) {
1880+
if ((document.getElementById(checkboxId) as HTMLInputElement).checked === true) {
18811881
DesignerHistory.selectField.push(selectKeyField);
18821882
window.fromArray.push(tableName);
18831883
} else {
@@ -1910,59 +1910,59 @@ const storeColumn = function (tableName, colName, checkboxId) {
19101910
const addObject = function (dbName, tableName, colName, dbTableNameUrl) {
19111911
var p;
19121912
var whereObj;
1913-
var rel = document.getElementById('rel_opt');
1913+
var rel = (document.getElementById('rel_opt') as HTMLSelectElement);
19141914
var sum = 0;
19151915
var init = DesignerHistory.historyArray.length;
19161916
if (rel.value !== '--') {
1917-
if (document.getElementById('Query').value === '') {
1917+
if ((document.getElementById('Query') as HTMLTextAreaElement).value === '') {
19181918
ajaxShowMessage(window.sprintf(window.Messages.strQueryEmpty));
19191919

19201920
return;
19211921
}
19221922

1923-
p = document.getElementById('Query');
1923+
p = (document.getElementById('Query') as HTMLTextAreaElement);
19241924
whereObj = new DesignerHistory.Where(rel.value, p.value);// make where object
19251925
DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Where'));
19261926
sum = sum + 1;
19271927
}
19281928

1929-
if (document.getElementById('new_name').value !== '') {
1930-
var renameObj = new DesignerHistory.Rename(document.getElementById('new_name').value);// make Rename object
1929+
if ((document.getElementById('new_name') as HTMLInputElement).value !== '') {
1930+
var renameObj = new DesignerHistory.Rename((document.getElementById('new_name') as HTMLInputElement).value);// make Rename object
19311931
DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, renameObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Rename'));
19321932
sum = sum + 1;
19331933
}
19341934

1935-
if (document.getElementById('operator').value !== '---') {
1936-
var aggregateObj = new DesignerHistory.Aggregate(document.getElementById('operator').value);
1935+
if ((document.getElementById('operator') as HTMLSelectElement).value !== '---') {
1936+
var aggregateObj = new DesignerHistory.Aggregate((document.getElementById('operator') as HTMLSelectElement).value);
19371937
DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, aggregateObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Aggregate'));
19381938
sum = sum + 1;
19391939
// make aggregate operator
19401940
}
19411941

1942-
if (document.getElementById('groupby').checked === true) {
1942+
if ((document.getElementById('groupby') as HTMLInputElement).checked === true) {
19431943
DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, 'GroupBy', tableName, DesignerConfig.hTabs[dbTableNameUrl], 'GroupBy'));
19441944
sum = sum + 1;
19451945
// make groupby
19461946
}
19471947

1948-
if (document.getElementById('h_rel_opt').value !== '--') {
1949-
if (document.getElementById('having').value === '') {
1948+
if ((document.getElementById('h_rel_opt') as HTMLSelectElement).value !== '--') {
1949+
if ((document.getElementById('having') as HTMLTextAreaElement).value === '') {
19501950
return;
19511951
}
19521952

19531953
whereObj = new DesignerHistory.Having(
1954-
document.getElementById('h_rel_opt').value,
1955-
document.getElementById('having').value,
1956-
document.getElementById('h_operator').value
1954+
(document.getElementById('h_rel_opt') as HTMLSelectElement).value,
1955+
(document.getElementById('having') as HTMLTextAreaElement).value,
1956+
(document.getElementById('h_operator') as HTMLSelectElement).value
19571957
);// make where object
19581958

19591959
DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Having'));
19601960
sum = sum + 1;
19611961
// make having
19621962
}
19631963

1964-
if (document.getElementById('orderby').value !== '---') {
1965-
var orderByObj = new DesignerHistory.OrderBy(document.getElementById('orderby').value);
1964+
if ((document.getElementById('orderby') as HTMLSelectElement).value !== '---') {
1965+
var orderByObj = new DesignerHistory.OrderBy((document.getElementById('orderby') as HTMLSelectElement).value);
19661966
DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, orderByObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'OrderBy'));
19671967
sum = sum + 1;
19681968
// make orderby

‎js/src/jquery.sortable-table.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import $ from 'jquery';
6464
$.error('Method ' + method + ' does not exist on jQuery.sortableTable');
6565
}
6666

67-
function SortableTableInstance (table, options = {}) {
67+
function SortableTableInstance (table, options: {ignoreRect?: any, events?: any} = {}) {
6868
var down = false;
6969
var $draggedEl;
7070
var oldCell;

‎js/src/modules/ajax.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@ const AJAX = {
911911
return;
912912
}
913913

914+
// @ts-ignore
914915
var state = event.originalEvent.state;
915916
if (state && state.menu) {
916917
AJAX.$msgbox = ajaxShowMessage();
@@ -985,6 +986,12 @@ const AJAX = {
985986
}
986987
};
987988

989+
declare global {
990+
interface Window {
991+
AJAX: typeof AJAX;
992+
}
993+
}
994+
988995
window.AJAX = AJAX;
989996

990997
export { AJAX };

‎js/src/modules/functions.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3838,6 +3838,7 @@ $.fn.getPostData = Functions.getPostData;
38383838
declare global {
38393839
interface Window {
38403840
codeMirrorEditor: CodeMirror.EditorFromTextArea | null;
3841+
recaptchaCallback: () => void;
38413842
Functions: typeof Functions;
38423843
}
38433844
}

‎js/src/modules/indexes.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ function showAddIndexDialog (sourceArray, arrayIndex, targetColumns, colIndex, i
304304
'table': table,
305305
'ajax_request': 1,
306306
'create_edit_table': 1,
307-
'index': index
307+
'index': index,
308+
'columns': '',
308309
};
309310

310311
var columns = {};
@@ -355,7 +356,7 @@ function showAddIndexDialog (sourceArray, arrayIndex, targetColumns, colIndex, i
355356
}
356357

357358
$('#addIndexModal').on('keypress', function (e) {
358-
if (e.which === 13 || e.keyCode === 13 || window.event.keyCode === 13) {
359+
if (e.which === 13 || e.keyCode === 13 || (window.event as KeyboardEvent).keyCode === 13) {
359360
e.preventDefault();
360361
console.log('BOOM');
361362
addIndexGo(sourceArray, arrayIndex, index, colIndex);
@@ -693,11 +694,11 @@ function on () {
693694
$('body').on('change', 'select[name*="field_key"]', function (e, showDialog) {
694695
var showDialogLocal = typeof showDialog !== 'undefined' ? showDialog : true;
695696
// Index of column on Table edit and create page.
696-
var colIndex = /\d+/.exec($(this).attr('name'));
697-
colIndex = colIndex[0];
697+
var colIndexRegEx = /\d+/.exec($(this).attr('name'));
698+
const colIndex = colIndexRegEx[0];
698699
// Choice of selected index.
699-
var indexChoice = /[a-z]+/.exec($(this).val());
700-
indexChoice = indexChoice[0];
700+
var indexChoiceRegEx = /[a-z]+/.exec($(this).val());
701+
const indexChoice = indexChoiceRegEx[0];
701702
// Array containing corresponding indexes.
702703
var sourceArray = null;
703704

@@ -770,7 +771,7 @@ function on () {
770771
}
771772
});
772773

773-
$('#index_frm').on('submit', function () {
774+
($('#index_frm') as JQuery<HTMLFormElement>).on('submit', function () {
774775
if (typeof (this.elements['index[Key_name]'].disabled) !== 'undefined') {
775776
this.elements['index[Key_name]'].disabled = false;
776777
}

0 commit comments

Comments
 (0)