You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2021/12/10 16:58:43 UTC

[incubator-ponymail-foal] branch master updated (180144d -> 1d53269)

This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.


    from 180144d  regen JS
     new e672215  clear escrow AFTER JSON has been fully fetched, not after 200 response
     new 1d53269  regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/admin.html                        | 8 ++++----
 webui/index.html                        | 6 +++---
 webui/js/ponymail.js                    | 5 +++--
 webui/js/source/base-http-extensions.js | 3 ++-
 webui/list.html                         | 8 ++++----
 webui/oauth.html                        | 8 ++++----
 webui/thread.html                       | 8 ++++----
 7 files changed, 24 insertions(+), 22 deletions(-)

[incubator-ponymail-foal] 02/02: regen JS

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 1d532695acc8ca7679b9327b4f195db6d7a7d534
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Dec 10 17:58:35 2021 +0100

    regen JS
---
 webui/admin.html     | 8 ++++----
 webui/index.html     | 6 +++---
 webui/js/ponymail.js | 5 +++--
 webui/list.html      | 8 ++++----
 webui/oauth.html     | 8 ++++----
 webui/thread.html    | 8 ++++----
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index fcd5b02..d174578 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
     <!-- Bootstrap -->
 
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=e672215" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -79,9 +79,9 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=d024a91"></script>
-    <script src="js/wordcloud.js?revision=d024a91"></script>
-    <script src="js/ponymail.js?revision=d024a91"></script>
+    <script src="js/config.js?revision=e672215"></script>
+    <script src="js/wordcloud.js?revision=e672215"></script>
+    <script src="js/ponymail.js?revision=e672215"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
   </body>
diff --git a/webui/index.html b/webui/index.html
index 90a4cf3..efb0f8a 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
     <!-- Bootstrap -->
     
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=e672215" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -60,8 +60,8 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=d024a91"></script>
-    <script src="js/ponymail.js?revision=d024a91"></script>
+    <script src="js/config.js?revision=e672215"></script>
+    <script src="js/ponymail.js?revision=e672215"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
     
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 1a78d8e..42076e8 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'd024a91';
+const PONYMAIL_REVISION = 'e672215';
 
 
 /******************************************
@@ -178,7 +178,6 @@ async function GET(url, callback, state) {
             // Since this is an async request, the request may have been canceled
             // by the time we get a response. Only do callback if not.
             if (async_escrow[pkey] !== undefined) {
-                delete async_escrow[pkey]; // move out of escrow when fetched
                 res = rv;
             }
         } catch (e) {
@@ -196,6 +195,7 @@ async function GET(url, callback, state) {
                 js = res_json;
             } else {
                 js = await res.json();
+                delete async_escrow[pkey]; // move out of escrow when fetched
                 async_cache[url] = js;
             }
             if (callback) {
@@ -205,6 +205,7 @@ async function GET(url, callback, state) {
             }
         } else {
             console.log("URL %s returned HTTP code %u, snapping!".format(url, res.status));
+            delete async_escrow[pkey]; // move out of escrow when fetched
             async_snap(res);
         }
     }
diff --git a/webui/list.html b/webui/list.html
index f67899f..6aa9860 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
     <!-- Bootstrap -->
     
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=e672215" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -173,9 +173,9 @@ the License. -->
     </script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=d024a91"></script>
-    <script src="js/wordcloud.js?revision=d024a91"></script>
-    <script src="js/ponymail.js?revision=d024a91"></script>
+    <script src="js/config.js?revision=e672215"></script>
+    <script src="js/wordcloud.js?revision=e672215"></script>
+    <script src="js/ponymail.js?revision=e672215"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
     <script type="text/javascript">
diff --git a/webui/oauth.html b/webui/oauth.html
index d3cb970..1db2614 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
     <!-- CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=e672215" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=d024a91"></script>
-    <script src="js/ponymail.js?revision=d024a91"></script>
-    <script src="js/oauth.js?revision=d024a91"></script>
+    <script src="js/config.js?revision=e672215"></script>
+    <script src="js/ponymail.js?revision=e672215"></script>
+    <script src="js/oauth.js?revision=e672215"></script>
   </body>
 </html>
diff --git a/webui/thread.html b/webui/thread.html
index 1ef3d98..e6a5a02 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
     <!-- Bootstrap -->
     
     <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-    <link href="css/scaffolding.css?revision=d024a91" rel="stylesheet" media="all">
+    <link href="css/scaffolding.css?revision=e672215" rel="stylesheet" media="all">
     <link href="css/modal.css" rel="stylesheet" media="all">
     <link href="css/spinner.css" rel="stylesheet" media="all">
     <link rel="alternate" href="/api/static.lua"/>
@@ -97,9 +97,9 @@ the License. -->
     <script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
-    <script src="js/config.js?revision=d024a91"></script>
-    <script src="js/wordcloud.js?revision=d024a91"></script>
-    <script src="js/ponymail.js?revision=d024a91"></script>
+    <script src="js/config.js?revision=e672215"></script>
+    <script src="js/wordcloud.js?revision=e672215"></script>
+    <script src="js/ponymail.js?revision=e672215"></script>
     <div id="splash" class="splash fade-in"> &nbsp; </div>
     <div style="clear: both;"></div>
   </body>

[incubator-ponymail-foal] 01/02: clear escrow AFTER JSON has been fully fetched, not after 200 response

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit e672215a3918d9006627b978407b1b073ec991bd
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Dec 10 17:58:26 2021 +0100

    clear escrow AFTER JSON has been fully fetched, not after 200 response
---
 webui/js/source/base-http-extensions.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webui/js/source/base-http-extensions.js b/webui/js/source/base-http-extensions.js
index 54789aa..5ac6238 100644
--- a/webui/js/source/base-http-extensions.js
+++ b/webui/js/source/base-http-extensions.js
@@ -94,7 +94,6 @@ async function GET(url, callback, state) {
             // Since this is an async request, the request may have been canceled
             // by the time we get a response. Only do callback if not.
             if (async_escrow[pkey] !== undefined) {
-                delete async_escrow[pkey]; // move out of escrow when fetched
                 res = rv;
             }
         } catch (e) {
@@ -112,6 +111,7 @@ async function GET(url, callback, state) {
                 js = res_json;
             } else {
                 js = await res.json();
+                delete async_escrow[pkey]; // move out of escrow when fetched
                 async_cache[url] = js;
             }
             if (callback) {
@@ -121,6 +121,7 @@ async function GET(url, callback, state) {
             }
         } else {
             console.log("URL %s returned HTTP code %u, snapping!".format(url, res.status));
+            delete async_escrow[pkey]; // move out of escrow when fetched
             async_snap(res);
         }
     }