From c658ac48b98c252945f5d286c9d6e2c496f05632 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Wed, 10 Jun 2020 18:56:55 -0400
Subject: [PATCH] fix octoprint

---
 src/kiri/export.js | 17 +++++++++++------
 src/kiri/main.js   |  6 +++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/kiri/export.js b/src/kiri/export.js
index f8a0ed4e..7bcd0001 100644
--- a/src/kiri/export.js
+++ b/src/kiri/export.js
@@ -54,8 +54,12 @@
                     }
                     segment = line.message;
                 }
-                if (line.progress) API.show.progress(line.progress, "exporting");
-                if (line.data) lines.push(line.data);
+                if (line.progress) {
+                    API.show.progress(line.progress, "exporting");
+                }
+                if (line.data) {
+                    lines.push(line.data);
+                }
             }, function(done) {
                 currentPrint.exported = true;
                 times[`${seq++}_${segment}`] = Date.now() - mark;
@@ -161,7 +165,7 @@
                 API.show.alert("host missing protocol (http:// or https://)");
                 return;
             }
-            if (SECURE && !isSecure(host)) {
+            if (API.const.SECURE && !API.util.isSecure(host)) {
                 API.show.alert("host must begin with 'https' on a secure site");
                 return;
             }
@@ -180,10 +184,11 @@
                     } else {
                         API.show.alert("octoprint error\nstatus: "+status+"\nmessage: "+ajax.responseText);
                     }
+                    API.show.progress(0);
                 }
             };
             ajax.upload.addEventListener('progress', function(evt) {
-                setProgress(Math.ceil(evt.loaded/evt.total), "sending");
+                API.show.progress(evt.loaded/evt.total, "sending");
             });
             ajax.open("POST", host+"/api/files/local");
             ajax.setRequestHeader("X-Api-Key", apik);
@@ -362,11 +367,11 @@
                     } else {
                         API.show.alert("grid:host error\nstatus: "+status+"\nmessage: "+xhtr.responseText, 10000);
                     }
-                    setProgress(0);
+                    API.show.progress(0);
                 }
             };
             xhtr.upload.addEventListener('progress', function(evt) {
-                setProgress(Math.ceil(evt.loaded/evt.total), "sending");
+                API.show.progress(Math.ceil(evt.loaded/evt.total), "sending");
             });
             filename = $('print-filename').value;
             xhtr.open("POST",
diff --git a/src/kiri/main.js b/src/kiri/main.js
index 0e8d8588..0b9aceea 100644
--- a/src/kiri/main.js
+++ b/src/kiri/main.js
@@ -172,7 +172,8 @@
             LOCAL,
             MODES,
             VIEWS,
-            SETUP
+            SETUP,
+            SECURE
         },
         var: {
             layer_lo: 0,
@@ -250,6 +251,9 @@
             clear: clearWorkspace,
             save: saveWorkspace,
         },
+        util: {
+            isSecure
+        },
         view: {
             get: function() { return viewMode },
             set: setViewMode,