mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-28 18:00:09 +00:00
several fixes and tweaks...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
dc2d302406
commit
f434e5af5f
@ -175,6 +175,7 @@ LESSC := npx lessc
|
||||
# 2) set path and launch a child make -- not sure how to
|
||||
# do this...
|
||||
ELECTRON := npx electron
|
||||
# XXX stopped working while sharp started working out of the box...
|
||||
ELECTRON_REBUILD := npx electron-rebuild
|
||||
ASAR := npx asar
|
||||
ELECTRON_VERSION_FALLBACK ?= v1.8.1
|
||||
@ -319,9 +320,6 @@ DEPENDENCIES_WEB = node npm npx
|
||||
DEPENDENCIES = $(DEPENDENCIES_WEB) \
|
||||
$(DEPENDENCIES_HELP) \
|
||||
wget zip unzip zipnote git
|
||||
# # XXX not needed with npx...
|
||||
# electron electron-rebuild asar
|
||||
# $(ELECTRON) $(ELECTRON_REBUILD) $(ASAR)
|
||||
|
||||
|
||||
|
||||
@ -631,7 +629,7 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \
|
||||
$(NODE_DIR): package.json
|
||||
npm install
|
||||
# NOTE: this may break on some systems due to a dependency issue...
|
||||
$(ELECTRON_REBUILD)
|
||||
# $(ELECTRON_REBUILD)
|
||||
@touch "$@"
|
||||
|
||||
|
||||
|
||||
@ -3124,9 +3124,6 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
'exportDialog: "images"'],
|
||||
|
||||
|
||||
// XXX BUG: editing the path of a duplicate ("... (n)") preset first
|
||||
// replaces the wrong preset in the list but after reopening
|
||||
// the dialog everything is correct...
|
||||
// XXX UI:
|
||||
// - element format:
|
||||
// TITLE
|
||||
@ -3141,6 +3138,7 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
var that = this
|
||||
var logger = this.logger && this.logger.push('exportPresets')
|
||||
|
||||
// generic helpers...
|
||||
var getName = function(preset){
|
||||
var date = preset.date
|
||||
&& Date.fromTimeStamp(preset.date).toShortDate()
|
||||
@ -3168,7 +3166,7 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
var presets = that.config['export-presets'] || []
|
||||
var [preset_index, preset_keys] = buildIndex(presets)
|
||||
|
||||
var updateIndex = function(full=false){
|
||||
var updatePresetIndex = function(full=false){
|
||||
var k
|
||||
;[preset_index, k] = full ?
|
||||
buildIndex(presets)
|
||||
@ -3183,9 +3181,10 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
|
||||
// history...
|
||||
// NOTE: history is reversed in view...
|
||||
var history = (that.config['export-history'] || [])
|
||||
.slice()
|
||||
.reverse()
|
||||
var history =
|
||||
(that.config['export-history'] || [])
|
||||
.slice()
|
||||
.reverse()
|
||||
var [history_index, history_keys] = buildIndex(history)
|
||||
|
||||
return browse.makeLister(null, function(path, make){
|
||||
@ -3223,13 +3222,12 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
['<small class="show-on-hover view-or-edit">edit</small>',
|
||||
function(title){
|
||||
var preset = preset_index.get(title)
|
||||
var o = getName(preset)
|
||||
that.exportDialog(preset)
|
||||
.close(function(){
|
||||
var n = getName(preset)
|
||||
// update the list if name is affected...
|
||||
if(n != o){
|
||||
n = renamePreset(o, n)
|
||||
if(n != title){
|
||||
n = renamePreset(title, n)
|
||||
|
||||
make.dialog.select(n)
|
||||
make.dialog.update() } })}],
|
||||
@ -3243,7 +3241,7 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
preset.name = title + ' (copy)'
|
||||
// place new preset in list...
|
||||
presets.splice(preset_keys.indexOf(title)+1, 0, preset)
|
||||
updateIndex(true)
|
||||
updatePresetIndex(true)
|
||||
make.dialog.update() }],
|
||||
['♦', 'TO_TOP'],
|
||||
'REMOVE'],
|
||||
@ -3252,7 +3250,6 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
var preset = preset_index.get(title)
|
||||
// export only if we get a good preset...
|
||||
if(preset && getName(preset) == title){
|
||||
console.log('>>>>>>>>>', preset)
|
||||
that.exportAs(preset)
|
||||
return make.dialog.close() }
|
||||
// error...
|
||||
@ -3266,7 +3263,7 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
that.exportDialog()
|
||||
// new preset saved...
|
||||
.on('save-preset', function(){
|
||||
updateIndex(true)
|
||||
updatePresetIndex(true)
|
||||
make.dialog.update() })
|
||||
// close dialog on export...
|
||||
.close(function(evt, reason){
|
||||
@ -3293,7 +3290,7 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
JSON.parse(JSON.stringify( preset )) )
|
||||
// new preset saved...
|
||||
.on('save-preset', function(){
|
||||
updateIndex(true)
|
||||
updatePresetIndex(true)
|
||||
make.dialog.update() })
|
||||
// close dialog on export...
|
||||
.close(function(evt, reason){
|
||||
@ -3305,7 +3302,7 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
var preset = history_index.get(title)
|
||||
if(preset){
|
||||
that.exportPresetSave(preset)
|
||||
updateIndex(true)
|
||||
updatePresetIndex(true)
|
||||
make.dialog.update() } }],
|
||||
'REMOVE',
|
||||
],
|
||||
@ -3330,14 +3327,7 @@ var FileSystemWriterUIActions = actions.Actions({
|
||||
that
|
||||
.select()
|
||||
.find('.view-or-edit')
|
||||
.click() })
|
||||
// mark for deletion...
|
||||
// XXX move to browse...
|
||||
.on('D', function(){
|
||||
that
|
||||
.select()
|
||||
// XXX
|
||||
}) })
|
||||
.click() }) })
|
||||
// save things after we are done...
|
||||
.close(function(){
|
||||
// update preset order and count...
|
||||
|
||||
32
Viewer/package-lock.json
generated
32
Viewer/package-lock.json
generated
@ -549,11 +549,11 @@
|
||||
}
|
||||
},
|
||||
"debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
|
||||
"integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
|
||||
"requires": {
|
||||
"ms": "^2.1.1"
|
||||
"ms": "2.1.2"
|
||||
}
|
||||
},
|
||||
"decamelize": {
|
||||
@ -636,9 +636,9 @@
|
||||
}
|
||||
},
|
||||
"electron": {
|
||||
"version": "9.3.1",
|
||||
"resolved": "https://registry.npmjs.org/electron/-/electron-9.3.1.tgz",
|
||||
"integrity": "sha512-DScrhqBT4a54KfdF0EoipALpHmdQTn3m7SSCtbpTcEcG+UDUiXad2cOfW6DHeVH7N+CVDKDG12q2PhVJjXkFAA==",
|
||||
"version": "9.3.2",
|
||||
"resolved": "https://registry.npmjs.org/electron/-/electron-9.3.2.tgz",
|
||||
"integrity": "sha512-0lleEf9msAXGDi2GukAuiGdw3VDgSTlONOnJgqDEz1fuSEVsXz5RX+hNPKDsVDerLTFg/C34RuJf4LwHvkKcBA==",
|
||||
"requires": {
|
||||
"@electron/get": "^1.0.1",
|
||||
"@types/node": "^12.0.12",
|
||||
@ -646,9 +646,9 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/node": {
|
||||
"version": "12.12.58",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.58.tgz",
|
||||
"integrity": "sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA=="
|
||||
"version": "12.12.64",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.64.tgz",
|
||||
"integrity": "sha512-UV1/ZJMC+HcP902wWdpC43cAcGu0IQk/I5bXjP2aSuCjsk3cE74mDvFrLKga7oDC170ugOAYBwfT4DSQW3akDA=="
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1112,9 +1112,9 @@
|
||||
"integrity": "sha512-EzT4CP6d6lI8bnknNgT3W8mUQhSVXflO0yPbKD4dKsFcINiC6npjoEBz+8m3VQmWJhc+36pXD4JLwNxUEgzi+Q=="
|
||||
},
|
||||
"ig-types": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/ig-types/-/ig-types-2.0.4.tgz",
|
||||
"integrity": "sha512-yIeuVShcgZZsK5wMWO/u24jmKJ1hKpXk53x+YpCK3vmI5IzdI8Q34Vk2bZBIiveSFZ4kwHzfBHEvFNbkUpjmYw==",
|
||||
"version": "2.0.14",
|
||||
"resolved": "https://registry.npmjs.org/ig-types/-/ig-types-2.0.14.tgz",
|
||||
"integrity": "sha512-GSWHNbfiiypCbgmK1VhIXcDZrjECTiV14UBq2qGFeUXA+X5ji2O3aoj2b8kYhiGhsELErKU+sgXzl6HBc4oGRg==",
|
||||
"requires": {
|
||||
"ig-object": "^5.2.8",
|
||||
"object-run": "^1.0.1"
|
||||
@ -1420,9 +1420,9 @@
|
||||
"integrity": "sha1-jrbgqZ+HrTT/8YJzMRBJadjFBP4="
|
||||
},
|
||||
"moment": {
|
||||
"version": "2.29.0",
|
||||
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
|
||||
"integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="
|
||||
"version": "2.29.1",
|
||||
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
|
||||
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
|
||||
},
|
||||
"ms": {
|
||||
"version": "2.1.2",
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
"dependencies": {
|
||||
"app-module-path": "^1.0.6",
|
||||
"async-json": "0.0.2",
|
||||
"electron": "^9.3.1",
|
||||
"electron": "^9.3.2",
|
||||
"exiftool": "^0.0.3",
|
||||
"fs-extra": "^7.0.1",
|
||||
"fs-walk": "^0.0.1",
|
||||
@ -31,8 +31,8 @@
|
||||
"ig-argv": "^2.15.0",
|
||||
"ig-features": "^3.4.2",
|
||||
"ig-object": "^5.2.8",
|
||||
"ig-types": "^2.0.4",
|
||||
"moment": "^2.29.0",
|
||||
"ig-types": "^2.0.14",
|
||||
"moment": "^2.29.1",
|
||||
"object-run": "^1.0.1",
|
||||
"requirejs": "^2.3.6",
|
||||
"requirejs-plugins": "^1.0.2",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user