Merge branch 'master' into heartbeat

1 files changed, 6 insertions, 2 deletions

diff --git a/src/client/views/nodes/WebBoxRenderer.js b/src/client/views/nodes/WebBoxRenderer.js
index cebb94d86..eb8064780 100644
--- a/src/client/views/nodes/WebBoxRenderer.js
+++ b/src/client/views/nodes/WebBoxRenderer.js
@@ -42,6 +42,8 @@ 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')) {
+                url = CorsProxy(inurl);
             }
             xhr.open('GET', url);
             xhr.responseType = 'blob';
@@ -124,7 +126,7 @@ var ForeignHtmlRenderer = function (styleSheets) {
             if (url === null) {
                 break;
             }
-            searchStartIndex = url.foundAtIndex + url.value.length;
+            searchStartIndex = url.foundAtIndex + url.value.length + 1;
             if (mustEndWithQuote && url.value[url.value.length - 1] !== '"') continue;
             const unquoted = removeQuotes(url.value);
             if (!unquoted /* || (!unquoted.startsWith('http')&& !unquoted.startsWith("/") )*/ || unquoted === 'http://' || unquoted === 'https://') {
@@ -216,7 +218,9 @@ var ForeignHtmlRenderer = function (styleSheets) {
             }
 
             const styleElem = document.createElement('style');
-            styleElem.innerHTML = cssStyles.replace('&gt;', '>').replace('&lt;', '<');
+            styleElem.innerHTML =
+                '#mw-sidebar-checkbox ~ .vector-main-menu-container { display: none !important; } ' + // hack to prevent wikipedia menu from appearing
+                cssStyles.replace('&gt;', '>').replace('&lt;', '<');
 
             const styleElemString = new XMLSerializer().serializeToString(styleElem).replace(/&gt;/g, '>').replace(/&lt;/g, '<');