Strona główna Odkrywaj Pomoc
Zaloguj się
TC
/
arozos
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

Fixed embedded photo viewer

TC pushbot 5 2 lat temu
rodzic
e5f5b7f48c
commit
1846561d94
5 zmienionych plików z 32 dodań i 11 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 1 0
      autopush.bat
  2. 9 5
      web/Photo/embedded.html
  3. 5 3
      web/Photo/embedded/listNearbyImage.js
  4. 6 1
      web/SystemAO/file_system/file_operation.html
  5. 11 2
      web/desktop.system

+ 1 - 0
autopush.bat
Wyświetl plik 

@@ -1,5 +1,6 @@
 
 @echo off
 
 @echo off
 
 set /p id="Enter commit notes: "
 
 set /p id="Enter commit notes: "
 
+del .\.git\index.lock
 
 git pull
 
 git pull
 
 git add -A
 
 git add -A
 
 git commit -m "%id%"
 
 git commit -m "%id%"

+ 9 - 5
web/Photo/embedded.html
Wyświetl plik 

@@ -63,8 +63,8 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
     <img id="img" style="max-height: 100vh;max-width: 100%;">
 
     <img id="img" style="max-height: 100vh;max-width: 100%;">
 
-    <img class="left arrow" onclick="previousImage();" src="embedded/arrow-left.svg">
 
-    <img class="right arrow" onclick="nextImage();" src="embedded/arrow-right.svg">
 
+    <img class="left arrow" style="display:none;" onclick="previousImage();" src="embedded/arrow-left.svg">
 
+    <img class="right arrow" style="display:none;" onclick="nextImage();" src="embedded/arrow-right.svg">
 
     <img class="zoom in" onclick="zoomIn();" src="embedded/zoom-in.svg">
 
     <img class="zoom in" onclick="zoomIn();" src="embedded/zoom-in.svg">
 
     <img class="zoom out" onclick="zoomOut();" src="embedded/zoom-out.svg">
 
     <img class="zoom out" onclick="zoomOut();" src="embedded/zoom-out.svg">
 
     <img class="print" onclick="PrintImage();" src="embedded/print.svg">
 
     <img class="print" onclick="PrintImage();" src="embedded/print.svg">
 
@@ -223,7 +223,7 @@
 
                     alert(data.error);
 
                     alert(data.error);
 
                 }else{
 
                 }else{
 
                     nearbyFileList = data;
 
                     nearbyFileList = data;
 
-
 
+                    $(".arrow").css("display", "");
 
                     //Track which index currently the user is viewing
 
                     //Track which index currently the user is viewing
 
                     for (var i = 0; i < nearbyFileList.length; i++){
 
                     for (var i = 0; i < nearbyFileList.length; i++){
 
                         var thisPath = nearbyFileList[i];
 
                         var thisPath = nearbyFileList[i];
 
@@ -270,10 +270,14 @@
 
             var nextPhoto = currentViewingIndex;
 
             var nextPhoto = currentViewingIndex;
 
             if (e.keyCode == 37){
 
             if (e.keyCode == 37){
 
                 //<-
 
                 //<-
 
-                previousImage();
 
+                if (nearbyFileList.length > 0){
 
+                    previousImage();
 
+                }
 
             }else if (e.keyCode == 39){
 
             }else if (e.keyCode == 39){
 
                 //->
 
                 //->
 
-                nextImage();
 
+                if (nearbyFileList.length > 0){
 
+                    nextImage();
 
+                }
 
             }else{
 
             }else{
 
                 //Invalid keycode to operate
 
                 //Invalid keycode to operate
 
                 return;
 
                 return;

+ 5 - 3
web/Photo/embedded/listNearbyImage.js
Wyświetl plik 

@@ -12,12 +12,14 @@ function listNearby(){
 
     dirpath = dirpath.join("/");
 
     dirpath = dirpath.join("/");
 
 
 
     //Get nearby files and filter out the one that is web supported photo format
 
     //Get nearby files and filter out the one that is web supported photo format
 
-    var nearbyFiles = filelib.aglob(dirpath + "/*", "user")
 
+    var nearbyFiles = filelib.readdir(dirpath, "user")
 
     for (var i = 0; i < nearbyFiles.length; i++){
 
     for (var i = 0; i < nearbyFiles.length; i++){
 
-        var ext = nearbyFiles[i].split(".").pop();
 
+        var thisFile = nearbyFiles[i];
 
+        //console.log(JSON.stringify(nearbyFiles[i]));
 
+        var ext = thisFile.Ext.substr(1);
 
         ext = ext.toLowerCase();
 
         ext = ext.toLowerCase();
 
         if (ext == "png" || ext == "jpg" || ext == "jpeg" || ext == "gif" || ext == "webp"){
 
         if (ext == "png" || ext == "jpg" || ext == "jpeg" || ext == "gif" || ext == "webp"){
 
-            result.push(nearbyFiles[i]);
 
+            result.push(thisFile.Filepath);
 
         }
 
         }
 
     }
 
     }

+ 6 - 1
web/SystemAO/file_system/file_operation.html
Wyświetl plik 

@@ -648,7 +648,9 @@
 
                     switch (progress.StatusFlag) {
 
                     switch (progress.StatusFlag) {
 
                         case 1:
 
                         case 1:
 
                             if ($("#opricon").attr("src") != "img/paused.png"){
 
                             if ($("#opricon").attr("src") != "img/paused.png"){
 
+                                //Show paused UI state
 
                                 $("#opricon").attr("src", "img/paused.png");
 
                                 $("#opricon").attr("src", "img/paused.png");
 
+                                $("#pauseButton").text(applocale.getString("button/resume","Resume"));
 
                             }
 
                             }
 
                             break;
 
                             break;
 
                         case 2:
 
                         case 2:
 
@@ -658,15 +660,18 @@
 
                             break;
 
                             break;
 
                         default:
 
                         default:
 
                             if ($("#opricon").attr("src") != originalIcon){
 
                             if ($("#opricon").attr("src") != originalIcon){
 
+                                //Show 
                                 $("#opricon").attr("src",originalIcon);
 
                                 $("#opricon").attr("src",originalIcon);
 
+                                $("#pauseButton").text(applocale.getString("button/pause","Pause"));
 
                             }
 
                             }
 
                     }
 
                     }
 
                 }
 
                 }
 
                 $("#progressbar").css("width", progress.Progress + "%");
 
                 $("#progressbar").css("width", progress.Progress + "%");
 
                 $("#progress").text(progress.Progress + "%")
 
                 $("#progress").text(progress.Progress + "%")
 
-                if (progress.Progress == 100){
 
+                if (progress.Progress >= 100){
 
                     //Set progress bar to green
 
                     //Set progress bar to green
 
                     $("#progressbar").css("background-color", "#2bba35");
 
                     $("#progressbar").css("background-color", "#2bba35");
 
+                    $("#progress").text("100%");
 
                 }
 
                 }
 
             }
 
             }

+ 11 - 2
web/desktop.system
Wyświetl plik 

@@ -938,6 +938,7 @@
 
 

 

             .backgroundtaskObject{

             .backgroundtaskObject{

                 padding: 0.4em;

                 padding: 0.4em;

+                padding-right: 0.8em;

                 padding-left: 1.2em;

                 padding-left: 1.2em;

             }

             }

 

 

@@ -1130,6 +1131,7 @@
 
 

 

     <!-- Background Task Panel -->

     <!-- Background Task Panel -->

     <div id="backgroundTaskPanel" class="" style="display:none;">

     <div id="backgroundTaskPanel" class="" style="display:none;">

+        <!--

         <div class="backgroundtaskObject">

         <div class="backgroundtaskObject">

             <small>src > dest (test.mp4)</small>

             <small>src > dest (test.mp4)</small>

             <div class="ui grid">

             <div class="ui grid">

@@ -1151,6 +1153,7 @@
 
               </div>

               </div>

               <div class="ui divider" style="margin-top: 0;"></div>

               <div class="ui divider" style="margin-top: 0;"></div>

         </div>

         </div>

+        -->

     </div>

     </div>

 

 

     <!-- Content / Quick Access Panel-->

     <!-- Content / Quick Access Panel-->

@@ -1449,6 +1452,12 @@
 
         function updateBackgroundgTaskList(){

         function updateBackgroundgTaskList(){

             //Update background tasks

             //Update background tasks

             $.get("system/file_system/ongoing", function(tasks){

             $.get("system/file_system/ongoing", function(tasks){

+

+                tasks.sort(function(a, b) { 

+                    return a.ID > b.ID;

+                });

+

+                console.log(tasks);

                 $("#backgroundTaskPanel").html("");

                 $("#backgroundTaskPanel").html("");

                 tasks.forEach(function(task){

                 tasks.forEach(function(task){

                     console.log(task);

                     console.log(task);

@@ -1465,14 +1474,14 @@
 
                     $("#backgroundTaskPanel").append(`<div class="backgroundtaskObject ${pausedClass}">

                     $("#backgroundTaskPanel").append(`<div class="backgroundtaskObject ${pausedClass}">

                         <small>${centerTruncat(task.Src, 22, "...")} <i class="angle right icon"></i> ${centerTruncat(task.Dest, 22, "...")} (${centerTruncat(task.LatestFile, 30, "...")})</small>

                         <small>${centerTruncat(task.Src, 22, "...")} <i class="angle right icon"></i> ${centerTruncat(task.Dest, 22, "...")} (${centerTruncat(task.LatestFile, 30, "...")})</small>

                         <div class="ui grid">

                         <div class="ui grid">

-                            <div class="twelve wide column" style="padding-right: 0.4em;">

+                            <div class="twelve wide column" style="padding-right: 0.4em; padding-bottom: 0.4em;">

                                 <div class="ui mini active progress">

                                 <div class="ui mini active progress">

                                     <div class="bar" style="width: ${task.Progress}%;">

                                     <div class="bar" style="width: ${task.Progress}%;">

                                         <div class="progress">${task.Progress}%</div>

                                         <div class="progress">${task.Progress}%</div>

                                     </div>

                                     </div>

                                 </div>

                                 </div>

                             </div>

                             </div>

-                            <div class="four wide column"  style="padding-top: 0.4em; padding-left: 0;" align="right">

+                            <div class="four wide column"  style="padding-top: 0.4em; padding-left: 0;  padding-bottom: 0.4em;" align="right">

                                 <button class="circular ui mini basic icon ${cancelBtnDisabled} button" oprid="${task.ID}" onclick="handleBackgroundTaskPauseToggle('${task.ID}', this, ${task.FileOperationSignal==1});">

                                 <button class="circular ui mini basic icon ${cancelBtnDisabled} button" oprid="${task.ID}" onclick="handleBackgroundTaskPauseToggle('${task.ID}', this, ${task.FileOperationSignal==1});">

                                     <i class="${pauseIcon} icon"></i>

                                     <i class="${pauseIcon} icon"></i>

                                 </button>

                                 </button>