Skip to content

Commit c888ecc

Browse files
MauricioFauthMauricioFauth
committed
Remove Functions.sprintf() function
Use the sprintf global function directly. This removes the direct dependency on Functions from modules/common.js. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent b98fcd2 commit c888ecc

23 files changed

+54
-57
lines changed

‎js/global.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ declare var firstDayOfCalendar: string;
66
declare var themeImagePath: string;
77
declare var mysqlDocTemplate: string;
88
declare var maxInputVars: number;
9+
10+
declare function sprintf(format: string, ...values: (string|number)[]): string;

‎js/src/database/operations.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ AJAX.registerOnload('database/operations.js', function () {
152152
* @var {String} question String containing the question to be asked for confirmation
153153
*/
154154
var question = window.Messages.strDropDatabaseStrongWarning + ' ';
155-
question += Functions.sprintf(
155+
question += window.sprintf(
156156
window.Messages.strDoYouReally,
157157
'DROP DATABASE `' + Functions.escapeHtml(CommonParams.get('db') + '`')
158158
);

‎js/src/database/qbe.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ AJAX.registerOnload('database/qbe.js', function () {
7474
* Ajax event handlers for 'Delete bookmark'
7575
*/
7676
$(document).on('click', '#deleteSearch', function () {
77-
var question = Functions.sprintf(window.Messages.strConfirmDeleteQBESearch, $('#searchId').find('option:selected').text());
77+
var question = window.sprintf(window.Messages.strConfirmDeleteQBESearch, $('#searchId').find('option:selected').text());
7878
if (!confirm(question)) {
7979
return false;
8080
}

‎js/src/database/search.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ AJAX.registerOnload('database/search.js', function () {
163163
$('#sqlqueryform').hide();
164164
$('#togglequerybox').hide();
165165
/** Conformation message for deletion */
166-
var msg = Functions.sprintf(
166+
var msg = window.sprintf(
167167
window.Messages.strConfirmDeleteResults,
168168
$(this).data('table-name')
169169
);

‎js/src/database/structure.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ DatabaseStructure.adjustTotals = function () {
133133

134134
// Update summary with new data
135135
var $summary = $('#tbl_summary_row');
136-
$summary.find('.tbl_num').text(Functions.sprintf(window.Messages.strNTables, tableSum));
136+
$summary.find('.tbl_num').text(window.sprintf(window.Messages.strNTables, tableSum));
137137
if (rowSumApproximated) {
138138
$summary.find('.row_count_sum').text(strRowSum);
139139
} else {
@@ -327,7 +327,7 @@ AJAX.registerOnload('database/structure.js', function () {
327327
* @var question String containing the question to be asked for confirmation
328328
*/
329329
var question = window.Messages.strTruncateTableStrongWarning + ' ' +
330-
Functions.sprintf(window.Messages.strDoYouReally, 'TRUNCATE `' + Functions.escapeHtml(currTableName) + '`') +
330+
window.sprintf(window.Messages.strDoYouReally, 'TRUNCATE `' + Functions.escapeHtml(currTableName) + '`') +
331331
Functions.getForeignKeyCheckboxLoader();
332332

333333
$thisAnchor.confirm(question, $thisAnchor.attr('href'), function (url) {
@@ -377,10 +377,10 @@ AJAX.registerOnload('database/structure.js', function () {
377377
var question;
378378
if (! isView) {
379379
question = window.Messages.strDropTableStrongWarning + ' ' +
380-
Functions.sprintf(window.Messages.strDoYouReally, 'DROP TABLE `' + Functions.escapeHtml(currTableName) + '`');
380+
window.sprintf(window.Messages.strDoYouReally, 'DROP TABLE `' + Functions.escapeHtml(currTableName) + '`');
381381
} else {
382382
question =
383-
Functions.sprintf(window.Messages.strDoYouReally, 'DROP VIEW `' + Functions.escapeHtml(currTableName) + '`');
383+
window.sprintf(window.Messages.strDoYouReally, 'DROP VIEW `' + Functions.escapeHtml(currTableName) + '`');
384384
}
385385
question += Functions.getForeignKeyCheckboxLoader();
386386

‎js/src/designer/move.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ DesignerMove.addOtherDbTables = function () {
676676
var $table = $('[id="' + encodeURIComponent(db) + '.' + encodeURIComponent(table) + '"]');
677677
if ($table.length !== 0) {
678678
Functions.ajaxShowMessage(
679-
Functions.sprintf(window.Messages.strTableAlreadyExists, db + '.' + table),
679+
window.sprintf(window.Messages.strTableAlreadyExists, db + '.' + table),
680680
undefined,
681681
'error'
682682
);
@@ -1913,7 +1913,7 @@ DesignerMove.addObject = function (dbName, tableName, colName, dbTableNameUrl) {
19131913
var init = historyArray.length;
19141914
if (rel.value !== '--') {
19151915
if (document.getElementById('Query').value === '') {
1916-
Functions.ajaxShowMessage(Functions.sprintf(window.Messages.strQueryEmpty));
1916+
Functions.ajaxShowMessage(window.sprintf(window.Messages.strQueryEmpty));
19171917
return;
19181918
}
19191919
p = document.getElementById('Query');
@@ -1956,7 +1956,7 @@ DesignerMove.addObject = function (dbName, tableName, colName, dbTableNameUrl) {
19561956
sum = sum + 1;
19571957
// make orderby
19581958
}
1959-
Functions.ajaxShowMessage(Functions.sprintf(window.Messages.strObjectsCreated, sum));
1959+
Functions.ajaxShowMessage(window.sprintf(window.Messages.strObjectsCreated, sum));
19601960
// output sum new objects created
19611961
var existingDiv = document.getElementById('ab');
19621962
existingDiv.innerHTML = DesignerHistory.display(init, historyArray.length);

‎js/src/gis_data_editor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function prepareJSVersion () {
6565
*/
6666
function addDataPoint (pointNumber, prefix) {
6767
return '<br>' +
68-
Functions.sprintf(window.Messages.strPointN, (pointNumber + 1)) + ': ' +
68+
window.sprintf(window.Messages.strPointN, (pointNumber + 1)) + ': ' +
6969
'<label for="x">' + window.Messages.strX + '</label>' +
7070
'<input type="text" name="' + prefix + '[' + pointNumber + '][x]" value="">' +
7171
'<label for="y">' + window.Messages.strY + '</label>' +

‎js/src/import.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ AJAX.registerOnload('import.js', function () {
201201
now.getMinutes(),
202202
now.getSeconds()
203203
) + now.getMilliseconds() - 1000;
204-
var statusText = Functions.sprintf(
204+
var statusText = window.sprintf(
205205
window.Messages.uploadProgressStatusText,
206206
Functions.formatBytes(
207207
complete, 1, window.Messages.strDecimalSeparator
@@ -227,7 +227,7 @@ AJAX.registerOnload('import.js', function () {
227227
// Calculate estimated time
228228
var usedTime = now - importStart;
229229
var seconds = parseInt(((total - complete) / complete) * usedTime / 1000);
230-
var speed = Functions.sprintf(
230+
var speed = window.sprintf(
231231
window.Messages.uploadProgressPerSecond,
232232
Functions.formatBytes(complete / usedTime * 1000, 1, window.Messages.strDecimalSeparator)
233233
);

‎js/src/modules/ajax.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,9 +924,9 @@ const AJAX = {
924924
}
925925

926926
if (request.status !== 0) {
927-
details += '<div>' + Functions.escapeHtml(Functions.sprintf(window.Messages.strErrorCode, request.status)) + '</div>';
927+
details += '<div>' + Functions.escapeHtml(window.sprintf(window.Messages.strErrorCode, request.status)) + '</div>';
928928
}
929-
details += '<div>' + Functions.escapeHtml(Functions.sprintf(window.Messages.strErrorText, request.statusText + ' (' + state + ')')) + '</div>';
929+
details += '<div>' + Functions.escapeHtml(window.sprintf(window.Messages.strErrorText, request.statusText + ' (' + state + ')')) + '</div>';
930930
if (state === 'rejected' || state === 'timeout') {
931931
details += '<div>' + Functions.escapeHtml(window.Messages.strErrorConnection) + '</div>';
932932
}

‎js/src/modules/common.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import $ from 'jquery';
22
import { AJAX } from './ajax.js';
3-
import { Functions } from './functions.js';
43
import { Navigation } from './navigation.js';
54

65
/**
@@ -94,7 +93,7 @@ const CommonParams = (function () {
9493
common = common.endsWith(argsep) ? common : common + argsep;
9594
}
9695

97-
return Functions.sprintf(
96+
return window.sprintf(
9897
'%s%sserver=%s' + argsep + 'db=%s' + argsep + 'table=%s',
9998
sep,
10099
common,

0 commit comments

Comments
 (0)