From 59eea31348aae4da9adfa79d6361c6bf7ceb29b2 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 25 May 2020 16:00:19 +0800 Subject: [PATCH] improvements single update --- lib/desktop_updater.js | 6 ++++-- src/template.ejs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index a87993f46..bbef530b2 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -57,7 +57,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { // document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? - (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +'(Build: ' + msgJSON.build + ')' : + (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Unable to update, please try again later.')); @@ -89,7 +89,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade ? 'Update Available' : (msgJSON.version !== '' ? '' : '')); document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? - (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +'(Build: ' + msgJSON.build + ')' : + (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Unable to update, please try again later.')); @@ -258,6 +258,8 @@ function startDownloading() { //Update confirm and notify main process if(isVersionUpdate){ // alert('start1') + document.getElementById('update-notify-box').style = ''; + appversionObj.action = 'update-start'; ipcRendererUpdateWeb.send('update-main', appversionObj); } else if(isBuildUpdate){ diff --git a/src/template.ejs b/src/template.ejs index b1e2d2f76..4b3f864d2 100644 --- a/src/template.ejs +++ b/src/template.ejs @@ -141,8 +141,8 @@