vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

code cleanup

Browse source
This commit is contained in:
Prssanna Desai 2019-05-22 13:03:13 +05:30
parent e5fb520586
commit 1f275435c1
2 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frappe/public/js/frappe/form/toolbar.js
View file

@ -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() {

46
frappe/public/js/frappe/list/list_view.js
View file

@ -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) {