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

Prevent Duplicate Buttons In add_inner_button (#4858)

Browse source 
* refactor add_inner_button:
1. create new function - is_in_group_button_dropdown
2. rewrite the code using checks with is_in_group_button_dropdown

* adds JSDoc documentation

* use `is_in_group_button_dropdown` in `add_dropdown_item` for DRY

* clean up
This commit is contained in:
tundebabzy 2018-01-23 10:57:49 +01:00 • committed by Rushabh Mehta
parent 26dec6157c
commit e711fca20e
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
frappe/public/js/frappe/ui/page.js
View file

@ -256,17 +256,14 @@ frappe.ui.Page = Class.extend({
* @param {object} parent - DOM object representing the parent of the drop down item lists
*/
add_dropdown_item: function(label, click, standard, parent) {
const is_already_added = () => {
let found_lists = $(parent).find('li > a.grey-link:contains(' + label + ')');
return found_lists.length > 0;
}
let item_selector = 'li > a.grey-link';
parent.parent().removeClass("hide");
var $li = $('<li><a class="grey-link">'+ label +'</a><li>'),
$link = $li.find("a").on("click", click);
if (is_already_added()) return;
if (this.is_in_group_button_dropdown(parent, `${item_selector}:contains('${label}')`, label)) return;
if(standard===true) {
$li.appendTo(parent);
@ -281,6 +278,21 @@ frappe.ui.Page = Class.extend({
return $link;
},
/*
* Check if there already exists a button with a specified label in a specified button group
* @param {object} parent - This should be the `ul` of the button group.
* @param {string} selector - CSS Selector of the button to be searched for. By default, it is `li`.
* @param {string} label - Label of the button
*/
is_in_group_button_dropdown: function(parent, selector, label){
if (!selector) selector = 'li';
if (!label || !parent) return false;
const result = $(parent).find(`${selector}:contains('${label}')`);
return result.length > 0;
},
clear_btn_group: function(parent) {
parent.empty();
parent.parent().addClass("hide");
@ -323,6 +335,15 @@ frappe.ui.Page = Class.extend({
}
},
/*
* Add button to button group. If there exists another button with the same label,
* `add_inner_button` will not add the new button to the button group even if the callback
* function is different.
*
* @param {string} label - Label of the button to be added to the group
* @param {object} action - function to be called when button is clicked
* @param {string} group - Label of the group button
*/
add_inner_button: function(label, action, group) {
var me = this;
let _action = function() {
@ -333,9 +354,13 @@ frappe.ui.Page = Class.extend({
if(group) {
var $group = this.get_or_add_inner_group_button(group);
$(this.inner_toolbar).removeClass("hide");
return $('<li><a>'+label+'</a></li>')
.on('click', _action)
.appendTo($group.find(".dropdown-menu"));
if (!this.is_in_group_button_dropdown($group.find(".dropdown-menu"), 'li', label)) {
return $('<li><a>'+label+'</a></li>')
.on('click', _action)
.appendTo($group.find(".dropdown-menu"));
}
} else {
return $('<button class="btn btn-default btn-xs" style="margin-left: 10px;">'+__(label)+'</btn>')
.on("click", _action)