From dbec517d35e783db2ba3306f709244b929610647 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 24 Jun 2019 13:41:04 +0800 Subject: [PATCH] * Fix burn.js. --- module/misc/lang/en.php | 2 +- module/misc/lang/zh-cn.php | 2 +- module/misc/lang/zh-tw.php | 2 +- module/project/js/burn.js | 36 ++++++++++++++++++++++++++++++------ 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 6f610977c9..fd0aa5fb64 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -75,7 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Details'; -$lang->misc->releaseDate['11.5.1'] = '2019-06-21'; +$lang->misc->releaseDate['11.5.1'] = '2019-06-24'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 6c08c58a2a..fe8a7dc657 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -75,7 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; -$lang->misc->releaseDate['11.5.1'] = '2019-06-21'; +$lang->misc->releaseDate['11.5.1'] = '2019-06-24'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index a764fac631..931968c1b3 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -75,7 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '詳情'; -$lang->misc->releaseDate['11.5.1'] = '2019-06-21'; +$lang->misc->releaseDate['11.5.1'] = '2019-06-24'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; diff --git a/module/project/js/burn.js b/module/project/js/burn.js index 5fd1d27675..39088a6561 100644 --- a/module/project/js/burn.js +++ b/module/project/js/burn.js @@ -10,12 +10,36 @@ $(function() /* Save burn as image.*/ function downloadBurn() { - var canvas = $('#burnCanvas'); - var type = 'png'; - var imgSrc = canvas.get(0).toDataURL("image/png"); - imgData = imgSrc.replace(type,'image/octet-stream'); - var filename = 'burn.' + type; - saveFile(imgData,filename); + var $canvas = $('#burnCanvas'); + $('#burnWrapper').append(""); + $('#cloneCanvas').append($canvas.clone()); + $('#cloneCanvas').append(""); + $('#cloneCanvas #cloneImage').attr('src', $canvas.get(0).toDataURL("image/png")); + setTimeout(function() + { + /* Add watermark */ + var canvas = document.querySelector('#cloneCanvas #burnCanvas'); + var cans = canvas.getContext('2d'); + + // Set background color to white + cans.fillStyle = '#fff'; + cans.fillRect(0, 0, canvas.width, canvas.height); + + cans.drawImage($('#cloneCanvas #cloneImage').get(0), 0, 0); + cans.font = "16px Microsoft JhengHei"; + cans.fillStyle = "rgba(17, 17, 17, 0.50)"; + cans.textAlign = 'left'; + cans.textBaseline = 'Middle'; + cans.fillText(watermark, 50, canvas.height - 50); + + var type = 'png'; + var $canvas = $('#cloneCanvas #burnCanvas'); + var imgSrc = $canvas.get(0).toDataURL("image/png"); + var imgData = imgSrc.replace(type,'image/octet-stream'); + var filename = projectName + '.' + type; + saveFile(imgData,filename); + $('#burnWrapper #cloneCanvas').remove(); + }, 500); } var saveFile = function(data, filename)