mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-28 18:00:09 +00:00
now spash screen version is taken from the actual version.js
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
f23dc1f780
commit
55f800202e
@ -16,6 +16,8 @@ var path = require('path')
|
||||
var url = require('url')
|
||||
//var fs = require('fs')
|
||||
|
||||
var VERSION = require('./version').version
|
||||
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
@ -66,6 +68,8 @@ function createWindow(){
|
||||
// see if the splash screen is disabled...
|
||||
.executeJavaScript('localStorage.disableSplashScreen')
|
||||
.then(function(disabled){
|
||||
splash.webContents
|
||||
.executeJavaScript(`document.getElementById("version").innerText = "${VERSION}"`)
|
||||
disabled ?
|
||||
splash.destroy()
|
||||
: splash.show() }) })
|
||||
|
||||
@ -17,6 +17,7 @@ try{
|
||||
electron = requirejs('electron')
|
||||
} catch(e){ }
|
||||
|
||||
var VERSION = require('version').version
|
||||
|
||||
var actions = require('lib/actions')
|
||||
var features = require('lib/features')
|
||||
@ -309,7 +310,11 @@ var ElectronHostActions = actions.Actions({
|
||||
protocol: 'file:',
|
||||
slashes: true
|
||||
}))
|
||||
|
||||
splash.once('ready-to-show', function(){
|
||||
splash.webContents
|
||||
.executeJavaScript(
|
||||
`document.getElementById("version").innerText = "${VERSION}"`)
|
||||
splash.show()
|
||||
})
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ body {
|
||||
<div class="block">
|
||||
<div class="title">
|
||||
ImageGrid.Viewer
|
||||
<span>v4.0.0a</span>
|
||||
<span id="version">v0.0.0</span>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user