From 1f275435c1b0302d148c29969f8a0f0fa32cdc99 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 22 May 2019 13:03:13 +0530 Subject: [PATCH] code cleanup --- frappe/public/js/frappe/form/toolbar.js | 15 +++++--- frappe/public/js/frappe/list/list_view.js | 46 +++++++++++------------ 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index ea59d0806f..2d88cc0785 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -120,7 +120,8 @@ frappe.ui.form.Toolbar = Class.extend({ this.page.add_menu_item(__("Print"), function() { me.frm.print_doc();}, true); this.print_icon = this.page.add_action_icon("fa fa-print", function() { - me.frm.print_doc();}); + me.frm.print_doc(); + }); } } @@ -146,18 +147,21 @@ frappe.ui.form.Toolbar = Class.extend({ // copy if(in_list(frappe.boot.user.can_create, me.frm.doctype) && !me.frm.meta.allow_copy) { this.page.add_menu_item(__("Duplicate"), function() { - me.frm.copy_doc();}, true); + me.frm.copy_doc(); + }, true); } // rename if(this.can_rename()) { this.page.add_menu_item(__("Rename"), function() { - me.frm.rename_doc();}, true); + me.frm.rename_doc(); + }, true); } // reload this.page.add_menu_item(__("Reload"), function() { - me.frm.reload_doc();}, true); + me.frm.reload_doc(); + }, true); // delete if((cint(me.frm.doc.docstatus) != 1) && !me.frm.doc.__islocal @@ -185,7 +189,8 @@ frappe.ui.form.Toolbar = Class.extend({ // New if(p[CREATE] && !this.frm.meta.issingle) { this.page.add_menu_item(__("New {0} (Ctrl+B)", [__(me.frm.doctype)]), function() { - frappe.new_doc(me.frm.doctype, true);}, true); + frappe.new_doc(me.frm.doctype, true); + }, true); } }, can_save: function() { diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index dc8f3859e4..5dfa9aec76 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -758,7 +758,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } setup_list_keyboard_nav() { - let new_class, is_list_nav, is_image_view; + let is_list_nav, is_image_view; this.next_index = 0; $(document).off('keydown.list').on('keydown.list', null, (e)=> { @@ -784,9 +784,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { if(this.list_items.length) { if(e.which === DOWN) { - new_class = this.nav_down(new_class); + this.nav_down(); } else if(e.which === UP) { - new_class = this.nav_up(new_class); + this.nav_up(); } else if(e.which === ENTER ) { this.nav_enter(is_list_nav, is_image_view); } else if(e.which === SPACE && this.selected) { @@ -799,56 +799,56 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { }); } - nav_down(new_class) { + add_selected_class(index, element) { + let new_class = this.list_items.eq(index).is('button') ? 'page-btn-selected': 'list-selected'; + this.selected = element.addClass(new_class); + } + + remove_selected_class(index, element) { + let new_class = this.list_items.eq(index).is('button') ? 'page-btn-selected': 'list-selected'; + this.selected = element.removeClass(new_class); + } + + nav_down() { if(this.selected && this.selected.is(':visible')) { - new_class = this.list_items.eq(this.next_index).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected.removeClass(new_class); + this.remove_selected_class(this.next_index, this.selected); this.next_index++; this.next_el = this.list_items.eq(this.next_index); if(this.next_el.length > 0) { - new_class = this.list_items.eq(this.next_index).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected = this.next_el.addClass(new_class); + this.add_selected_class(this.next_index, this.next_el); } else { - new_class = this.list_items.eq(0).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected = this.list_items.eq(0).addClass(new_class); + this.add_selected_class(0, this.list_items.eq(0)); this.next_index = 0; } } else { - new_class = this.list_items.eq(0).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected = this.list_items.eq(0).addClass(new_class); + this.add_selected_class(0, this.list_items.eq(0)); this.next_index = 0; } - return new_class; } - nav_up(new_class) { + nav_up() { if(this.selected && this.selected.is(':visible')) { - new_class = this.list_items.eq(this.next_index).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected.removeClass(new_class); + this.remove_selected_class(this.next_index, this.selected); if(this.next_index>0) this.next_index--; this.next_el = this.list_items.eq(this.next_index); if(this.next_el.length > 0) { - new_class = this.list_items.eq(this.next_index).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected = this.next_el.addClass(new_class); + this.add_selected_class(this.next_index, this.next_el); } else { - new_class = this.list_items.eq(this.list_items.length-1).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected = this.list_items.eq(this.list_items.list.length - 1).addClass(new_class); + this.add_selected_class(this.list_items.length-1, this.list_items.eq(this.list_items.list.length - 1)); this.next_index = this.list_items.length - 1; } } else { - new_class = this.list_items.eq(this.list_items.length-1).is('button') ? 'page-btn-selected': 'list-selected'; - this.selected = this.list_items.eq(this.list_items.length - 1).addClass(new_class); + this.add_selected_class(this.list_items.length-1, this.list_items.eq(this.list_items.list.length - 1)); this.next_index = this.list_items.length - 1; } - return new_class; } nav_enter(is_list_nav, is_image_view) {