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

fix: dropdowns open to right

Browse source
This commit is contained in:
sokumon 2025-01-09 16:14:07 +05:30
parent 3d47953847
commit 6749aef6ba
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -593,7 +593,7 @@ frappe.ui.Page = class Page {
return $('<li class="dropdown-divider"></li>').appendTo(this.menu);
}
get_or_add_inner_group_button(label) {
get_or_add_inner_group_button(label, align_right) {
var $group = this.inner_toolbar.find(
`.inner-group-button[data-label="${encodeURIComponent(label)}"]`
);
@ -604,7 +604,7 @@ frappe.ui.Page = class Page {
${label}
${frappe.utils.icon("select", "xs")}
</button>
<div role="menu" class="dropdown-menu"></div>
<div role="menu" class="dropdown-menu ${align_right ? "dropdown-menu-right" : ""}"></div>
</div>`
).appendTo(this.inner_toolbar);
}
@ -650,7 +650,7 @@ frappe.ui.Page = class Page {
* @param {object} action - function to be called when button is clicked
* @param {string} group - Label of the group button
*/
add_inner_button(label, action, group, type = "default") {
add_inner_button(label, action, group, type = "default", align_right = false) {
var me = this;
let _action = function () {
let btn = $(this);
@ -667,7 +667,7 @@ frappe.ui.Page = class Page {
}
if (group) {
var $group = this.get_or_add_inner_group_button(group);
var $group = this.get_or_add_inner_group_button(group, align_right);
$(this.inner_toolbar).removeClass("hide");
if (!this.is_in_group_button_dropdown($group.find(".dropdown-menu"), "a", label)) {

14
frappe/public/js/frappe/views/treeview.js
View file

@ -61,7 +61,6 @@ frappe.views.TreeView = class TreeView {
this.make_page();
this.make_filters();
this.root_value = null;
if (me.opts.get_tree_root) {
this.get_root();
}
@ -113,7 +112,9 @@ frappe.views.TreeView = class TreeView {
function () {
me.rebuild_tree();
},
__("Expand")
__("Expand"),
"default",
true
);
}
@ -123,7 +124,9 @@ frappe.views.TreeView = class TreeView {
function () {
me.tree.load_children(me.tree.root_node, false);
},
__("Expand")
__("Expand"),
"default",
true
);
this.page.add_inner_button(
@ -131,7 +134,9 @@ frappe.views.TreeView = class TreeView {
function () {
me.tree.load_children(me.tree.root_node, true);
},
__("Expand")
__("Expand"),
"default",
true
);
}
@ -186,7 +191,6 @@ frappe.views.TreeView = class TreeView {
}
get_root() {
var me = this;
frappe.call({
method: me.get_tree_nodes,
args: me.args,