flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-30 10:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

started migrating to nw0.13.x

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-04-08 19:28:38 +03:00
parent b266982838
commit 6e8a33ad0d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui (gen4)/features/app.js
View File

@ -184,11 +184,14 @@ module.AppControl = core.ImageGridFeatures.Feature({
// XXX get this from the viewer... // XXX get this from the viewer...
.replace('${VERSION}', this.version || 'gen4') .replace('${VERSION}', this.version || 'gen4')
.replace('${FILENAME}', .replace('${FILENAME}',
(img.name img ?
|| img.path.replace(/\.[\\\/]/, ''))) (img.name || img.path.replace(/\.[\\\/]/, ''))
: '')
.replace('${PATH}', .replace('${PATH}',
(img.base_path || '.') img ?
+'/'+ img.path.replace(/\.[\\\/]/, '')) (img.base_path || '.')
+'/'+ img.path.replace(/\.[\\\/]/, '')
: '')
/* /*
.replace('${DIR}', .replace('${DIR}',
pathlib.dirname((img.base_path || '.') pathlib.dirname((img.base_path || '.')

2
ui (gen4)/features/metadata.js
View File

@ -104,7 +104,7 @@ var MetadataReaderActions = actions.Actions({
var gid = this.data.getImage(image) var gid = this.data.getImage(image)
var img = this.images && this.images[gid] var img = this.images && this.images[gid]
if(!image){ if(!image || !img){
return return
} }

2
ui (gen4)/package.json
View File

@ -25,7 +25,7 @@
"glob": "^4.0.6", "glob": "^4.0.6",
"guarantee-events": "^1.0.0", "guarantee-events": "^1.0.0",
"promise": "^6.0.1", "promise": "^6.0.1",
"requirejs": "*", "requirejs": "^2.1.23",
"sharp": "^0.12.0" "sharp": "^0.12.0"
}, },
"preferGlobal": true, "preferGlobal": true,