Merge remote-tracking branch 'techtonik/patch-1'

This commit is contained in:
Thaddee Tyl 2016-10-15 15:15:26 +02:00
commit f0273ff797

View File

@ -1292,7 +1292,7 @@ function markupDialog(tr) {
var th = tr.firstElementChild;
var link = th.dataset.link? th.dataset.link: '';
// Remove the ?maxAge parameter from the query string.
trimg.replace(/[\?&]maxAge=\d+$|maxAge=\d+&/, '');
trimg = trimg.replace(/[\?&]maxAge=\d+$|maxAge=\d+&/, '');
copyForm.img.value = trimg;
copyForm.url.value = link;
// Insert documentation.
@ -1311,8 +1311,10 @@ function markupDialog(tr) {
var url = copyForm.url.value;
var img = copyForm.img.value;
var style = copyForm.style.value;
// Default style doesn't show.
if (style !== 'flat') { img += '?style=' + style; }
// Default style doesn't need value
if (style !== 'flat') {
img += (img.indexOf('?') != -1 ? '&style=' : '?style=') + style;
}
var md = '[![' + trname + '](' + img + ')](' + url + ')';
var rst = '.. image:: ' + img + ' :target: ' + url;
copyMarkdown.value = md;