Merge branch 'master' into UI_Update_Eric_Ma

1 files changed, 3 insertions, 3 deletions

diff --git a/src/client/views/nodes/WebBoxRenderer.js b/src/client/views/nodes/WebBoxRenderer.js
index eb8064780..425ef3e54 100644
--- a/src/client/views/nodes/WebBoxRenderer.js
+++ b/src/client/views/nodes/WebBoxRenderer.js
@@ -42,21 +42,21 @@ var ForeignHtmlRenderer = function (styleSheets) {
                 url = CorsProxy(new URL(webUrl).origin + inurl);
             } else if (!inurl.startsWith('http') && !inurl.startsWith('//')) {
                 url = CorsProxy(webUrl + '/' + inurl);
-            } else if (inurl.startsWith('https')) {
+            } else if (inurl.startsWith('https') && !inurl.startsWith(window.location.origin)) {
                 url = CorsProxy(inurl);
             }
             xhr.open('GET', url);
             xhr.responseType = 'blob';
 
             xhr.onreadystatechange = async function () {
-                if (xhr.readyState === 4 && xhr.status === 200) {
+                if (xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200) {
                     const resBase64 = await binaryStringToBase64(xhr.response);
 
                     resolve({
                         resourceUrl: inurl,
                         resourceBase64: resBase64,
                     });
-                } else if (xhr.readyState === 4) {
+                } else if (xhr.readyState === XMLHttpRequest.DONE) {
                     console.log("COULDN'T FIND: " + (inurl.startsWith('/') ? webUrl + inurl : inurl));
                     resolve({
                         resourceUrl: '',