@@ -6,7 +6,6 @@ import DOMPurify from "dompurify";
6
6
import {
7
7
side_toaster ,
8
8
sort_array ,
9
- imageSizeReduce ,
10
9
llazyload ,
11
10
screenlock ,
12
11
} from "./assets/js/helper.js" ;
@@ -46,8 +45,10 @@ import {
46
45
47
46
import { v4 as uuidv4 } from "uuid" ;
48
47
49
- const dayjs = require ( "dayjs" ) ;
50
- var duration = require ( "dayjs/plugin/duration" ) ;
48
+ import dayjs from "dayjs" ;
49
+ import duration from "dayjs/plugin/duration" ;
50
+
51
+ // Extend dayjs with the duration plugin
51
52
dayjs . extend ( duration ) ;
52
53
53
54
const debug = false ;
@@ -57,7 +58,7 @@ let content_arr = [];
57
58
//store all used article ids
58
59
var all_cid = [ ] ;
59
60
let feed_download_list_count = 0 ;
60
- let panels = [ "channels" , "recently-played" ] ;
61
+ let panels = [ "channels" ] ;
61
62
let current_panel = 0 ;
62
63
const parser = new DOMParser ( ) ;
63
64
@@ -1450,6 +1451,10 @@ function nav_panels(left_right) {
1450
1451
} ) ;
1451
1452
} , 1000 ) ;
1452
1453
1454
+ if ( recently_played . length > 0 ) {
1455
+ if ( panels . indexOf ( "recently-played" ) == - 1 ) panels . push ( "recently-played" ) ;
1456
+ }
1457
+
1453
1458
//recently played
1454
1459
if ( panels [ current_panel ] == "recently-played" ) {
1455
1460
//to do
@@ -1622,8 +1627,6 @@ let show_article = function () {
1622
1627
document . activeElement . getAttribute ( "data-id" ) ;
1623
1628
} catch ( e ) { }
1624
1629
1625
- console . log ( document . activeElement . getAttribute ( "data-type" ) ) ;
1626
-
1627
1630
status . window_status = "single-article" ;
1628
1631
1629
1632
let elem = document . querySelectorAll ( "article" ) ;
@@ -1703,21 +1706,14 @@ let show_article = function () {
1703
1706
document . getElementById ( "top-bar" ) . style . display = "none" ;
1704
1707
} ;
1705
1708
1706
- export let toTime = function ( seconds ) {
1707
- let n = "" ;
1708
- if ( seconds == "" ) {
1709
- n = "" ;
1710
- } else {
1711
- try {
1712
- var date = new Date ( ) ;
1713
- date . setSeconds ( seconds ) ;
1714
- n = date . toISOString ( ) . substr ( 11 , 8 ) ;
1715
- } catch ( error ) {
1716
- n = seconds ;
1717
- }
1718
- }
1709
+ export let toTime = ( seconds ) => {
1710
+ if ( seconds === "" ) return "" ;
1719
1711
1720
- return n ;
1712
+ try {
1713
+ return dayjs ( ) . startOf ( "day" ) . add ( seconds , "second" ) . format ( "HH:mm:ss" ) ;
1714
+ } catch ( error ) {
1715
+ return seconds ;
1716
+ }
1721
1717
} ;
1722
1718
1723
1719
let youtube_seeking = function ( param ) {
@@ -1851,23 +1847,28 @@ let open_url = () => {
1851
1847
let t ;
1852
1848
1853
1849
function onPlayerStateChange ( event ) {
1854
- if ( event . data == YT . PlayerState . PLAYING ) {
1855
- youtube_status = "playing" ;
1856
- bottom_bar ( "<img src='assets/icons/23EF.svg'>" , toTime ( t ) , "" ) ;
1850
+ console . log ( "status: " + event . data ) ;
1851
+ if ( event . data == 1 ) {
1857
1852
tt ( ) ;
1858
- // screenlock("lock");
1853
+ bottom_bar ( "<img src='assets/icons/23EF.svg'>" , toTime ( t ) , "" ) ;
1854
+
1855
+ youtube_status = "playing" ;
1859
1856
}
1860
1857
1861
- if ( event . data == YT . PlayerState . PAUSED ) {
1858
+ if ( event . data == 2 ) {
1862
1859
youtube_status = "paused" ;
1863
1860
clearInterval ( youtube_time ) ;
1864
- // screenlock("unlock");
1861
+
1862
+ screenlock ( "unlock" ) ;
1865
1863
}
1866
1864
}
1867
1865
1868
1866
function onPlayerReady ( event ) {
1869
1867
event . target . playVideo ( ) ;
1870
1868
document . querySelector ( ".loading-spinner" ) . style . display = "none" ;
1869
+ bottom_bar ( "<img src='assets/icons/23EF.svg'>" , toTime ( t ) , "" ) ;
1870
+
1871
+ screenlock ( "lock" ) ;
1871
1872
}
1872
1873
1873
1874
return ;
@@ -2064,7 +2065,7 @@ const show_article_option = () => {
2064
2065
} ) ;
2065
2066
} else {
2066
2067
document . querySelectorAll ( ".mastodon-item" ) . forEach ( ( e ) => {
2067
- e . style . display = "flex " ;
2068
+ e . style . display = "none " ;
2068
2069
} ) ;
2069
2070
}
2070
2071
} ;
@@ -2324,24 +2325,17 @@ let remove_alarm = function () {
2324
2325
// KaiOs 2.xx
2325
2326
2326
2327
try {
2327
- let request = navigator . mozAlarms . getAll ( ) ;
2328
+ var request = navigator . mozAlarms . getAll ( ) ;
2328
2329
2329
2330
request . onsuccess = function ( ) {
2331
+ // Remove all pending alarms
2330
2332
this . result . forEach ( function ( alarm ) {
2331
- let r = navigator . mozAlarms . remove ( alarm . id ) ;
2332
-
2333
- r . onsuccess = function ( ) {
2334
- console . log ( "removed" ) ;
2335
- } ;
2336
-
2337
- r . onerror = function ( ) {
2338
- console . log ( "An error occurred: " + this . error . name ) ;
2339
- } ;
2333
+ navigator . mozAlarms . remove ( alarm . id ) ;
2340
2334
} ) ;
2341
2335
} ;
2342
2336
2343
2337
request . onerror = function ( ) {
2344
- console . log ( "An error occurred:" , this . error . name ) ;
2338
+ console . log ( "operation failed: " + this . error ) ;
2345
2339
} ;
2346
2340
} catch ( e ) { }
2347
2341
@@ -2570,12 +2564,6 @@ function shortpress_action(param) {
2570
2564
sleep_mode ( ) ;
2571
2565
break ;
2572
2566
2573
- case "4" :
2574
- break ;
2575
-
2576
- case "8" :
2577
- break ;
2578
-
2579
2567
case "7" :
2580
2568
status . tabsort == "string" ? sort_tab ( "date" ) : sort_tab ( "string" ) ;
2581
2569
@@ -2827,6 +2815,14 @@ function shortpress_action(param) {
2827
2815
break ;
2828
2816
}
2829
2817
2818
+ if (
2819
+ status . window_status == "single-article" &&
2820
+ document . activeElement . getAttribute ( "data-media" ) == "video"
2821
+ ) {
2822
+ open_url ( ) ;
2823
+ break ;
2824
+ }
2825
+
2830
2826
if (
2831
2827
status . window_status == "single-article" &&
2832
2828
document . activeElement . getAttribute ( "data-media" ) == "youtube"
@@ -2916,10 +2912,6 @@ function shortpress_action(param) {
2916
2912
case "EndCall" :
2917
2913
break ;
2918
2914
2919
- case "9" :
2920
- sync ( ) ;
2921
- break ;
2922
-
2923
2915
case "Backspace" :
2924
2916
if ( status . window_status == "intro" ) {
2925
2917
bottom_bar ( "" , "" , "" ) ;
@@ -3027,6 +3019,7 @@ function shortpress_action(param) {
3027
3019
////////////////////////////////
3028
3020
3029
3021
function handleKeyDown ( evt ) {
3022
+ console . log ( status . window_status ) ;
3030
3023
if ( evt . key === "Backspace" && status . window_status != "article-list" ) {
3031
3024
evt . preventDefault ( ) ;
3032
3025
}
0 commit comments