From 1367f56a7898a125d46d9ebfb8cbfe81617180ad Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 23 Aug 2023 12:32:42 -0400
Subject: fixed  setting dashboard color

---
 src/client/views/DashboardView.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/client/views/DashboardView.tsx')

diff --git a/src/client/views/DashboardView.tsx b/src/client/views/DashboardView.tsx
index 3e4827c83..5a821faee 100644
--- a/src/client/views/DashboardView.tsx
+++ b/src/client/views/DashboardView.tsx
@@ -47,12 +47,12 @@ export class DashboardView extends React.Component {
     @action abortCreateNewDashboard = () => {
         this.newDashboardName = undefined;
     };
-    @action setNewDashboardName(name: string) {
+    @action setNewDashboardName = (name: string) => {
         this.newDashboardName = name;
-    }
-    @action setNewDashboardColor(color: string) {
+    };
+    @action setNewDashboardColor = (color: string) => {
         this.newDashboardColor = color;
-    }
+    };
 
     @action
     selectDashboardGroup = (group: DashboardGroup) => {
-- 
cgit v1.2.3-70-g09d2


From b3dbdb5e20dfafe62e03c336d3137775ca0a57cb Mon Sep 17 00:00:00 2001
From: geireann <geireann.lindfield@gmail.com>
Date: Wed, 23 Aug 2023 21:43:59 -0400
Subject: fix attempts for iconifying on browndash

---
 src/client/views/DashboardView.tsx                     | 2 +-
 src/client/views/collections/CollectionDockingView.tsx | 2 +-
 src/client/views/nodes/WebBoxRenderer.js               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/client/views/DashboardView.tsx')

diff --git a/src/client/views/DashboardView.tsx b/src/client/views/DashboardView.tsx
index 5a821faee..231a2d5fb 100644
--- a/src/client/views/DashboardView.tsx
+++ b/src/client/views/DashboardView.tsx
@@ -176,7 +176,7 @@ export class DashboardView extends React.Component {
                     </div>
                     <div className="all-dashboards">
                         {this.getDashboards(this.selectedDashboardGroup).map(dashboard => {
-                            const href = ImageCast(dashboard.thumb)?.url.href;
+                            const href = ImageCast(dashboard.thumb)?.url?.href;
                             const shared = Object.keys(dashboard[DocAcl])
                                 .filter(key => key !== `acl-${Doc.CurrentUserEmailNormalized}` && !['acl-Me', 'acl-Guest'].includes(key))
                                 .some(key => dashboard[DocAcl][key] !== AclPrivate);
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index 95f88f14e..e15d57306 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -551,7 +551,7 @@ export class CollectionDockingView extends CollectionSubView() {
     };
 
     render() {
-        const href = ImageCast(this.rootDoc.thumb)?.url.href;
+        const href = ImageCast(this.rootDoc.thumb)?.url?.href;
         return this.props.renderDepth > -1 ? (
             <div>
                 {href ? (
diff --git a/src/client/views/nodes/WebBoxRenderer.js b/src/client/views/nodes/WebBoxRenderer.js
index eb8064780..60d997120 100644
--- a/src/client/views/nodes/WebBoxRenderer.js
+++ b/src/client/views/nodes/WebBoxRenderer.js
@@ -42,7 +42,7 @@ 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("https://dashblobstore.blob.core.windows.net")) {
                 url = CorsProxy(inurl);
             }
             xhr.open('GET', url);
-- 
cgit v1.2.3-70-g09d2

