`;
diff --git a/src/gui/src/UI/UIPrompt.js b/src/gui/src/UI/UIPrompt.js
index 56b8f4ea4c..2dadf6d474 100644
--- a/src/gui/src/UI/UIPrompt.js
+++ b/src/gui/src/UI/UIPrompt.js
@@ -81,6 +81,15 @@ function UIPrompt(options){
setTimeout(function(){
$(this_window).find('.prompt-input').get(0).focus({preventScroll:true});
}, 30);
+
+ // Add event listener for Escape key
+ $(document).on('keyup.uiprompt', function(e) {
+ if (e.key === 'Escape') {
+ resolve(false);
+ $(el_window).close();
+ $(document).off('keyup.uiprompt'); // Remove event listener
+ }
+ });
},
...options.window_options,
window_css:{
@@ -108,6 +117,7 @@ function UIPrompt(options){
resolve(false);
}
$(el_window).close();
+ $(document).off('keyup.uiprompt'); // Remove event listener
return false;
})
diff --git a/src/gui/src/UI/UITaskbar.js b/src/gui/src/UI/UITaskbar.js
index d0818e0e26..172243409e 100644
--- a/src/gui/src/UI/UITaskbar.js
+++ b/src/gui/src/UI/UITaskbar.js
@@ -42,7 +42,7 @@ async function UITaskbar(options){
});
let h = '';
- h += `
`;
$('.desktop').append(h);
@@ -65,11 +65,12 @@ async function UITaskbar(options){
// show popover
let popover = UIPopover({
- content: `
✕
`,
+ content: `
`,
snapToElement: item,
parent_element: item,
width: 500,
height: 500,
+ class: 'popover-launcher',
center_horizontally: true,
});
@@ -238,7 +239,6 @@ async function UITaskbar(options){
}
})
- window.recalibrate_taskbar_item_positions();
window.make_taskbar_sortable();
}
@@ -305,28 +305,4 @@ window.make_taskbar_sortable = function(){
});
}
-window.recalibrate_taskbar_item_positions = function(){
- // if this is mobile rearrange taskbar item positions based on absolute position
- // taskbar items must be centered unless there is overflow. If there is overflow, the taskbar items must be left aligned
- if(isMobile.phone || window.desktop_width < 800){
- let taskbar_items = $('.taskbar-item');
- let taskbar_width = taskbar_items.length * 60;
-
- if(taskbar_width > window.desktop_width){
- // set taskbar items to absolute position
- $('.taskbar-item').css('position', 'absolute');
- $('.taskbar').css('display', 'block');
- // set left position for each taskbar item
- let left = 0;
- for (let index = 0; index < taskbar_items.length; index++) {
- const taskbar_item = taskbar_items[index];
- $(taskbar_item).css('left', left);
- left += 60;
- }
- }else{
- $('.taskbar-item').css('position', 'unset');
- $('.taskbar').css('justify-content', 'center');
- }
- }
-}
export default UITaskbar;
\ No newline at end of file
diff --git a/src/gui/src/UI/UITaskbarItem.js b/src/gui/src/UI/UITaskbarItem.js
index 31007ee9c5..93221d1a90 100644
--- a/src/gui/src/UI/UITaskbarItem.js
+++ b/src/gui/src/UI/UITaskbarItem.js
@@ -30,6 +30,8 @@ function UITaskbarItem(options){
options.open_windows_count = options.open_windows_count ?? 0;
options.lock_keep_in_taskbar = options.lock_keep_in_taskbar ?? false;
options.append_to_taskbar = options.append_to_taskbar ?? true;
+ options.before_trash = options.before_trash ?? false;
+
const element_id = window.global_element_id++;
h += `
`;
h += `
`;
- if(options.append_to_taskbar)
- $('.taskbar').append(h);
- else
+ if(options.append_to_taskbar) {
+ if (options.before_trash){
+ $('.taskbar-item[data-app="trash"]').before(h);
+ }else{
+ $('.taskbar').append(h);
+ }
+ }else{
$('body').prepend(h);
+ }
const el_taskbar_item = document.querySelector(`#taskbar-item-${tray_item_id}`);
// fade in the taskbar item
$(el_taskbar_item).show(50);
- $(el_taskbar_item).on("click", function(){
+ $(el_taskbar_item).on("click", function(e){
+ e.preventDefault();
+ e.stopPropagation();
+
+ // if this is for the launcher popover, and it's mobile, and has-open-popover, close the popover
+ if( $(el_taskbar_item).attr('data-name') === 'Start'
+ && (isMobile.phone || isMobile.tablet) && $(el_taskbar_item).hasClass('has-open-popover')){
+ $('.popover').remove();
+ return;
+ }
+
// If this item has an open context menu, don't do anything
if($(el_taskbar_item).hasClass('has-open-contextmenu'))
return;
+ el_taskbar_item.querySelector("img").animate(
+ [
+ { transform: 'translateY(0) scale(1)' },
+ { transform: 'translateY(-5px) scale(1.2)' },
+ { transform: 'translateY(0) scale(1)' }
+ ],
+ {
+ duration: 300,
+ easing: 'ease-out',
+ }
+ );
+
if(options.onClick === undefined || options.onClick(el_taskbar_item) === false){
// re-show each window in this app group
$(`.window[data-app="${options.app}"]`).showWindow();
@@ -205,8 +234,7 @@ function UITaskbarItem(options){
menu_items.push({
html: i18n('show_all_windows'),
onClick: function(){
- if(open_windows > 0)
- $(el_taskbar_item).trigger('click');
+ $(`.window[data-app="${options.app}"]`).showWindow();
}
})
// -------------------------------------------
@@ -376,10 +404,6 @@ function UITaskbarItem(options){
}
});
- if(options.append_to_taskbar){
- window.recalibrate_taskbar_item_positions();
- }
-
return el_taskbar_item;
}
diff --git a/src/gui/src/UI/UIWindow.js b/src/gui/src/UI/UIWindow.js
index 0873a394fc..99bce7db0c 100644
--- a/src/gui/src/UI/UIWindow.js
+++ b/src/gui/src/UI/UIWindow.js
@@ -86,11 +86,14 @@ async function UIWindow(options) {
options.is_maximized = options.is_maximized ?? false;
options.is_openFileDialog = options.is_openFileDialog ?? false;
options.is_resizable = options.is_resizable ?? true;
+
// if this is a fullpage window, it won't be resizable
- if(options.is_fullpage)
+ if(options.is_fullpage){
+ options.is_maximized = false;
options.is_resizable = false;
+ }
- // in the embedded/fullpage mode every window is on top since there is no taskbar to switch between windows
+ // In the embedded/fullpage mode every window is on top since there is no taskbar to switch between windows
// if user has specifically asked for this window to NOT stay on top, honor it.
if((window.is_embedded || window.is_fullpage_mode) && !options.parent_uuid && options.stay_on_top !== false)
options.stay_on_top = true;
@@ -151,7 +154,7 @@ async function UIWindow(options) {
else if(isMobile.phone)
options.top = 100;
- if(isMobile.phone){
+ if(isMobile.phone && !options.center && !options.dominant){
options.left = 0;
options.top = window.toolbar_height + 'px';
options.width = '100%';
@@ -186,6 +189,7 @@ async function UIWindow(options) {
user_set_url_params = '?'+ user_set_url_params.join('&');
}
h += `
`;
// iframe, for apps
if(options.iframe_url || options.iframe_srcdoc){
- let allow_str = `camera; encrypted-media; gamepad; display-capture; geolocation; gyroscope; microphone; midi; clipboard-read; clipboard-write; fullscreen;`;
+ let allow_str = `camera; encrypted-media; gamepad; display-capture; geolocation; gyroscope; microphone; midi; clipboard-read; clipboard-write; fullscreen; web-share;`;
if(window.co_isolation_enabled)
allow_str += ' cross-origin-isolated;';
//