diff --git a/js/src/datetimepicker.ts b/js/src/datetimepicker.ts index d2b16d8ee1..8d25651001 100644 --- a/js/src/datetimepicker.ts +++ b/js/src/datetimepicker.ts @@ -75,8 +75,8 @@ function registerDatePickerTranslations () { $.datepicker.regional[''].showMonthAfterYear = window.Messages.strMonthAfterYear === 'calendar-year-month'; $.datepicker.regional[''].yearSuffix = window.Messages.strYearSuffix !== 'none' ? window.Messages.strYearSuffix : ''; - // eslint-disable-next-line no-underscore-dangle - $.extend($.datepicker._defaults, $.datepicker.regional['']); + // @ts-ignore + $.extend($.datepicker._defaults, $.datepicker.regional['']); // eslint-disable-line no-underscore-dangle } function registerTimePickerTranslations () { diff --git a/js/src/designer/history.ts b/js/src/designer/history.ts index 02f0d49710..10f329723d 100644 --- a/js/src/designer/history.ts +++ b/js/src/designer/history.ts @@ -185,19 +185,19 @@ const historyEdit = function (index): void { gIndex = index; var type = DesignerHistory.historyArray[index].getType(); if (type === 'Where') { - document.getElementById('eQuery').value = DesignerHistory.historyArray[index].getObj().getQuery(); - document.getElementById('erel_opt').value = DesignerHistory.historyArray[index].getObj().getRelationOperator(); + (document.getElementById('eQuery') as HTMLTextAreaElement).value = DesignerHistory.historyArray[index].getObj().getQuery(); + (document.getElementById('erel_opt') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getRelationOperator(); DesignerHistory.changeStyle('query_where'); } else if (type === 'Having') { - document.getElementById('hQuery').value = DesignerHistory.historyArray[index].getObj().getQuery(); - document.getElementById('hrel_opt').value = DesignerHistory.historyArray[index].getObj().getRelationOperator(); - document.getElementById('hoperator').value = DesignerHistory.historyArray[index].getObj().getOperator(); + (document.getElementById('hQuery') as HTMLTextAreaElement).value = DesignerHistory.historyArray[index].getObj().getQuery(); + (document.getElementById('hrel_opt') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getRelationOperator(); + (document.getElementById('hoperator') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getOperator(); DesignerHistory.changeStyle('query_having'); } else if (type === 'Rename') { - document.getElementById('e_rename').value = DesignerHistory.historyArray[index].getObj().getRenameTo(); + (document.getElementById('e_rename') as HTMLInputElement).value = DesignerHistory.historyArray[index].getObj().getRenameTo(); DesignerHistory.changeStyle('query_rename_to'); } else if (type === 'Aggregate') { - document.getElementById('e_operator').value = DesignerHistory.historyArray[index].getObj().getOperator(); + (document.getElementById('e_operator') as HTMLSelectElement).value = DesignerHistory.historyArray[index].getObj().getOperator(); DesignerHistory.changeStyle('query_Aggregate'); } }; @@ -210,31 +210,31 @@ const historyEdit = function (index): void { */ const edit = function (type): void { if (type === 'Rename') { - if (document.getElementById('e_rename').value !== '') { - DesignerHistory.historyArray[gIndex].getObj().setRenameTo(document.getElementById('e_rename').value); - document.getElementById('e_rename').value = ''; + if ((document.getElementById('e_rename') as HTMLInputElement).value !== '') { + DesignerHistory.historyArray[gIndex].getObj().setRenameTo((document.getElementById('e_rename') as HTMLInputElement).value); + (document.getElementById('e_rename') as HTMLInputElement).value = ''; } document.getElementById('query_rename_to').style.visibility = 'hidden'; } else if (type === 'Aggregate') { - if (document.getElementById('e_operator').value !== '---') { - DesignerHistory.historyArray[gIndex].getObj().setOperator(document.getElementById('e_operator').value); - document.getElementById('e_operator').value = '---'; + if ((document.getElementById('e_operator') as HTMLSelectElement).value !== '---') { + DesignerHistory.historyArray[gIndex].getObj().setOperator((document.getElementById('e_operator') as HTMLSelectElement).value); + (document.getElementById('e_operator') as HTMLSelectElement).value = '---'; } document.getElementById('query_Aggregate').style.visibility = 'hidden'; } else if (type === 'Where') { - if (document.getElementById('erel_opt').value !== '--' && document.getElementById('eQuery').value !== '') { - DesignerHistory.historyArray[gIndex].getObj().setQuery(document.getElementById('eQuery').value); - DesignerHistory.historyArray[gIndex].getObj().setRelationOperator(document.getElementById('erel_opt').value); + if ((document.getElementById('erel_opt') as HTMLSelectElement).value !== '--' && (document.getElementById('eQuery') as HTMLTextAreaElement).value !== '') { + DesignerHistory.historyArray[gIndex].getObj().setQuery((document.getElementById('eQuery') as HTMLTextAreaElement).value); + DesignerHistory.historyArray[gIndex].getObj().setRelationOperator((document.getElementById('erel_opt') as HTMLSelectElement).value); } document.getElementById('query_where').style.visibility = 'hidden'; } else if (type === 'Having') { - if (document.getElementById('hrel_opt').value !== '--' && document.getElementById('hQuery').value !== '') { - DesignerHistory.historyArray[gIndex].getObj().setQuery(document.getElementById('hQuery').value); - DesignerHistory.historyArray[gIndex].getObj().setRelationOperator(document.getElementById('hrel_opt').value); - DesignerHistory.historyArray[gIndex].getObj().setOperator(document.getElementById('hoperator').value); + if ((document.getElementById('hrel_opt') as HTMLSelectElement).value !== '--' && (document.getElementById('hQuery') as HTMLTextAreaElement).value !== '') { + DesignerHistory.historyArray[gIndex].getObj().setQuery((document.getElementById('hQuery') as HTMLTextAreaElement).value); + DesignerHistory.historyArray[gIndex].getObj().setRelationOperator((document.getElementById('hrel_opt') as HTMLSelectElement).value); + DesignerHistory.historyArray[gIndex].getObj().setOperator((document.getElementById('hoperator') as HTMLSelectElement).value); } document.getElementById('query_having').style.visibility = 'hidden'; diff --git a/js/src/designer/move.ts b/js/src/designer/move.ts index f2e62e0adb..889cc6c20a 100644 --- a/js/src/designer/move.ts +++ b/js/src/designer/move.ts @@ -147,8 +147,8 @@ const mouseUp = function () { // ------------------------------------------------------------------------------ const canvasPos = function () { - canvasWidth = document.getElementById('canvas').width = osnTabWidth - 3; - canvasHeight = document.getElementById('canvas').height = osnTabHeight - 3; + canvasWidth = (document.getElementById('canvas') as HTMLCanvasElement).width = osnTabWidth - 3; + canvasHeight = (document.getElementById('canvas') as HTMLCanvasElement).height = osnTabHeight - 3; }; const osnTabPos = function () { @@ -272,8 +272,8 @@ const reload = function () { // table name for (key3 in DesignerConfig.contr[K][key][key2]) { // field name - if (! document.getElementById('check_vis_' + key2).checked || - ! document.getElementById('check_vis_' + DesignerConfig.contr[K][key][key2][key3][0]).checked) { + if (! (document.getElementById('check_vis_' + key2) as HTMLInputElement).checked || + ! (document.getElementById('check_vis_' + DesignerConfig.contr[K][key][key2][key3][0]) as HTMLInputElement).checked) { // if hide continue; } @@ -373,7 +373,7 @@ const reload = function () { * @param colorLine */ const line = function (x1, y1, x2, y2, colorLine) { - var canvas = document.getElementById('canvas'); + var canvas = (document.getElementById('canvas') as HTMLCanvasElement); var ctx = canvas.getContext('2d'); ctx.strokeStyle = colorLine; ctx.lineWidth = 1; @@ -488,7 +488,7 @@ const line3 = function (x1, y1, x2, y2, colorLine) { }; const circle = function (x, y, r, w, color) { - var ctx = document.getElementById('canvas').getContext('2d'); + var ctx = (document.getElementById('canvas') as HTMLCanvasElement).getContext('2d'); ctx.beginPath(); ctx.moveTo(x, y); ctx.lineWidth = w; @@ -498,13 +498,13 @@ const circle = function (x, y, r, w, color) { }; const clear = function () { - var canvas = document.getElementById('canvas'); + var canvas = (document.getElementById('canvas') as HTMLCanvasElement); var ctx = canvas.getContext('2d'); ctx.clearRect(0, 0, canvasWidth, canvasHeight); }; const rect = function (x1, y1, w, h, color) { - var ctx = document.getElementById('canvas').getContext('2d'); + var ctx = (document.getElementById('canvas') as HTMLCanvasElement).getContext('2d'); ctx.fillStyle = color; ctx.fillRect(x1, y1, w, h); }; @@ -711,13 +711,13 @@ const newPage = function () { // (del?) no for pdf const save = function (url) { for (var key in DesignerConfig.jTabs) { - document.getElementById('t_x_' + key + '_').value = parseInt(document.getElementById(key).style.left, 10); - document.getElementById('t_y_' + key + '_').value = parseInt(document.getElementById(key).style.top, 10); - document.getElementById('t_v_' + key + '_').value = document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1; - document.getElementById('t_h_' + key + '_').value = document.getElementById('check_vis_' + key).checked ? 1 : 0; + (document.getElementById('t_x_' + key + '_') as HTMLInputElement).value = parseInt(document.getElementById(key).style.left, 10); + (document.getElementById('t_y_' + key + '_') as HTMLInputElement).value = parseInt(document.getElementById(key).style.top, 10); + (document.getElementById('t_v_' + key + '_') as HTMLInputElement).value = document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1; + (document.getElementById('t_h_' + key + '_') as HTMLInputElement).value = (document.getElementById('check_vis_' + key) as HTMLInputElement).checked ? 1 : 0; } - document.getElementById('container-form').action = url; + (document.getElementById('container-form') as HTMLFormElement).action = url; $('#container-form').trigger('submit'); }; @@ -1800,15 +1800,15 @@ const clickOption = function (dbName, tableName, columnName, tableDbNameUrl, opt const closeOption = function () { document.getElementById('designer_optionse').style.display = 'none'; - document.getElementById('rel_opt').value = '--'; - document.getElementById('Query').value = ''; - document.getElementById('new_name').value = ''; - document.getElementById('operator').value = '---'; - document.getElementById('groupby').checked = false; - document.getElementById('h_rel_opt').value = '--'; - document.getElementById('h_operator').value = '---'; - document.getElementById('having').value = ''; - document.getElementById('orderby').value = '---'; + (document.getElementById('rel_opt') as HTMLSelectElement).value = '--'; + (document.getElementById('Query') as HTMLTextAreaElement).value = ''; + (document.getElementById('new_name') as HTMLInputElement).value = ''; + (document.getElementById('operator') as HTMLSelectElement).value = '---'; + (document.getElementById('groupby') as HTMLInputElement).checked = false; + (document.getElementById('h_rel_opt') as HTMLSelectElement).value = '--'; + (document.getElementById('h_operator') as HTMLSelectElement).value = '---'; + (document.getElementById('having') as HTMLTextAreaElement).value = ''; + (document.getElementById('orderby') as HTMLSelectElement).value = '---'; }; const selectAll = function (tableName, dbName, idSelectAll) { @@ -1877,7 +1877,7 @@ const storeColumn = function (tableName, colName, checkboxId) { var i; var k; var selectKeyField = '`' + tableName + '`.`' + colName + '`'; - if (document.getElementById(checkboxId).checked === true) { + if ((document.getElementById(checkboxId) as HTMLInputElement).checked === true) { DesignerHistory.selectField.push(selectKeyField); window.fromArray.push(tableName); } else { @@ -1910,50 +1910,50 @@ const storeColumn = function (tableName, colName, checkboxId) { const addObject = function (dbName, tableName, colName, dbTableNameUrl) { var p; var whereObj; - var rel = document.getElementById('rel_opt'); + var rel = (document.getElementById('rel_opt') as HTMLSelectElement); var sum = 0; var init = DesignerHistory.historyArray.length; if (rel.value !== '--') { - if (document.getElementById('Query').value === '') { + if ((document.getElementById('Query') as HTMLTextAreaElement).value === '') { ajaxShowMessage(window.sprintf(window.Messages.strQueryEmpty)); return; } - p = document.getElementById('Query'); + p = (document.getElementById('Query') as HTMLTextAreaElement); whereObj = new DesignerHistory.Where(rel.value, p.value);// make where object DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Where')); sum = sum + 1; } - if (document.getElementById('new_name').value !== '') { - var renameObj = new DesignerHistory.Rename(document.getElementById('new_name').value);// make Rename object + if ((document.getElementById('new_name') as HTMLInputElement).value !== '') { + var renameObj = new DesignerHistory.Rename((document.getElementById('new_name') as HTMLInputElement).value);// make Rename object DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, renameObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Rename')); sum = sum + 1; } - if (document.getElementById('operator').value !== '---') { - var aggregateObj = new DesignerHistory.Aggregate(document.getElementById('operator').value); + if ((document.getElementById('operator') as HTMLSelectElement).value !== '---') { + var aggregateObj = new DesignerHistory.Aggregate((document.getElementById('operator') as HTMLSelectElement).value); DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, aggregateObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Aggregate')); sum = sum + 1; // make aggregate operator } - if (document.getElementById('groupby').checked === true) { + if ((document.getElementById('groupby') as HTMLInputElement).checked === true) { DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, 'GroupBy', tableName, DesignerConfig.hTabs[dbTableNameUrl], 'GroupBy')); sum = sum + 1; // make groupby } - if (document.getElementById('h_rel_opt').value !== '--') { - if (document.getElementById('having').value === '') { + if ((document.getElementById('h_rel_opt') as HTMLSelectElement).value !== '--') { + if ((document.getElementById('having') as HTMLTextAreaElement).value === '') { return; } whereObj = new DesignerHistory.Having( - document.getElementById('h_rel_opt').value, - document.getElementById('having').value, - document.getElementById('h_operator').value + (document.getElementById('h_rel_opt') as HTMLSelectElement).value, + (document.getElementById('having') as HTMLTextAreaElement).value, + (document.getElementById('h_operator') as HTMLSelectElement).value );// make where object DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, whereObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'Having')); @@ -1961,8 +1961,8 @@ const addObject = function (dbName, tableName, colName, dbTableNameUrl) { // make having } - if (document.getElementById('orderby').value !== '---') { - var orderByObj = new DesignerHistory.OrderBy(document.getElementById('orderby').value); + if ((document.getElementById('orderby') as HTMLSelectElement).value !== '---') { + var orderByObj = new DesignerHistory.OrderBy((document.getElementById('orderby') as HTMLSelectElement).value); DesignerHistory.historyArray.push(new DesignerHistory.HistoryObj(colName, orderByObj, tableName, DesignerConfig.hTabs[dbTableNameUrl], 'OrderBy')); sum = sum + 1; // make orderby diff --git a/js/src/jquery.sortable-table.ts b/js/src/jquery.sortable-table.ts index cfc4439d06..2a7c55e2ff 100644 --- a/js/src/jquery.sortable-table.ts +++ b/js/src/jquery.sortable-table.ts @@ -64,7 +64,7 @@ import $ from 'jquery'; $.error('Method ' + method + ' does not exist on jQuery.sortableTable'); } - function SortableTableInstance (table, options = {}) { + function SortableTableInstance (table, options: {ignoreRect?: any, events?: any} = {}) { var down = false; var $draggedEl; var oldCell; diff --git a/js/src/modules/ajax.ts b/js/src/modules/ajax.ts index f55fd9a323..12ec90f22e 100644 --- a/js/src/modules/ajax.ts +++ b/js/src/modules/ajax.ts @@ -911,6 +911,7 @@ const AJAX = { return; } + // @ts-ignore var state = event.originalEvent.state; if (state && state.menu) { AJAX.$msgbox = ajaxShowMessage(); @@ -985,6 +986,12 @@ const AJAX = { } }; +declare global { + interface Window { + AJAX: typeof AJAX; + } +} + window.AJAX = AJAX; export { AJAX }; diff --git a/js/src/modules/functions.ts b/js/src/modules/functions.ts index 0beab20f3a..19990109e3 100644 --- a/js/src/modules/functions.ts +++ b/js/src/modules/functions.ts @@ -3838,6 +3838,7 @@ $.fn.getPostData = Functions.getPostData; declare global { interface Window { codeMirrorEditor: CodeMirror.EditorFromTextArea | null; + recaptchaCallback: () => void; Functions: typeof Functions; } } diff --git a/js/src/modules/indexes.ts b/js/src/modules/indexes.ts index f20906e051..872d795b91 100644 --- a/js/src/modules/indexes.ts +++ b/js/src/modules/indexes.ts @@ -304,7 +304,8 @@ function showAddIndexDialog (sourceArray, arrayIndex, targetColumns, colIndex, i 'table': table, 'ajax_request': 1, 'create_edit_table': 1, - 'index': index + 'index': index, + 'columns': '', }; var columns = {}; @@ -355,7 +356,7 @@ function showAddIndexDialog (sourceArray, arrayIndex, targetColumns, colIndex, i } $('#addIndexModal').on('keypress', function (e) { - if (e.which === 13 || e.keyCode === 13 || window.event.keyCode === 13) { + if (e.which === 13 || e.keyCode === 13 || (window.event as KeyboardEvent).keyCode === 13) { e.preventDefault(); console.log('BOOM'); addIndexGo(sourceArray, arrayIndex, index, colIndex); @@ -693,11 +694,11 @@ function on () { $('body').on('change', 'select[name*="field_key"]', function (e, showDialog) { var showDialogLocal = typeof showDialog !== 'undefined' ? showDialog : true; // Index of column on Table edit and create page. - var colIndex = /\d+/.exec($(this).attr('name')); - colIndex = colIndex[0]; + var colIndexRegEx = /\d+/.exec($(this).attr('name')); + const colIndex = colIndexRegEx[0]; // Choice of selected index. - var indexChoice = /[a-z]+/.exec($(this).val()); - indexChoice = indexChoice[0]; + var indexChoiceRegEx = /[a-z]+/.exec($(this).val()); + const indexChoice = indexChoiceRegEx[0]; // Array containing corresponding indexes. var sourceArray = null; @@ -770,7 +771,7 @@ function on () { } }); - $('#index_frm').on('submit', function () { + ($('#index_frm') as JQuery).on('submit', function () { if (typeof (this.elements['index[Key_name]'].disabled) !== 'undefined') { this.elements['index[Key_name]'].disabled = false; }