@@ -293,6 +293,13 @@ const FileManager = (() => {
293
293
return JSON . stringify ( dictionary ) ;
294
294
}
295
295
296
+ let fromMenu = false ;
297
+
298
+ function openImportPaletteWindow ( ) {
299
+ fromMenu = true ;
300
+ document . getElementById ( 'load-palette-browse-holder' ) . click ( ) ;
301
+ }
302
+
296
303
function loadPalette ( ) {
297
304
if ( browsePaletteHolder . files && browsePaletteHolder . files [ 0 ] ) {
298
305
let file = browsePaletteHolder . files [ 0 ] ;
@@ -326,12 +333,17 @@ const FileManager = (() => {
326
333
}
327
334
328
335
function addPalette ( colors ) {
329
- //add to palettes so that it can be loaded when they click okay
330
- palettes [ 'Loaded palette' ] = { } ;
331
- palettes [ 'Loaded palette' ] . colors = colors ;
332
- Util . setText ( 'palette-button' , 'Loaded palette' ) ;
333
- Util . setText ( 'palette-button-splash' , 'Loaded palette' ) ;
334
- Util . toggle ( 'palette-menu-splash' ) ;
336
+ if ( fromMenu ) {
337
+ ColorModule . createColorPalette ( colors , clearCurrent = false ) ;
338
+ } else {
339
+ // From splash screen
340
+ // add to palettes so that it can be loaded when they click okay
341
+ palettes [ 'Loaded palette' ] = { } ;
342
+ palettes [ 'Loaded palette' ] . colors = colors ;
343
+ Util . setText ( 'palette-button' , 'Loaded palette' ) ;
344
+ Util . setText ( 'palette-button-splash' , 'Loaded palette' ) ;
345
+ Util . toggle ( 'palette-menu-splash' ) ;
346
+ }
335
347
}
336
348
337
349
function loadPaletteFromImage ( e ) {
@@ -587,6 +599,7 @@ const FileManager = (() => {
587
599
openPixelExportWindow,
588
600
openSaveProjectWindow,
589
601
openImportImageWindow,
602
+ openImportPaletteWindow,
590
603
open
591
604
}
592
605
0 commit comments