From c2826d3046baecb5f24e0558ac73e3848a09a698 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 1 Mar 2023 13:49:29 +0530 Subject: [PATCH 1/2] fix: only load workspace skeleton on workspace body --- frappe/public/js/frappe/views/workspace/workspace.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 76f528dad7..3fc5129604 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -1425,15 +1425,15 @@ frappe.views.Workspace = class Workspace { } create_page_skeleton() { - if ($(".layout-main-section").find(".workspace-skeleton").length) return; + if (this.body.find(".workspace-skeleton").length) return; - $(".layout-main-section").prepend(frappe.render_template("workspace_loading_skeleton")); - $(".layout-main-section").find(".codex-editor").addClass("hidden"); + this.body.prepend(frappe.render_template("workspace_loading_skeleton")); + this.body.find(".codex-editor").addClass("hidden"); } remove_page_skeleton() { - $(".layout-main-section").find(".codex-editor").removeClass("hidden"); - $(".layout-main-section").find(".workspace-skeleton").remove(); + this.body.find(".codex-editor").removeClass("hidden"); + this.body.find(".workspace-skeleton").remove(); } create_sidebar_skeleton() { From 73696718553a07e7bb1ca73fad034168ad8d6e76 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 1 Mar 2023 14:07:03 +0530 Subject: [PATCH 2/2] fix: also load workspace sidebar skeleton on workspace sidebar --- frappe/public/js/frappe/views/workspace/workspace.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 3fc5129604..c613908080 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -1437,15 +1437,15 @@ frappe.views.Workspace = class Workspace { } create_sidebar_skeleton() { - if ($(".list-sidebar").find(".workspace-sidebar-skeleton").length) return; + if (this.sidebar.find(".workspace-sidebar-skeleton").length) return; - $(".list-sidebar").prepend(frappe.render_template("workspace_sidebar_loading_skeleton")); - $(".desk-sidebar").addClass("hidden"); + this.sidebar.prepend(frappe.render_template("workspace_sidebar_loading_skeleton")); + this.sidebar.find(".standard-sidebar-section").addClass("hidden"); } remove_sidebar_skeleton() { - $(".desk-sidebar").removeClass("hidden"); - $(".list-sidebar").find(".workspace-sidebar-skeleton").remove(); + this.sidebar.find(".standard-sidebar-section").removeClass("hidden"); + this.sidebar.find(".workspace-sidebar-skeleton").remove(); } register_awesomebar_shortcut() {