From 0aed31b8549e6a78d3c04ab0add96ad5ffcb13d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 27 Nov 2017 13:58:17 +0100 Subject: [PATCH] Remove extension from js images API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now when we use CSS classes, it's up to themes to define this. Signed-off-by: Michal Čihař --- js/ajax.js | 2 +- js/db_search.js | 2 +- js/error_report.js | 6 +++--- js/functions.js | 11 +++++------ js/menu-resizer.js | 6 +++--- js/pmd/history.js | 12 ++++++------ js/server_status_monitor.js | 20 ++++++++++---------- js/server_status_processes.js | 4 ++-- 8 files changed, 31 insertions(+), 32 deletions(-) diff --git a/js/ajax.js b/js/ajax.js index deadb4c750..cb1909f9d7 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -172,7 +172,7 @@ var AJAX = { // Show lock icon if locked targets is not empty. // otherwise remove lock icon if (!jQuery.isEmptyObject(AJAX.lockedTargets)) { - $('#lock_page_icon').html(PMA_getImage('s_lock.png',PMA_messages.strLockToolTip).toString()); + $('#lock_page_icon').html(PMA_getImage('s_lock', PMA_messages.strLockToolTip).toString()); } else { $('#lock_page_icon').html(''); } diff --git a/js/db_search.js b/js/db_search.js index 566f320c6f..81355658d7 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -30,7 +30,7 @@ AJAX.registerTeardown('db_search.js', function () { AJAX.registerOnload('db_search.js', function () { /** Hide the table link in the initial search result */ - var icon = PMA_getImage('s_tbl.png', '', { 'id': 'table-image' }).toString(); + var icon = PMA_getImage('s_tbl', '', { 'id': 'table-image' }).toString(); $('#table-info').prepend(icon).hide(); /** Hide the browse and deleted results in the new search criteria */ diff --git a/js/error_report.js b/js/error_report.js index ef7c9beb60..8843abea23 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -121,7 +121,7 @@ var ErrorReport = { '
' ).append( - PMA_getImage('s_error.png') + PMA_messages.strErrorOccurred + PMA_getImage('s_error') + PMA_messages.strErrorOccurred ); var $buttons = $('
'); @@ -131,11 +131,11 @@ var ErrorReport = { button_html += ''; button_html += ''; - button_html += PMA_getImage('s_cog.png', PMA_messages.strChangeReportSettings); + button_html += PMA_getImage('s_cog', PMA_messages.strChangeReportSettings); button_html += ''; button_html += ''; - button_html += PMA_getImage('b_close.png', PMA_messages.strIgnore); + button_html += PMA_getImage('b_close', PMA_messages.strIgnore); button_html += ''; $buttons.html(button_html); diff --git a/js/functions.js b/js/functions.js index a6c131a394..17617324dc 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1763,7 +1763,7 @@ function getForeignKeyCheckboxLoader () { var html = ''; html += '
'; html += '
'; - html += PMA_getImage('ajax_clock_small.gif'); + html += PMA_getImage('ajax_clock_small'); html += '
'; html += '
'; return html; @@ -3378,7 +3378,7 @@ AJAX.registerOnload('functions.js', function () { values.push('', '', '', ''); } // Add the parsed values to the editor - var drop_icon = PMA_getImage('b_drop.png'); + var drop_icon = PMA_getImage('b_drop'); for (i = 0; i < values.length; i++) { fields += '' + '' + @@ -3392,7 +3392,7 @@ AJAX.registerOnload('functions.js', function () { var dialog = '
' + '
' + '' + title + '' + - '

' + PMA_getImage('s_notice.png') + + '

' + PMA_getImage('s_notice') + PMA_messages.enum_hint + '

' + '' + fields + '
' + '
' + @@ -3615,7 +3615,7 @@ AJAX.registerOnload('functions.js', function () { '' + '' + '' + - PMA_getImage('b_drop.png') + + PMA_getImage('b_drop') + '' ) .find('tr:last') @@ -4970,8 +4970,7 @@ function PMA_getImage(image, alternate, attributes) { retval.attr('title', escapeHtml(alternate)); } // set css classes - var klass = image.replace('.gif', '').replace('.png', ''); - retval.attr('class', 'icon ic_' + klass); + retval.attr('class', 'icon ic_' + image); // set all other attrubutes for (var i in attributes) { if (i == 'src') { diff --git a/js/menu-resizer.js b/js/menu-resizer.js index 3222120566..cd0ec9ff7f 100644 --- a/js/menu-resizer.js +++ b/js/menu-resizer.js @@ -30,8 +30,8 @@ $('#pma_navigation_resizer').css({ 'width': '0px' }); } // Sets the image for the left and right scroll indicator - $('.scrollindicator--left').html($(PMA_getImage('b_left.png').toString())); - $('.scrollindicator--right').html($(PMA_getImage('b_right.png').toString())); + $('.scrollindicator--left').html($(PMA_getImage('b_left').toString())); + $('.scrollindicator--right').html($(PMA_getImage('b_right').toString())); // Set the width of the navigation bar without scroll indicator $('.navigationbar').css({ 'width': widthCalculator.call($container) - 60 }); @@ -52,7 +52,7 @@ .on('click', false); // same as event.preventDefault() var img = $container.find('li img'); if (img.length) { - $(PMA_getImage('b_more.png').toString()).prependTo(link); + $(PMA_getImage('b_more').toString()).prependTo(link); } var $submenu = $('
  • ', { 'class': 'submenu' }) .append(link) diff --git a/js/pmd/history.js b/js/pmd/history.js index 955ccea310..69c54f1a6c 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -95,17 +95,17 @@ function display (init, finit) { } else { str += ''; } - str += '' + PMA_getImage('b_sbrowse.png', 'column name') + '' + + str += '' + PMA_getImage('b_sbrowse', 'column name') + '' + '' + history_array[i].get_column_name() + ''; if (history_array[i].get_type() === 'GroupBy' || history_array[i].get_type() === 'OrderBy') { - str += '' + PMA_getImage('s_info.png', detail(i)) + '' + + str += '' + PMA_getImage('s_info', detail(i)) + '' + '' + history_array[i].get_type() + '' + - '' + PMA_getImage('b_drop.png', PMA_messages.strDelete) + ''; + '' + PMA_getImage('b_drop', PMA_messages.strDelete) + ''; } else { - str += '' + PMA_getImage('s_info.png', detail(i)) + '' + + str += '' + PMA_getImage('s_info', detail(i)) + '' + '' + history_array[i].get_type() + '' + - '' + PMA_getImage('b_edit.png', PMA_messages.strEdit) + '' + - '' + PMA_getImage('b_drop.png', PMA_messages.strDelete) + ''; + '' + PMA_getImage('b_edit', PMA_messages.strEdit) + '' + + '' + PMA_getImage('b_drop', PMA_messages.strDelete) + ''; } str += ''; i++; diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 1f68a802f7..efc2f47ee7 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -659,9 +659,9 @@ AJAX.registerOnload('server_status_monitor.js', function () { event.preventDefault(); runtime.redrawCharts = ! runtime.redrawCharts; if (! runtime.redrawCharts) { - $(this).html(PMA_getImage('play.png') + PMA_messages.strResumeMonitor); + $(this).html(PMA_getImage('play') + PMA_messages.strResumeMonitor); } else { - $(this).html(PMA_getImage('pause.png') + PMA_messages.strPauseMonitor); + $(this).html(PMA_getImage('pause') + PMA_messages.strPauseMonitor); if (! runtime.charts) { initGrid(); $('a[href="#settingsPopup"]').show(); @@ -694,7 +694,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { } else { return serverResponseError(); } - var icon = PMA_getImage('s_success.png'); + var icon = PMA_getImage('s_success'); var msg = ''; var str = ''; @@ -711,7 +711,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { } if (msg.length === 0) { - icon = PMA_getImage('s_error.png'); + icon = PMA_getImage('s_error'); msg = PMA_messages.strBothLogOff; } @@ -719,20 +719,20 @@ AJAX.registerOnload('server_status_monitor.js', function () { str += icon + msg + '
    '; if (logVars.log_output !== 'TABLE') { - str += PMA_getImage('s_error.png') + ' ' + PMA_messages.strLogOutNotTable + '
    '; + str += PMA_getImage('s_error') + ' ' + PMA_messages.strLogOutNotTable + '
    '; } else { - str += PMA_getImage('s_success.png') + ' ' + PMA_messages.strLogOutIsTable + '
    '; + str += PMA_getImage('s_success') + ' ' + PMA_messages.strLogOutIsTable + '
    '; } if (logVars.slow_query_log === 'ON') { if (logVars.long_query_time > 2) { - str += PMA_getImage('s_attention.png') + ' '; + str += PMA_getImage('s_attention') + ' '; str += PMA_sprintf(PMA_messages.strSmallerLongQueryTimeAdvice, logVars.long_query_time); str += '
    '; } if (logVars.long_query_time < 2) { - str += PMA_getImage('s_success.png') + ' '; + str += PMA_getImage('s_success') + ' '; str += PMA_sprintf(PMA_messages.strLongQueryTimeSet, logVars.long_query_time); str += '
    '; } @@ -1912,7 +1912,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { // Append a tooltip to the count column, if there exist one if ($('#logTable').find('tr:first th:last').text().indexOf('#') > -1) { - $('#logTable').find('tr:first th:last').append(' ' + PMA_getImage('b_help.png', '', { 'class': 'qroupedQueryInfoIcon' })); + $('#logTable').find('tr:first th:last').append(' ' + PMA_getImage('b_help', '', { 'class': 'qroupedQueryInfoIcon' })); var tooltipContent = PMA_messages.strCountColumnExplanation; if (groupInserts) { @@ -2151,7 +2151,7 @@ function serverResponseError () { }; $('#emptyDialog').dialog({ title: PMA_messages.strRefreshFailed }); $('#emptyDialog').html( - PMA_getImage('s_attention.png') + + PMA_getImage('s_attention') + PMA_messages.strInvalidResponseExplanation ); $('#emptyDialog').dialog({ buttons: btns }); diff --git a/js/server_status_processes.js b/js/server_status_processes.js index 55c3176f63..928c10b328 100644 --- a/js/server_status_processes.js +++ b/js/server_status_processes.js @@ -122,10 +122,10 @@ var processList = { * @return void */ setRefreshLabel: function () { - var img = 'play.png'; + var img = 'play'; var label = PMA_messages.strStartRefresh; if (processList.autoRefresh) { - img = 'pause.png'; + img = 'pause'; label = PMA_messages.strStopRefresh; processList.refresh(); }