diff --git a/frappe/public/js/docs.js b/frappe/public/js/docs.js index 1e11253d1b..4fea7d676e 100644 --- a/frappe/public/js/docs.js +++ b/frappe/public/js/docs.js @@ -7,21 +7,6 @@ $(function() { }); } - $(".toggle-sidebar").on("click", function() { - $(".offcanvas").addClass("active-right"); - return false; - }); - - // collapse offcanvas sidebars! - $(".offcanvas .sidebar").on("click", "a", function() { - $(".offcanvas").removeClass("active-left active-right"); - }); - - $(".offcanvas-main-section-overlay").on("click", function() { - $(".offcanvas").removeClass("active-left active-right"); - return false; - }); - // search $('.sidebar-navbar-items .octicon-search, .navbar .octicon-search').parent().on("click", function() { var modal = frappe.get_modal("Search", diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 27682ae6e0..d76e067163 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -217,14 +217,6 @@ frappe.Application = Class.extend({ frappe.frappe_toolbar = new frappe.ui.toolbar.Toolbar(); } - // collapse offcanvas sidebars! - $(".offcanvas .sidebar").on("click", "a", function() { - $(".offcanvas").removeClass("active-left active-right"); - }); - - $(".offcanvas-main-section-overlay").on("click", function() { - $(".offcanvas").removeClass("active-left active-right"); - }); }, logout: function() { var me = this; diff --git a/frappe/public/js/frappe/form/sidebar.js b/frappe/public/js/frappe/form/sidebar.js index d0ad1c8f7d..c78b8b700d 100644 --- a/frappe/public/js/frappe/form/sidebar.js +++ b/frappe/public/js/frappe/form/sidebar.js @@ -7,12 +7,10 @@ frappe.ui.form.Sidebar = Class.extend({ make: function() { var sidebar_content = frappe.render_template("form_sidebar", {doctype: this.frm.doctype, frm:this.frm}); - this.offcanvas_form_sidebar = $(".offcanvas .form-sidebar").html(sidebar_content); - this.page_sidebar = $('') + this.sidebar = $('') .html(sidebar_content) .appendTo(this.page.sidebar.empty()); - this.sidebar = this.page_sidebar.add(this.offcanvas_form_sidebar); this.comments = this.sidebar.find(".sidebar-comments"); this.user_actions = this.sidebar.find(".user-actions"); this.image_section = this.sidebar.find(".sidebar-image-section"); @@ -37,7 +35,6 @@ frappe.ui.form.Sidebar = Class.extend({ // scroll to comments this.comments.on("click", function() { - $(".offcanvas").removeClass("active-left active-right"); frappe.utils.scroll_to(me.frm.footer.wrapper.find(".form-comments"), true); }); diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index b8bf07a8e8..c81731799e 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -18,13 +18,10 @@ frappe.views.ListSidebar = Class.extend({ make: function() { var sidebar_content = frappe.render_template("list_sidebar", {doctype: this.doclistview.doctype}); - this.offcanvas_list_sidebar = $(".offcanvas .list-sidebar").html(sidebar_content); - this.page_sidebar = $('') + this.sidebar = $('') .html(sidebar_content) .appendTo(this.page.sidebar.empty()); - this.sidebar = this.page_sidebar.add(this.offcanvas_list_sidebar); - this.setup_reports(); this.setup_assigned_to_me(); this.setup_list_view_switching(); @@ -80,10 +77,6 @@ frappe.views.ListSidebar = Class.extend({ this.page.sidebar.find(".assigned-to-me a").on("click", function() { me.doclistview.assigned_to_me(); }); - - this.offcanvas_list_sidebar.find(".assigned-to-me a").on("click", function() { - me.doclistview.assigned_to_me(); - }); }, setup_list_view_switching: function() { var me = this; diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 1c7c07a1da..3628ddcd30 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -8,9 +8,7 @@ frappe.ui.toolbar.Toolbar = Class.extend({ var header = $('header').append(frappe.render_template("navbar", { avatar: frappe.avatar(frappe.session.user) })); - var sidebar = $('.offcanvas .sidebar-left').append(frappe.render_template("offcanvas_left_sidebar", {})); - // header.find(".toggle-sidebar").on("click", frappe.ui.toolbar.toggle_left_sidebar); header.find(".toggle-sidebar").on("click", function () { var layout_side_section = $('.layout-side-section'); var overlay_sidebar = layout_side_section.find('.overlay-sidebar'); @@ -37,11 +35,6 @@ frappe.ui.toolbar.Toolbar = Class.extend({ } }); - header.find(".toggle-navbar-new-comments").on("click", function() { - $(".offcanvas").toggleClass("active-right").removeClass("active-left"); - return false; - }); - $(document).on("notification-update", function() { frappe.ui.notifications.update_notifications(); }); @@ -83,10 +76,6 @@ $.extend(frappe.ui.toolbar, { frappe.ui.toolbar.get_menu(menu) : menu; $('
  • ').prependTo(menu); - }, - toggle_left_sidebar: function() { - $(".offcanvas").toggleClass("active-left").removeClass("active-right"); - return false; } }); diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js index 7585372e0d..6c388624b4 100644 --- a/frappe/public/js/legacy/form.js +++ b/frappe/public/js/legacy/form.js @@ -114,6 +114,7 @@ _f.Frm.prototype.setup = function() { frm: this, parent: $('
    ').appendTo(this.page.main.parent()) }) + $("body").attr("data-sidebar", 1); } this.setup_drag_drop(); diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html index 9a86c1297a..bf1bdca4dc 100644 --- a/frappe/templates/autodoc/base_template.html +++ b/frappe/templates/autodoc/base_template.html @@ -96,14 +96,6 @@
    - - diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 3b77b6eb7a..6e78686b26 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -80,14 +80,6 @@ {%- block footer -%}{% include "templates/includes/footer/footer.html" %}{%- endblock -%} - - diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index ab2a9c26ee..c669a27fc8 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -296,7 +296,6 @@ $.extend(frappe, { if(e.which===13 && val) { $(this).val("").blur(); frappe.do_search(val); - $(".offcanvas").removeClass("active-left active-right"); return false; } }); @@ -375,21 +374,6 @@ $(document).ready(function() { frappe.bind_navbar_search(); - $(".toggle-sidebar").on("click", function() { - $(".offcanvas").addClass("active-right"); - return false; - }); - - // collapse offcanvas sidebars! - $(".offcanvas .sidebar").on("click", "a", function() { - $(".offcanvas").removeClass("active-left active-right"); - }); - - $(".offcanvas-main-section-overlay").on("click", function() { - $(".offcanvas").removeClass("active-left active-right"); - return false; - }); - // switch to app link if(getCookie("system_user")==="yes" && logged_in) { $("#website-post-login .dropdown-menu").append('
  • Switch To Desk
  • '); diff --git a/frappe/www/desk.html b/frappe/www/desk.html index 0cddd42a40..410a639750 100644 --- a/frappe/www/desk.html +++ b/frappe/www/desk.html @@ -29,11 +29,6 @@
    - - -