From 184882653205815ed69c7552329215e3b8efe063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 1 Aug 2017 14:32:00 +0200 Subject: [PATCH 1/6] Add another test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #13522 Signed-off-by: Michal Čihař --- test/libraries/PMA_transformation_test.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/libraries/PMA_transformation_test.php b/test/libraries/PMA_transformation_test.php index 5e33e414a0..9223de89bf 100644 --- a/test/libraries/PMA_transformation_test.php +++ b/test/libraries/PMA_transformation_test.php @@ -286,6 +286,10 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase 'image_jpeg_link.php', 'Image_JPEG_Link.php' ), + array( + 'text_plain_dateformat.php', + 'Text_Plain_Dateformat.php' + ), ); } } From 23866a587537803fe70ba85a86ae0e13cb42d323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 2 Aug 2017 08:07:36 +0200 Subject: [PATCH 2/6] Simplify code by removing not needed variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue #13550 Signed-off-by: Michal Čihař --- js/functions.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/js/functions.js b/js/functions.js index 220c29dbed..e8dc6816d5 100644 --- a/js/functions.js +++ b/js/functions.js @@ -4614,35 +4614,26 @@ function copyToClipboard() textArea.value = ''; - var elementList = $('#serverinfo a'); - - elementList.each(function(){ + $('#serverinfo a').each(function(){ textArea.value += $(this).text().split(':')[1].trim() + '/'; }); textArea.value += '\t\t' + window.location.href; textArea.value += '\n'; - elementList = $('.notice,.success'); - - elementList.each(function(){ + $('.notice,.success').each(function(){ textArea.value += $(this).clone().children().remove().end().text() + '\n\n'; }); - elementList = $('.sql pre'); - - elementList.each(function() { + $('.sql pre').each(function() { textArea.value += $(this).text() + '\n\n'; }); - elementList = $('.table_results .column_heading a'); - - elementList.each(function() { + $('.table_results .column_heading a').each(function() { textArea.value += $(this).clone().children().remove().end().text() + '\t'; }); textArea.value += '\n'; - elementList = $('tbody tr'); - elementList.each(function() { + $('tbody tr').each(function() { var childElementList = $(this).find('.data span'); childElementList.each(function(){ textArea.value += $(this).clone().children().remove().end().text() + '\t'; From 33dd51eaf7cc6b28a5b160cf1974434c36254a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 2 Aug 2017 08:10:19 +0200 Subject: [PATCH 3/6] Move SQL copy handler to sql.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue #13550 Signed-off-by: Michal Čihař --- js/functions.js | 85 ------------------------------------------------- js/sql.js | 81 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 79 insertions(+), 87 deletions(-) diff --git a/js/functions.js b/js/functions.js index e8dc6816d5..e415820faa 100644 --- a/js/functions.js +++ b/js/functions.js @@ -4569,91 +4569,6 @@ function printPage(){ } } -/** - * Print button - */ -function copyToClipboard() -{ - var textArea = document.createElement("textarea"); - - // - // *** This styling is an extra step which is likely not required. *** - // - // Why is it here? To ensure: - // 1. the element is able to have focus and selection. - // 2. if element was to flash render it has minimal visual impact. - // 3. less flakyness with selection and copying which **might** occur if - // the textarea element is not visible. - // - // The likelihood is the element won't even render, not even a flash, - // so some of these are just precautions. However in IE the element - // is visible whilst the popup box asking the user for permission for - // the web page to copy to the clipboard. - // - - // Place in top-left corner of screen regardless of scroll position. - textArea.style.position = 'fixed'; - textArea.style.top = 0; - textArea.style.left = 0; - - // Ensure it has a small width and height. Setting to 1px / 1em - // doesn't work as this gives a negative w/h on some browsers. - textArea.style.width = '2em'; - textArea.style.height = '2em'; - - // We don't need padding, reducing the size if it does flash render. - textArea.style.padding = 0; - - // Clean up any borders. - textArea.style.border = 'none'; - textArea.style.outline = 'none'; - textArea.style.boxShadow = 'none'; - - // Avoid flash of white box if rendered for any reason. - textArea.style.background = 'transparent'; - - textArea.value = ''; - - $('#serverinfo a').each(function(){ - textArea.value += $(this).text().split(':')[1].trim() + '/'; - }); - textArea.value += '\t\t' + window.location.href; - textArea.value += '\n'; - - $('.notice,.success').each(function(){ - textArea.value += $(this).clone().children().remove().end().text() + '\n\n'; - }); - - $('.sql pre').each(function() { - textArea.value += $(this).text() + '\n\n'; - }); - - $('.table_results .column_heading a').each(function() { - textArea.value += $(this).clone().children().remove().end().text() + '\t'; - }); - - textArea.value += '\n'; - $('tbody tr').each(function() { - var childElementList = $(this).find('.data span'); - childElementList.each(function(){ - textArea.value += $(this).clone().children().remove().end().text() + '\t'; - }); - textArea.value += '\n'; - }); - - document.body.appendChild(textArea); - - textArea.select(); - - try { - document.execCommand('copy'); - } catch (err) { - alert('Sorry! Unable to copy'); - } - - document.body.removeChild(textArea); -} - /** * Unbind all event handlers before tearing down a page */ diff --git a/js/sql.js b/js/sql.js index f2babd3dd3..fc0fb31ee3 100644 --- a/js/sql.js +++ b/js/sql.js @@ -214,8 +214,85 @@ AJAX.registerOnload('sql.js', function () { $(document).on('click', "#copyToClipBoard", function (event) { event.preventDefault(); - // Print the page - copyToClipboard(); + var textArea = document.createElement("textarea"); + + // + // *** This styling is an extra step which is likely not required. *** + // + // Why is it here? To ensure: + // 1. the element is able to have focus and selection. + // 2. if element was to flash render it has minimal visual impact. + // 3. less flakyness with selection and copying which **might** occur if + // the textarea element is not visible. + // + // The likelihood is the element won't even render, not even a flash, + // so some of these are just precautions. However in IE the element + // is visible whilst the popup box asking the user for permission for + // the web page to copy to the clipboard. + // + + // Place in top-left corner of screen regardless of scroll position. + textArea.style.position = 'fixed'; + textArea.style.top = 0; + textArea.style.left = 0; + + // Ensure it has a small width and height. Setting to 1px / 1em + // doesn't work as this gives a negative w/h on some browsers. + textArea.style.width = '2em'; + textArea.style.height = '2em'; + + // We don't need padding, reducing the size if it does flash render. + textArea.style.padding = 0; + + // Clean up any borders. + textArea.style.border = 'none'; + textArea.style.outline = 'none'; + textArea.style.boxShadow = 'none'; + + // Avoid flash of white box if rendered for any reason. + textArea.style.background = 'transparent'; + + textArea.value = ''; + + $('#serverinfo a').each(function(){ + textArea.value += $(this).text().split(':')[1].trim() + '/'; + }); + textArea.value += '\t\t' + window.location.href; + textArea.value += '\n'; + + $('.notice,.success').each(function(){ + textArea.value += $(this).clone().children().remove().end().text() + '\n\n'; + }); + + $('.sql pre').each(function() { + textArea.value += $(this).text() + '\n\n'; + }); + + $('.table_results .column_heading a').each(function() { + textArea.value += $(this).clone().children().remove().end().text() + '\t'; + }); + + textArea.value += '\n'; + $('tbody tr').each(function() { + var childElementList = $(this).find('.data span'); + childElementList.each(function(){ + textArea.value += $(this).clone().children().remove().end().text() + '\t'; + }); + textArea.value += '\n'; + }); + + document.body.appendChild(textArea); + + textArea.select(); + + try { + document.execCommand('copy'); + } catch (err) { + alert('Sorry! Unable to copy'); + } + + document.body.removeChild(textArea); + }); //end of Copy to Clipboard action /** From 12f54fd0cf8ff6d6a09c5abc6de512f9061cd85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 2 Aug 2017 08:12:41 +0200 Subject: [PATCH 4/6] Fixed copy results to clipboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Copy only results table, not all tables on the page. Fixes #13550 Signed-off-by: Michal Čihař --- ChangeLog | 1 + js/sql.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70a4febe35..4beb205f14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - issue #13507 Fixed per server theme feature - issue #13523 Missing newline in ALTER exports - issue #13414 Fixed several compatibility issues with PHP 7.2 +- issue #13550 Fixed copy results to clipboard 4.7.3 (2017-07-20) - issue #13447 Large multi-line query removes Export operation and blanks query box options diff --git a/js/sql.js b/js/sql.js index fc0fb31ee3..5fc16bec8f 100644 --- a/js/sql.js +++ b/js/sql.js @@ -273,7 +273,7 @@ AJAX.registerOnload('sql.js', function () { }); textArea.value += '\n'; - $('tbody tr').each(function() { + $('.table_results tbody tr').each(function() { var childElementList = $(this).find('.data span'); childElementList.each(function(){ textArea.value += $(this).clone().children().remove().end().text() + '\t'; From 626c2b3a29de466724c34896ff0ff3a83ba2f42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 2 Aug 2017 08:14:12 +0200 Subject: [PATCH 5/6] Remove not needed variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- js/sql.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index 5fc16bec8f..08637b174c 100644 --- a/js/sql.js +++ b/js/sql.js @@ -274,8 +274,7 @@ AJAX.registerOnload('sql.js', function () { textArea.value += '\n'; $('.table_results tbody tr').each(function() { - var childElementList = $(this).find('.data span'); - childElementList.each(function(){ + $(this).find('.data span').each(function(){ textArea.value += $(this).clone().children().remove().end().text() + '\t'; }); textArea.value += '\n'; From ef891b2bba9a45aad42ccc203528a8f8df22f513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 2 Aug 2017 08:18:37 +0200 Subject: [PATCH 6/6] Simplify code for copying to clipboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Honestly I don't understand the old code, but it breaks on fields with applied transformations, while using simply text() works fine. Signed-off-by: Michal Čihař --- js/sql.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/sql.js b/js/sql.js index 08637b174c..376f8a090e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -261,7 +261,7 @@ AJAX.registerOnload('sql.js', function () { textArea.value += '\n'; $('.notice,.success').each(function(){ - textArea.value += $(this).clone().children().remove().end().text() + '\n\n'; + textArea.value += $(this).text() + '\n\n'; }); $('.sql pre').each(function() { @@ -269,13 +269,13 @@ AJAX.registerOnload('sql.js', function () { }); $('.table_results .column_heading a').each(function() { - textArea.value += $(this).clone().children().remove().end().text() + '\t'; + textArea.value += $(this).text() + '\t'; }); textArea.value += '\n'; $('.table_results tbody tr').each(function() { $(this).find('.data span').each(function(){ - textArea.value += $(this).clone().children().remove().end().text() + '\t'; + textArea.value += $(this).text() + '\t'; }); textArea.value += '\n'; });