@@ -2,7 +2,8 @@ const domPoster = require(p.join(appDir, 'scripts/dom/poster.js')),
22 domManager = require ( p . join ( appDir , 'scripts/dom/dom.js' ) ) ,
33 labels = require ( p . join ( appDir , 'scripts/dom/labels.js' ) ) ,
44 fileInfo = require ( p . join ( appDir , 'scripts/dom/file-info.js' ) ) ,
5- search = require ( p . join ( appDir , 'scripts/dom/search.js' ) ) ;
5+ search = require ( p . join ( appDir , 'scripts/dom/search.js' ) ) ,
6+ boxes = require ( p . join ( appDir , 'scripts/dom/boxes.js' ) ) ;
67
78/*Page - Index*/
89
@@ -239,6 +240,7 @@ async function loadFilesIndexPage(file, animation, path, keepScroll, mainPath)
239240 mainPath : mainPath ,
240241 poster : images . poster ,
241242 images : images . images ,
243+ addToQueue : images . addToQueue ,
242244 folder : true ,
243245 compressed : file . compressed ,
244246 } ) ;
@@ -475,7 +477,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
475477 comics . push ( {
476478 name : metadataPathName ( folder ) ,
477479 path : folder . path ,
478- added : Math . round ( fs . statSync ( folder . path ) . mtimeMs / 1000 ) ,
480+ added : Math . round ( fs . statSync ( folder . path ) . ctimeMs / 1000 ) ,
479481 folder : true ,
480482 compressed : folder . compressed ,
481483 fromMasterFolder : true ,
@@ -523,7 +525,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
523525 comics . push ( {
524526 name : metadataPathName ( folder ) ,
525527 path : folder . path ,
526- added : folder . mtime ,
528+ added : Math . round ( folder . mtime / 1000 ) ,
527529 folder : true ,
528530 compressed : folder . compressed ,
529531 fromMasterFolder : true ,
@@ -621,13 +623,18 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
621623 comics [ i ] . sha = sha1 ( comics [ i ] . path ) ;
622624 comics [ i ] . poster = images . poster ;
623625 comics [ i ] . images = images . images ;
626+ comics [ i ] . addToQueue = images . addToQueue ;
624627 comics [ i ] . mainPath = comics [ i ] . path ;
625628 }
626629 }
627630
628631 // Avoid continue if another loadIndexPage has been run
629632 if ( contentRightIndex != template . contentRightIndex ( ) ) return ;
630633
634+ dom . boxes . reset ( ) ;
635+ if ( sort != 'last-reading' ) await dom . boxes . continueReading ( comics ) ;
636+ if ( sort != 'last-add' ) await dom . boxes . recentlyAdded ( comics ) ;
637+
631638 handlebarsContext . comics = comics ;
632639 handlebarsContext . comicsIndex = true ;
633640 handlebarsContext . comicsReadingProgress = false ;
@@ -662,6 +669,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
662669
663670 generateAppMenu ( ) ;
664671
672+ dom . boxes . reset ( ) ;
665673 handlebarsContext . comics = [ ] ;
666674 handlebarsContext . comicsIndex = false ;
667675 handlebarsContext . comicsDeep2 = path . replace ( new RegExp ( '^\s*' + pregQuote ( mainPathR ) ) , '' ) . split ( p . sep ) . length >= 2 ? true : false ;
@@ -828,7 +836,7 @@ function loadIndexContentLeft(animation)
828836 for ( let i = 0 , len = masterFolders . length ; i < len ; i ++ )
829837 {
830838 _masterFolders . push ( {
831- id : 'masterFolder -' + i ,
839+ id : 'master-folder -' + i ,
832840 key : i ,
833841 name : p . basename ( masterFolders [ i ] ) ,
834842 path : masterFolders [ i ] ,
@@ -905,13 +913,13 @@ function loadIndexContentLeft(animation)
905913
906914function loadIndexHeader ( title = false , animation = true )
907915{
908- handlebarsContext . indexHeaderTitle = title || language . global . comics ;
916+ handlebarsContext . indexHeaderTitle = title || language . global . library ;
909917 template . loadHeader ( 'index.header.html' , animation ) ;
910918}
911919
912920function indexHeader ( title = false )
913921{
914- handlebarsContext . indexHeaderTitle = title || language . global . comics ;
922+ handlebarsContext . indexHeaderTitle = title || language . global . library ;
915923 return template . load ( 'index.header.html' ) ;
916924}
917925
@@ -1016,8 +1024,8 @@ function headerPath(path, mainPath, windowTitle = false)
10161024 path . push ( { name : metadataPathName ( { path : _path , name : files [ i ] } , true ) , path : _path , mainPath : mainPath } ) ;
10171025 }
10181026
1019- if ( config . showLibraryPath )
1020- path . unshift ( { name : language . global . library , path : '' , mainPath : '' } ) ;
1027+ if ( config . showLibraryPath && ( isFromLibrary || isFromIndexLabel || isFromRecentlyOpened ) )
1028+ path . unshift ( { name : labels . getName ( isFromIndexLabel , isFromRecentlyOpened ) , path : '' , mainPath : '' } ) ;
10211029
10221030 let len = path . length ;
10231031
@@ -1193,7 +1201,7 @@ async function getFolderThumbnails(path, index = 0, start = 0, end = 99999)
11931201 {
11941202 if ( error . message && / n o t C a c h e O n l y / . test ( error . message ) )
11951203 {
1196- addToQueue = true ;
1204+ addToQueue = 1 ;
11971205 }
11981206 else
11991207 {
@@ -1204,7 +1212,7 @@ async function getFolderThumbnails(path, index = 0, start = 0, end = 99999)
12041212 }
12051213 else
12061214 {
1207- addToQueue = true ;
1215+ addToQueue = 2 ;
12081216 }
12091217
12101218 if ( addToQueue )
@@ -1223,7 +1231,7 @@ async function getFolderThumbnails(path, index = 0, start = 0, end = 99999)
12231231 } , path , folderSha ) ;
12241232 }
12251233
1226- return { poster : poster , images : images } ;
1234+ return { poster : poster , images : images , addToQueue : addToQueue } ;
12271235}
12281236
12291237function calculateVisibleItems ( view , scrollTop = false )
@@ -1234,6 +1242,8 @@ function calculateVisibleItems(view, scrollTop = false)
12341242 if ( rect . width == 0 || rect . height == 0 )
12351243 rect = { width : window . innerWidth , height : window . innerHeight } ;
12361244
1245+ console . log ( scrollTop ) ;
1246+
12371247 scrollTop = scrollTop || 0 ; // element.scrollTop;
12381248
12391249 let start = 0 ;
@@ -1299,6 +1309,17 @@ function indexPathControlGoBack()
12991309 }
13001310}
13011311
1312+ function goStartPath ( )
1313+ {
1314+ if ( isFromIndexLabel && ! isFromRecentlyOpened )
1315+ indexLabel = isFromIndexLabel ;
1316+
1317+ if ( isFromRecentlyOpened )
1318+ recentlyOpened . load ( true ) ;
1319+ else
1320+ loadIndexPage ( true , false ) ;
1321+ }
1322+
13021323function indexPathControlGoForwards ( )
13031324{
13041325 if ( indexPathControlForwards . length > 0 )
@@ -2418,6 +2439,7 @@ module.exports = {
24182439 indexPathControlA : function ( ) { return indexPathControlA } ,
24192440 indexPathControlGoBack : indexPathControlGoBack ,
24202441 indexPathControlGoForwards : indexPathControlGoForwards ,
2442+ goStartPath : goStartPath ,
24212443 selectElement : selectElement ,
24222444 openComic : openComic ,
24232445 nextComic : function ( ) { return skipNextComic } ,
@@ -2449,6 +2471,7 @@ module.exports = {
24492471 search : search ,
24502472 labels : labels ,
24512473 fileInfo : fileInfo ,
2474+ boxes : boxes ,
24522475 this : domManager . this ,
24532476 query : domManager . query ,
24542477 queryAll : domManager . queryAll ,
0 commit comments