@@ -127,11 +127,12 @@ function addImageToDom(querySelector, path, animation = true)
127127
128128 if ( animation )
129129 {
130- src . addClass ( 'a' ) ;
130+ src . addClass ( 'a' , 'border' ) ;
131131 cr . addClass ( 'a' ) ;
132132 }
133133 else
134134 {
135+ src . addClass ( 'border' ) ;
135136 src . filter ( '.folder-poster-img' ) . addClass ( 'has-poster' ) ;
136137 }
137138}
@@ -264,22 +265,22 @@ async function loadFilesIndexPage(file, animation, path, keepScroll, mainPath)
264265 handlebarsContext . comicsReadingProgress = false ;
265266 }
266267
267- if ( keepScroll > 1 )
268+ /* if(keepScroll > 1)
268269 template.contentRight().children().html(template.load('index.content.right.'+config.view+'.html')).scrollTop(keepScroll);
269270 else
270- template . contentRight ( ) . children ( ) . html ( template . load ( 'index.content.right.' + config . view + '.html' ) ) ;
271+ template.contentRight().children().html(template.load('index.content.right.'+config.view+'.html'));*/
271272
272273 //template.loadContentRight('index.content.right.'+config.view+'.html', animation, keepScroll);
273274 events . events ( ) ;
274275
275- return { files : pathFiles , readingProgress : readingProgress [ mainPath ] || { } } ;
276+ return { files : pathFiles , readingProgress : readingProgress [ mainPath ] || { } , html : template . load ( 'index.content.right.' + config . view + '.html' ) } ;
276277
277278 } ) . catch ( function ( error ) {
278279
279280 console . error ( error ) ;
280281 dom . compressedError ( error ) ;
281282
282- return { files : [ ] , readingProgress : { } } ;
283+ return { files : [ ] , readingProgress : { } , html : '' } ;
283284
284285 } ) ;
285286
@@ -469,7 +470,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
469470 if ( fromDeepLoad && Date . now ( ) - fromDeepLoadNow < 300 )
470471 {
471472 template . _barHeader ( ) . firstElementChild . innerHTML = template . load ( 'index.header.html' ) ;
472- template . _contentRight ( ) . firstElementChild . innerHTML = template . load ( 'index.content.right.loading.html' ) ;
473+ // template._contentRight().firstElementChild.innerHTML = template.load('index.content.right.loading.html');
473474 }
474475 else
475476 {
@@ -492,23 +493,64 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
492493 cache . stopQueue ( ) ;
493494 queue . stop ( 'folderThumbnails' ) ;
494495
496+ // Get comic reading progress image
497+ let readingProgress = storage . get ( 'readingProgress' ) ;
498+ readingProgress = readingProgress [ mainPath ] || { } ;
499+
500+ let containsCompressed = fileManager . containsCompressed ( path ) ;
501+
502+ let openContinueReading = false ;
503+ let openFirstImage = ( ( ! containsCompressed && config . whenOpenFolderFirstImageOrContinueReading ) || ( containsCompressed && config . whenOpenFileFirstImageOrContinueReading ) ) ? true : false ;
504+
505+ if ( ( config . whenOpenFolderContinueReading || config . whenOpenFileContinueReading || config . whenOpenFolderFirstImageOrContinueReading || config . whenOpenFileFirstImageOrContinueReading ) && ! fromGoBack && ! disableIgnoreSingleFolders && readingProgress && readingProgress . lastReading > 0 )
506+ {
507+ let isParentPath = fileManager . isParentPath ( path , readingProgress . path ) ;
508+
509+ if ( ( ! containsCompressed && ( config . whenOpenFolderContinueReading || config . whenOpenFolderFirstImageOrContinueReading ) ) && isParentPath )
510+ openContinueReading = true ;
511+ else if ( ( containsCompressed && ( config . whenOpenFileContinueReading || config . whenOpenFileFirstImageOrContinueReading ) ) && isParentPath )
512+ openContinueReading = true ;
513+ }
514+
495515 let file = fileManager . file ( path ) ;
496- let indexData = await loadFilesIndexPage ( file , animation , path , keepScroll , mainPath ) ;
497- file . destroy ( ) ;
498516
499- if ( config . whenOpenFolderContinueReading && ! fromGoBack && ! disableIgnoreSingleFolders && indexData . readingProgress && indexData . readingProgress . lastReading > 0 )
517+ if ( openContinueReading )
500518 {
501519 fromDeepLoadNow = Date . now ( ) ;
502520 indexPathControlA . pop ( ) ;
503521
504- if ( indexData . readingProgress . ebook )
505- reading . setNextOpenChapterProgress ( indexData . readingProgress . chapterIndex , indexData . readingProgress . chapterProgress ) ;
522+ if ( readingProgress . ebook )
523+ reading . setNextOpenChapterProgress ( readingProgress . chapterIndex , readingProgress . chapterProgress ) ;
506524
507- dom . openComic ( true , indexData . readingProgress . path , indexData . readingProgress . mainPath , false , false , false , true ) ;
525+ console . log ( readingProgress ) ;
526+
527+ dom . openComic ( true , readingProgress . path , mainPath , false , false , false , true ) ;
528+
529+ file . destroy ( ) ;
508530
509531 return ;
510532 }
511- else if ( config . ignoreSingleFoldersLibrary && ! fromGoBack && ! disableIgnoreSingleFolders && indexData . files . length == 1 && ( indexData . files [ 0 ] . folder || indexData . files [ 0 ] . compressed ) )
533+ else if ( openFirstImage )
534+ {
535+ let first = await file . images ( 1 ) ;
536+
537+ if ( first )
538+ {
539+ fromDeepLoadNow = Date . now ( ) ;
540+ indexPathControlA . pop ( ) ;
541+
542+ dom . openComic ( true , first . path , mainPath , false , false , false , true ) ;
543+
544+ file . destroy ( ) ;
545+
546+ return ;
547+ }
548+ }
549+
550+ let indexData = await loadFilesIndexPage ( file , animation , path , keepScroll , mainPath ) ;
551+ file . destroy ( ) ;
552+
553+ if ( config . ignoreSingleFoldersLibrary && ! fromGoBack && ! disableIgnoreSingleFolders && indexData . files . length == 1 && ( indexData . files [ 0 ] . folder || indexData . files [ 0 ] . compressed ) )
512554 {
513555 fromDeepLoadNow = Date . now ( ) ;
514556 indexPathControlA . pop ( ) ;
@@ -518,6 +560,11 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
518560 return ;
519561 }
520562
563+ let contentRightScroll = template . contentRight ( ) . children ( ) . html ( indexData . html ) ;
564+
565+ if ( keepScroll > 1 )
566+ contentRightScroll . scrollTop ( keepScroll ) ;
567+
521568 cache . resumeQueue ( ) ;
522569 queue . resume ( 'folderThumbnails' ) ;
523570 }
@@ -1375,14 +1422,13 @@ async function openComic(animation = true, path = true, mainPath = true, end = f
13751422
13761423 if ( fromDeepLoad && Date . now ( ) - fromDeepLoadNow < 300 )
13771424 {
1378- template . _contentLeft ( ) . firstElementChild . innerHTML = template . load ( 'reading.content.left.html' ) ;
1379- template . _contentRight ( ) . firstElementChild . innerHTML = template . load ( 'reading.content.right.html' ) ;
13801425 template . _barHeader ( ) . firstElementChild . innerHTML = template . load ( 'reading.header.html' ) ;
13811426 }
13821427 else
13831428 {
1384- template . loadContentLeft ( 'reading.content.left.html' , true ) ;
1385- template . loadContentRight ( 'reading.content.right.html' , true ) ;
1429+ if ( ! template . _contentRight ( ) . querySelector ( '.loading' ) )
1430+ template . loadContentRight ( 'reading.content.right.html' , true ) ;
1431+
13861432 template . loadHeader ( 'reading.header.html' , true ) ;
13871433 }
13881434
@@ -1408,7 +1454,7 @@ async function openComic(animation = true, path = true, mainPath = true, end = f
14081454 {
14091455 await file . makeAvailable ( [ { path : compressedFile } ] ) ;
14101456 isEbook = true ;
1411- files = [ ] ;
1457+ // files = [];
14121458 }
14131459 else
14141460 {
@@ -1500,34 +1546,52 @@ async function openComic(animation = true, path = true, mainPath = true, end = f
15001546 indexStart = comics [ i ] . index ;
15011547 }
15021548
1549+ if ( isEbook )
1550+ comics = [ ] ;
1551+
15031552 handlebarsContext . comics = comics ;
15041553 handlebarsContext . previousComic = skipPreviousComic ;
15051554 handlebarsContext . nextComic = skipNextComic ;
15061555 reading . setCurrentComics ( comics ) ;
15071556
1557+ handlebarsContext . loading = true ;
1558+
15081559 if ( Date . now ( ) - now < 300 )
15091560 {
1510- template . _contentLeft ( ) . firstElementChild . innerHTML = template . load ( 'reading.content.left.html' ) ;
1511- template . _contentRight ( ) . firstElementChild . innerHTML = template . load ( 'reading.content.right.html' ) ;
1561+ if ( template . _contentRight ( ) . querySelector ( '.loading' ) )
1562+ {
1563+ handlebarsContext . loading = false ;
1564+ template . _contentRight ( ) . firstElementChild . insertAdjacentHTML ( 'beforeend' , template . load ( 'reading.content.right.html' ) ) ;
1565+ }
1566+ else
1567+ {
1568+ template . _contentRight ( ) . firstElementChild . innerHTML = template . load ( 'reading.content.right.html' ) ;
1569+ }
15121570 }
15131571 else
15141572 {
1515- template . loadContentLeft ( 'reading.content.left.html' , true ) ;
15161573 template . loadContentRight ( 'reading.content.right.html' , true ) ;
15171574 }
15181575
1576+ template . loadContentLeft ( 'reading.content.left.html' , true ) ;
1577+
15191578 if ( template . globalElement ( '.reading-elements-menus' ) . length == 0 ) template . loadGlobalElement ( 'reading.elements.menus.html' , 'menus' ) ;
15201579
15211580 floatingActionButton ( false ) ;
15221581
15231582 events . events ( ) ;
15241583
1584+ reading . onLoad ( function ( ) {
1585+
1586+ cache . resumeQueue ( ) ;
1587+
1588+ } ) ;
1589+
15251590 reading . read ( path , indexStart , end , isCanvas , isEbook , imagePath ) ;
15261591 reading . hideContent ( electronRemote . getCurrentWindow ( ) . isFullScreen ( ) , true ) ;
15271592
15281593 generateAppMenu ( ) ;
1529-
1530- cache . resumeQueue ( ) ;
1594+
15311595 shortcuts . register ( 'reading' ) ;
15321596 gamepad . updateBrowsableItems ( 'reading-' + sha1 ( path ) ) ;
15331597}
0 commit comments