@@ -264,16 +283,16 @@ function generate_worker_card(worker) {
$(document).on('input change keyup keypress keydown paste cut', '.search-workers', function (e) {
search_workers();
-})
+});
-window.search_workers = function() {
+window.search_workers = function () {
// search workers for query
search_query = $('.search-workers').val().toLowerCase();
- if (search_query === '') {
+ if ( search_query === '' ) {
// hide 'clear search' button
$('.search-clear-workers').hide();
// show all workers again
- $(`.worker-card`).show();
+ $('.worker-card').show();
// remove 'has-value' class from search input
$('.search-workers').removeClass('has-value');
} else {
@@ -289,11 +308,11 @@ window.search_workers = function() {
} else {
$(`.worker-card[data-name="${worker.name}"]`).hide();
}
- })
+ });
// add 'has-value' class to search input
$('.search-workers').addClass('has-value');
- }
-}
+ }
+};
$(document).on('click', '.search-clear-workers', function (e) {
$('.search-workers').val('');
@@ -302,16 +321,16 @@ $(document).on('click', '.search-clear-workers', function (e) {
search_query = '';
// remove 'has-value' class from search input
$('.search-workers').removeClass('has-value');
-})
+});
-function remove_worker_card(worker_name, callback = null) {
- $(`.worker-card[data-name="${worker_name}"]`).fadeOut(200, function() {
+function remove_worker_card (worker_name, callback = null) {
+ $(`.worker-card[data-name="${worker_name}"]`).fadeOut(200, function () {
$(this).remove();
// Update the global workers array to remove the deleted worker
window.workers = window.workers.filter(worker => worker.name !== worker_name);
- if ($(`.worker-card`).length === 0) {
+ if ( $('.worker-card').length === 0 ) {
$('section:not(.sidebar)').hide();
$('#no-workers-notice').show();
} else {
@@ -320,26 +339,26 @@ function remove_worker_card(worker_name, callback = null) {
}
// update select-all-workers checkbox's state
- if($('.worker-checkbox:checked').length === 0){
+ if ( $('.worker-checkbox:checked').length === 0 ) {
$('.select-all-workers').prop('indeterminate', false);
$('.select-all-workers').prop('checked', false);
}
- else if($('.worker-checkbox:checked').length === $('.worker-card').length){
+ else if ( $('.worker-checkbox:checked').length === $('.worker-card').length ) {
$('.select-all-workers').prop('indeterminate', false);
$('.select-all-workers').prop('checked', true);
}
- else{
+ else {
$('.select-all-workers').prop('indeterminate', true);
}
count_workers();
- if (callback) callback();
+ if ( callback ) callback();
});
}
$(document).on('click', '.delete-workers-btn', async function (e) {
// show confirmation alert
- let resp = await puter.ui.alert(`Are you sure you want to delete the selected workers?`, [
+ let resp = await puter.ui.alert('Are you sure you want to delete the selected workers?', [
{
label: 'Delete',
type: 'danger',
@@ -352,7 +371,7 @@ $(document).on('click', '.delete-workers-btn', async function (e) {
type: 'warning',
});
- if (resp === 'delete') {
+ if ( resp === 'delete' ) {
// disable delete button
$('.delete-workers-btn').addClass('disabled');
@@ -363,17 +382,17 @@ $(document).on('click', '.delete-workers-btn', async function (e) {
const workers = $('.worker-checkbox:checked').toArray();
// delete all checked workers
- for (let worker of workers) {
+ for ( let worker of workers ) {
let worker_name = $(worker).attr('data-worker-name');
// delete worker
- await puter.workers.delete(worker_name)
+ await puter.workers.delete(worker_name);
// remove worker card
remove_worker_card(worker_name);
- try{
+ try {
count_workers();
- } catch(err) {
+ } catch ( err ) {
console.log(err);
}
}
@@ -381,7 +400,7 @@ $(document).on('click', '.delete-workers-btn', async function (e) {
// close 'deleting' modal
setTimeout(() => {
puter.ui.hideSpinner();
- if($('.worker-checkbox:checked').length === 0){
+ if ( $('.worker-checkbox:checked').length === 0 ) {
// disable delete button
$('.delete-workers-btn').addClass('disabled');
// reset the 'select all' checkbox
@@ -390,7 +409,7 @@ $(document).on('click', '.delete-workers-btn', async function (e) {
}
}, (start_ts - Date.now()) > 500 ? 0 : 500);
}
-})
+});
$(document).on('click', '.options-icon-worker', function (e) {
e.preventDefault();
@@ -407,24 +426,23 @@ $(document).on('click', '.options-icon-worker', function (e) {
},
],
});
-})
+});
-async function attempt_worker_deletion(worker_name) {
+async function attempt_worker_deletion (worker_name) {
// confirm delete
const alert_resp = await puter.ui.alert(`Are you sure you want to premanently delete ${html_encode(worker_name)} ?`,
- [
- {
- label: 'Yes, delete permanently',
- value: 'delete',
- type: 'danger',
- },
- {
- label: 'Cancel'
- },
- ]
- );
-
- if (alert_resp === 'delete') {
+ [
+ {
+ label: 'Yes, delete permanently',
+ value: 'delete',
+ type: 'danger',
+ },
+ {
+ label: 'Cancel',
+ },
+ ]);
+
+ if ( alert_resp === 'delete' ) {
// remove worker card and update worker count
remove_worker_card(worker_name);
@@ -435,7 +453,7 @@ async function attempt_worker_deletion(worker_name) {
label: 'Ok',
},
]);
- })
+ });
}
}
@@ -443,15 +461,15 @@ $(document).on('click', '.worker-file-path', function (e) {
e.preventDefault();
e.stopPropagation();
e.stopImmediatePropagation();
-
+
const file_path = $(this).attr('data-worker-file-path');
- if(file_path){
+ if ( file_path ) {
puter.ui.launchApp({
name: 'editor',
file_paths: [file_path],
});
}
-})
+});
export default init_workers;
\ No newline at end of file
diff --git a/src/emulator/src/main.js b/src/emulator/src/main.js
index bb334caa4f..751ee431d9 100644
--- a/src/emulator/src/main.js
+++ b/src/emulator/src/main.js
@@ -1,39 +1,39 @@
/*
* Copyright (C) 2024-present Puter Technologies Inc.
- *
+ *
* This file is part of Puter.
- *
+ *
* Puter is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see ';
- let h = ``;
- let copy_icon = ` `;
-
// create html
- h += ``;
- h += `
`;
- h += `${(copy_icon)} `;
- h += `
`;
-
- h += `
${i18n('share_to')}
`
- h += `
`
- h += `
`
- h += `
`
- h += `
`
- h += `
`
- h += `
`
+ h += '
';
+ h += '
';
+ h += `${(copy_icon)} `;
+ h += '
';
+
+ h += `
${i18n('share_to')}
`;
+ h += `
`;
+ h += `
`;
+ h += `
`;
+ h += `
`;
+ h += `
`;
+ h += `
`;
h += '
';
let po = await UIPopover({
@@ -336,26 +336,26 @@ const ipc_listener = async (event, handled) => {
position: 'bottom',
});
- $(po).find('.copy-link').on('click', function(e){
+ $(po).find('.copy-link').on('click', function (e) {
e.preventDefault();
e.stopPropagation();
const url = $(po).find('.social-url').val();
navigator.clipboard.writeText(url);
// set checkmark
- $(po).find('.copy-link').html(`
`);
+ $(po).find('.copy-link').html('
');
// reset checkmark
- setTimeout(function(){
- $(po).find('.copy-link').html(copy_icon)
+ setTimeout(function () {
+ $(po).find('.copy-link').html(copy_icon);
}, 1000);
return false;
- })
+ });
}
//--------------------------------------------------------
// env
//--------------------------------------------------------
- else if(event.data.msg === 'env'){
+ else if ( event.data.msg === 'env' ) {
target_iframe.contentWindow.postMessage({
original_msg_id: msg_id,
}, '*');
@@ -363,9 +363,9 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// createWindow
//--------------------------------------------------------
- else if(event.data.msg === 'createWindow'){
+ else if ( event.data.msg === 'createWindow' ) {
// todo: validate as many of these as possible
- if(event.data.options){
+ if ( event.data.options ) {
const win = await UIWindow({
title: event.data.options.title,
disable_parent_window: event.data.options.disable_parent_window,
@@ -374,15 +374,15 @@ const ipc_listener = async (event, handled) => {
is_resizable: event.data.options.is_resizable,
has_head: event.data.options.has_head,
center: event.data.options.center,
- show_in_taskbar: event.data.options.show_in_taskbar,
+ show_in_taskbar: event.data.options.show_in_taskbar,
iframe_srcdoc: event.data.options.content,
parent_uuid: event.data.appInstanceID,
- })
+ });
// create safe window object
const safe_win = {
id: $(win).attr('data-element_uuid'),
- }
+ };
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
@@ -394,7 +394,7 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// setItem
//--------------------------------------------------------
- else if(event.data.msg === 'setItem' && event.data.key && event.data.value){
+ else if ( event.data.msg === 'setItem' && event.data.key && event.data.value ) {
puter.kv.set({
key: event.data.key,
value: event.data.value,
@@ -404,12 +404,12 @@ const ipc_listener = async (event, handled) => {
target_iframe.contentWindow.postMessage({
original_msg_id: msg_id,
}, '*');
- })
+ });
}
//--------------------------------------------------------
// getItem
//--------------------------------------------------------
- else if(event.data.msg === 'getItem' && event.data.key){
+ else if ( event.data.msg === 'getItem' && event.data.key ) {
puter.kv.get({
key: event.data.key,
app_uid: app_uuid,
@@ -420,12 +420,12 @@ const ipc_listener = async (event, handled) => {
msg: 'getItemSucceeded',
value: result ?? null,
}, '*');
- })
+ });
}
//--------------------------------------------------------
// removeItem
//--------------------------------------------------------
- else if(event.data.msg === 'removeItem' && event.data.key){
+ else if ( event.data.msg === 'removeItem' && event.data.key ) {
puter.kv.del({
key: event.data.key,
app_uid: app_uuid,
@@ -434,38 +434,44 @@ const ipc_listener = async (event, handled) => {
target_iframe.contentWindow.postMessage({
original_msg_id: msg_id,
}, '*');
- })
+ });
}
//--------------------------------------------------------
// showOpenFilePicker
//--------------------------------------------------------
- else if(event.data.msg === 'showOpenFilePicker'){
+ else if ( event.data.msg === 'showOpenFilePicker' ) {
// Auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
// Disable parent window
- $el_parent_window.addClass('window-disabled')
+ $el_parent_window.addClass('window-disabled');
$el_parent_disable_mask.show();
$el_parent_disable_mask.css('z-index', parseInt($el_parent_window.css('z-index')) + 1);
$(target_iframe).blur();
// Allowed_file_types
- let allowed_file_types = "";
- if(event.data.options && event.data.options.accept)
+ let allowed_file_types = '';
+ if ( event.data.options && event.data.options.accept )
+ {
allowed_file_types = event.data.options.accept;
+ }
// selectable_body
let is_selectable_body = false;
- if(event.data.options && event.data.options.multiple && event.data.options.multiple === true)
+ if ( event.data.options && event.data.options.multiple && event.data.options.multiple === true )
+ {
is_selectable_body = true;
+ }
// Open dialog
- let path = event.data.options?.path ?? '/' + window.user.username + '/Desktop';
- if ( (''+path).toLowerCase().startsWith('%appdata%') ) {
+ let path = event.data.options?.path ?? `/${ window.user.username }/Desktop`;
+ if ( (`${path}`).toLowerCase().startsWith('%appdata%') ) {
path = path.slice('%appdata%'.length);
- if ( path !== '' && ! path.startsWith('/') ) path = '/' + path;
- path = '/' + window.user.username + '/AppData/' + app_uuid + path;
+ if ( path !== '' && !path.startsWith('/') ) path = `/${ path}`;
+ path = `/${ window.user.username }/AppData/${ app_uuid }${path}`;
}
UIWindow({
allowed_file_types: allowed_file_types,
@@ -474,8 +480,8 @@ const ipc_listener = async (event, handled) => {
parent_uuid: event.data.appInstanceID,
onDialogCancel: () => {
target_iframe.contentWindow.postMessage({
- msg: "fileOpenCancelled",
- original_msg_id: msg_id,
+ msg: 'fileOpenCancelled',
+ original_msg_id: msg_id,
}, '*');
},
show_maximize_button: false,
@@ -492,37 +498,43 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// mouseClicked
//--------------------------------------------------------
- else if(event.data.msg === 'mouseClicked'){
+ else if ( event.data.msg === 'mouseClicked' ) {
// close all popovers whose parent_id is parent_window_id
- $('.popover[data-parent_id="'+parent_window_id+'"]').remove();
+ $(`.popover[data-parent_id="${parent_window_id}"]`).remove();
}
//--------------------------------------------------------
// showDirectoryPicker
//--------------------------------------------------------
- else if(event.data.msg === 'showDirectoryPicker'){
+ else if ( event.data.msg === 'showDirectoryPicker' ) {
// Auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
// Disable parent window
- $el_parent_window.addClass('window-disabled')
+ $el_parent_window.addClass('window-disabled');
$el_parent_disable_mask.show();
$el_parent_disable_mask.css('z-index', parseInt($el_parent_window.css('z-index')) + 1);
$(target_iframe).blur();
// allowed_file_types
- let allowed_file_types = "";
- if(event.data.options && event.data.options.accept)
+ let allowed_file_types = '';
+ if ( event.data.options && event.data.options.accept )
+ {
allowed_file_types = event.data.options.accept;
+ }
// selectable_body
let is_selectable_body = false;
- if(event.data.options && event.data.options.multiple && event.data.options.multiple === true)
+ if ( event.data.options && event.data.options.multiple && event.data.options.multiple === true )
+ {
is_selectable_body = true;
+ }
// open dialog
UIWindow({
- path: '/' + window.user.username + '/Desktop',
+ path: `/${ window.user.username }/Desktop`,
// this is the uuid of the window to which this dialog will return
parent_uuid: event.data.appInstanceID,
show_maximize_button: false,
@@ -539,30 +551,36 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// setWindowTitle
//--------------------------------------------------------
- else if(event.data.msg === 'setWindowTitle' && event.data.new_title !== undefined){
+ else if ( event.data.msg === 'setWindowTitle' && event.data.new_title !== undefined ) {
let el_window;
// specific window
- if( event.data.window_id )
- el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`)
+ if ( event.data.window_id )
+ {
+ el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`);
+ }
// app window
else
+ {
el_window = window.window_for_app_instance(event.data.appInstanceID);
+ }
// window not found
- if(!el_window || el_window.length === 0)
+ if ( !el_window || el_window.length === 0 )
+ {
return;
+ }
// set window title
- $(el_window).find(`.window-head-title`).html(html_encode(event.data.new_title));
+ $(el_window).find('.window-head-title').html(html_encode(event.data.new_title));
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
}
//--------------------------------------------------------
// showWindow
//--------------------------------------------------------
- else if(event.data.msg === 'showWindow'){
+ else if ( event.data.msg === 'showWindow' ) {
let el_window;
// show the app window
el_window = window.window_for_app_instance(event.data.appInstanceID);
@@ -573,7 +591,7 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// hideWindow
//--------------------------------------------------------
- else if(event.data.msg === 'hideWindow'){
+ else if ( event.data.msg === 'hideWindow' ) {
let el_window;
// hide the app window
el_window = window.window_for_app_instance(event.data.appInstanceID);
@@ -584,10 +602,12 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// mouseMoved
//--------------------------------------------------------
- else if(event.data.msg === 'mouseMoved'){
+ else if ( event.data.msg === 'mouseMoved' ) {
// Auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
// get x and y and sanitize
let x = parseInt(event.data.x);
@@ -601,13 +621,13 @@ const ipc_listener = async (event, handled) => {
// does this window have a menubar?
const $menubar = $(el_window).find('.window-menubar');
- if($menubar.length > 0){
+ if ( $menubar.length > 0 ) {
y += $menubar.height();
}
// does this window have a head?
const $head = $(el_window).find('.window-head');
- if($head.length > 0 && $head.css('display') !== 'none'){
+ if ( $head.length > 0 && $head.css('display') !== 'none' ) {
y += $head.height();
}
@@ -617,10 +637,12 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// contextMenu
//--------------------------------------------------------
- else if(event.data.msg === 'contextMenu'){
+ else if ( event.data.msg === 'contextMenu' ) {
// Auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
const hydrator = puter.util.rpc.getHydrator({
target: target_iframe.contentWindow,
@@ -634,14 +656,14 @@ const ipc_listener = async (event, handled) => {
const sanitize_items = items => {
return items.map(item => {
// make sure item.icon and item.icon_active are valid base64 strings
- if (item.icon && !item.icon.startsWith('data:image')) {
+ if ( item.icon && !item.icon.startsWith('data:image') ) {
item.icon = undefined;
}
- if (item.icon_active && !item.icon_active.startsWith('data:image')) {
+ if ( item.icon_active && !item.icon_active.startsWith('data:image') ) {
item.icon_active = undefined;
}
// Check if the item is just '-'
- if (item === '-') {
+ if ( item === '-' ) {
return '-';
}
// Otherwise, proceed as before
@@ -651,13 +673,13 @@ const ipc_listener = async (event, handled) => {
icon_active: item.icon_active ? `
` : undefined,
disabled: item.disabled,
onClick: () => {
- if (item.action !== undefined) {
+ if ( item.action !== undefined ) {
item.action();
}
// focus the window
$(el_window).focusWindow();
},
- items: item.items ? sanitize_items(item.items) : undefined
+ items: item.items ? sanitize_items(item.items) : undefined,
};
});
};
@@ -669,42 +691,42 @@ const ipc_listener = async (event, handled) => {
items: items,
});
- $(target_iframe).get(0).focus({preventScroll:true});
+ $(target_iframe).get(0).focus({ preventScroll: true });
}
// --------------------------------------------------------
// disableMenuItem
// --------------------------------------------------------
- else if(event.data.msg === 'disableMenuItem'){
+ else if ( event.data.msg === 'disableMenuItem' ) {
set_menu_item_prop(window.menubars[event.data.appInstanceID], event.data.value.id, 'disabled', true);
}
// --------------------------------------------------------
// enableMenuItem
// --------------------------------------------------------
- else if(event.data.msg === 'enableMenuItem'){
+ else if ( event.data.msg === 'enableMenuItem' ) {
set_menu_item_prop(window.menubars[event.data.appInstanceID], event.data.value.id, 'disabled', false);
}
//--------------------------------------------------------
// setMenuItemIcon
//--------------------------------------------------------
- else if(event.data.msg === 'setMenuItemIcon'){
+ else if ( event.data.msg === 'setMenuItemIcon' ) {
set_menu_item_prop(window.menubars[event.data.appInstanceID], event.data.value.id, 'icon', event.data.value.icon);
}
//--------------------------------------------------------
// setMenuItemIconActive
//--------------------------------------------------------
- else if(event.data.msg === 'setMenuItemIconActive'){
+ else if ( event.data.msg === 'setMenuItemIconActive' ) {
set_menu_item_prop(window.menubars[event.data.appInstanceID], event.data.value.id, 'icon_active', event.data.value.icon_active);
}
//--------------------------------------------------------
// setMenuItemChecked
//--------------------------------------------------------
- else if(event.data.msg === 'setMenuItemChecked'){
+ else if ( event.data.msg === 'setMenuItemChecked' ) {
set_menu_item_prop(window.menubars[event.data.appInstanceID], event.data.value.id, 'checked', event.data.value.checked);
}
//--------------------------------------------------------
// setMenubar
//--------------------------------------------------------
- else if(event.data.msg === 'setMenubar') {
+ else if ( event.data.msg === 'setMenubar' ) {
const el_window = window.window_for_app_instance(event.data.appInstanceID);
const hydrator = puter.util.rpc.getHydrator({
@@ -714,10 +736,10 @@ const ipc_listener = async (event, handled) => {
// Show menubar
let $menubar;
- $menubar = $(el_window).find('.window-menubar')
+ $menubar = $(el_window).find('.window-menubar');
// add window-with-menubar class to the window
$(el_window).addClass('window-with-menubar');
-
+
$menubar.css('display', 'flex');
// disable system context menu
@@ -728,8 +750,10 @@ const ipc_listener = async (event, handled) => {
// empty menubar
$menubar.empty();
- if(!window.menubars[event.data.appInstanceID])
+ if ( ! window.menubars[event.data.appInstanceID] )
+ {
window.menubars[event.data.appInstanceID] = value.items;
+ }
// disable system context menu
$menubar.on('contextmenu', (e) => {
@@ -739,7 +763,7 @@ const ipc_listener = async (event, handled) => {
const sanitize_items = items => {
return items.map(item => {
// Check if the item is just '-'
- if (item === '-') {
+ if ( item === '-' ) {
return '-';
}
// Otherwise, proceed as before
@@ -750,11 +774,11 @@ const ipc_listener = async (event, handled) => {
icon: item.icon ? `
` : undefined,
icon_active: item.icon_active ? `
` : undefined,
action: item.action,
- items: item.items ? sanitize_items(item.items) : undefined
+ items: item.items ? sanitize_items(item.items) : undefined,
};
});
};
-
+
// This array will store the menubar button elements
const menubar_buttons = [];
@@ -783,9 +807,9 @@ const ipc_listener = async (event, handled) => {
const ctxMenu = UIContextMenu({
delay: delay,
parent_element: parent_element,
- position: {top: pos.top + 30, left: pos.left},
+ position: { top: pos.top + 30, left: pos.left },
css: {
- 'box-shadow': '0px 2px 6px #00000059'
+ 'box-shadow': '0px 2px 6px #00000059',
},
items: sanitize_items(items),
});
@@ -801,16 +825,16 @@ const ipc_listener = async (event, handled) => {
current_i = null;
current = null;
state_open = false;
- }
+ };
};
const add_items = (parent, items) => {
- for (let i=0; i < items.length; i++) {
+ for ( let i = 0; i < items.length; i++ ) {
const I = i;
const item = items[i];
const label = html_encode(item.label);
const el_item = $(``);
const parent_element = el_item.get(0);
-
+
el_item.on('mousedown', (e) => {
// check if it has has-open-context-menu class
if ( el_item.hasClass('has-open-contextmenu') ) {
@@ -822,7 +846,7 @@ const ipc_listener = async (event, handled) => {
current_i = null;
current = null;
}
- if (item.items) {
+ if ( item.items ) {
const pos = el_item[0].getBoundingClientRect();
open_menu({
i,
@@ -835,11 +859,11 @@ const ipc_listener = async (event, handled) => {
e.preventDefault();
return;
}
- })
-
+ });
+
// Clicking an item with an action will trigger that action
el_item.on('click', () => {
- if (item.action) {
+ if ( item.action ) {
item.action();
}
});
@@ -865,357 +889,423 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// setWindowWidth
//--------------------------------------------------------
- else if(event.data.msg === 'setWindowWidth' && event.data.width !== undefined){
+ else if ( event.data.msg === 'setWindowWidth' && event.data.width !== undefined ) {
let el_window;
// specific window
- if( event.data.window_id )
- el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`)
+ if ( event.data.window_id )
+ {
+ el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`);
+ }
// app window
else
+ {
el_window = window.window_for_app_instance(event.data.appInstanceID);
+ }
// window not found
- if(!el_window || el_window.length === 0)
+ if ( !el_window || el_window.length === 0 )
+ {
return;
+ }
event.data.width = parseFloat(event.data.width);
// must be at least 200
- if(event.data.width < 200)
+ if ( event.data.width < 200 )
+ {
event.data.width = 200;
+ }
// set window width
$(el_window).css('width', event.data.width);
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
}
//--------------------------------------------------------
// setWindowHeight
//--------------------------------------------------------
- else if(event.data.msg === 'setWindowHeight' && event.data.height !== undefined){
+ else if ( event.data.msg === 'setWindowHeight' && event.data.height !== undefined ) {
let el_window;
// specific window
- if( event.data.window_id )
- el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`)
+ if ( event.data.window_id )
+ {
+ el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`);
+ }
// app window
else
+ {
el_window = window.window_for_app_instance(event.data.appInstanceID);
+ }
// window not found
- if(!el_window || el_window.length === 0)
+ if ( !el_window || el_window.length === 0 )
+ {
return;
+ }
event.data.height = parseFloat(event.data.height);
// must be at least 200
- if(event.data.height < 200)
+ if ( event.data.height < 200 )
+ {
event.data.height = 200;
+ }
// convert to number and set
$(el_window).css('height', event.data.height);
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
}
//--------------------------------------------------------
// setWindowSize
//--------------------------------------------------------
- else if(event.data.msg === 'setWindowSize' && (event.data.width !== undefined || event.data.height !== undefined)){
+ else if ( event.data.msg === 'setWindowSize' && (event.data.width !== undefined || event.data.height !== undefined) ) {
let el_window;
// specific window
- if( event.data.window_id )
- el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`)
+ if ( event.data.window_id )
+ {
+ el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`);
+ }
// app window
else
+ {
el_window = window.window_for_app_instance(event.data.appInstanceID);
+ }
// window not found
- if(!el_window || el_window.length === 0)
+ if ( !el_window || el_window.length === 0 )
+ {
return;
+ }
// convert to number and set
- if(event.data.width !== undefined){
+ if ( event.data.width !== undefined ) {
event.data.width = parseFloat(event.data.width);
// must be at least 200
- if(event.data.width < 200)
+ if ( event.data.width < 200 )
+ {
event.data.width = 200;
+ }
$(el_window).css('width', event.data.width);
}
-
- if(event.data.height !== undefined){
+
+ if ( event.data.height !== undefined ) {
event.data.height = parseFloat(event.data.height);
// must be at least 200
- if(event.data.height < 200)
+ if ( event.data.height < 200 )
+ {
event.data.height = 200;
+ }
$(el_window).css('height', event.data.height);
}
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
}
//--------------------------------------------------------
// setWindowPosition
//--------------------------------------------------------
- else if(event.data.msg === 'setWindowPosition' && (event.data.x !== undefined || event.data.y !== undefined)){
+ else if ( event.data.msg === 'setWindowPosition' && (event.data.x !== undefined || event.data.y !== undefined) ) {
let el_window;
// specific window
- if( event.data.window_id )
- el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`)
+ if ( event.data.window_id )
+ {
+ el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`);
+ }
// app window
else
+ {
el_window = window.window_for_app_instance(event.data.appInstanceID);
+ }
// window not found
- if(!el_window || el_window.length === 0)
+ if ( !el_window || el_window.length === 0 )
+ {
return;
+ }
// convert to number and set
- if(event.data.x !== undefined){
+ if ( event.data.x !== undefined ) {
event.data.x = parseFloat(event.data.x);
// we don't want the window to go off the left edge of the screen
- if(event.data.x < 0)
+ if ( event.data.x < 0 )
+ {
event.data.x = 0;
+ }
// we don't want the window to go off the right edge of the screen
- if(event.data.x > window.innerWidth - 100)
+ if ( event.data.x > window.innerWidth - 100 )
+ {
event.data.x = window.innerWidth - 100;
+ }
// set window left
$(el_window).css('left', parseFloat(event.data.x));
}
- if(event.data.y !== undefined){
+ if ( event.data.y !== undefined ) {
event.data.y = parseFloat(event.data.y);
// we don't want the window to go off the top edge of the screen
- if(event.data.y < window.taskbar_height)
+ if ( event.data.y < window.taskbar_height )
+ {
event.data.y = window.taskbar_height;
+ }
// we don't want the window to go off the bottom edge of the screen
- if(event.data.y > window.innerHeight - 100)
+ if ( event.data.y > window.innerHeight - 100 )
+ {
event.data.y = window.innerHeight - 100;
+ }
// set window top
$(el_window).css('top', parseFloat(event.data.y));
}
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
}
//--------------------------------------------------------
// setWindowX
//--------------------------------------------------------
- else if(event.data.msg === 'setWindowX' && (event.data.x !== undefined)){
+ else if ( event.data.msg === 'setWindowX' && (event.data.x !== undefined) ) {
let el_window;
// specific window
- if( event.data.window_id )
- el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`)
+ if ( event.data.window_id )
+ {
+ el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`);
+ }
// app window
else
+ {
el_window = window.window_for_app_instance(event.data.appInstanceID);
+ }
// window not found
- if(!el_window || el_window.length === 0)
+ if ( !el_window || el_window.length === 0 )
+ {
return;
+ }
// convert to number and set
- if(event.data.x !== undefined){
+ if ( event.data.x !== undefined ) {
event.data.x = parseFloat(event.data.x);
// we don't want the window to go off the left edge of the screen
- if(event.data.x < 0)
+ if ( event.data.x < 0 )
+ {
event.data.x = 0;
+ }
// we don't want the window to go off the right edge of the screen
- if(event.data.x > window.innerWidth - 100)
+ if ( event.data.x > window.innerWidth - 100 )
+ {
event.data.x = window.innerWidth - 100;
+ }
// set window left
$(el_window).css('left', parseFloat(event.data.x));
}
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
}
//--------------------------------------------------------
// setWindowY
//--------------------------------------------------------
- else if(event.data.msg === 'setWindowY' && (event.data.y !== undefined)){
+ else if ( event.data.msg === 'setWindowY' && (event.data.y !== undefined) ) {
let el_window;
// specific window
- if( event.data.window_id )
- el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`)
+ if ( event.data.window_id )
+ {
+ el_window = $(`.window[data-element_uuid="${html_encode(event.data.window_id)}"]`);
+ }
// app window
else
+ {
el_window = window.window_for_app_instance(event.data.appInstanceID);
+ }
// window not found
- if(!el_window || el_window.length === 0)
+ if ( !el_window || el_window.length === 0 )
+ {
return;
+ }
// convert to number and set
- if(event.data.y !== undefined){
+ if ( event.data.y !== undefined ) {
event.data.y = parseFloat(event.data.y);
// we don't want the window to go off the top edge of the screen
- if(event.data.y < window.taskbar_height)
+ if ( event.data.y < window.taskbar_height )
+ {
event.data.y = window.taskbar_height;
+ }
// we don't want the window to go off the bottom edge of the screen
- if(event.data.y > window.innerHeight - 100)
+ if ( event.data.y > window.innerHeight - 100 )
+ {
event.data.y = window.innerHeight - 100;
+ }
// set window top
$(el_window).css('top', parseFloat(event.data.y));
}
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
- }
+ }
//--------------------------------------------------------
// watchItem
//--------------------------------------------------------
- else if(event.data.msg === 'watchItem' && event.data.item_uid !== undefined){
- if(!window.watchItems[event.data.item_uid])
+ else if ( event.data.msg === 'watchItem' && event.data.item_uid !== undefined ) {
+ if ( ! window.watchItems[event.data.item_uid] )
+ {
window.watchItems[event.data.item_uid] = [];
+ }
window.watchItems[event.data.item_uid].push(event.data.appInstanceID);
}
//--------------------------------------------------------
// readAppDataFile
//--------------------------------------------------------
- else if(event.data.msg === 'readAppDataFile' && event.data.path !== undefined){
+ else if ( event.data.msg === 'readAppDataFile' && event.data.path !== undefined ) {
// resolve path to absolute
event.data.path = path.resolve(event.data.path);
-
+
// join with appdata dir
const file_path = path.join(window.appdata_path, app_uuid, event.data.path);
puter.fs.sign(app_uuid, {
- path: file_path,
- action: 'write',
- },
- function(signature){
- signature = signature.items;
- signature.signatures = signature.signatures ?? [signature];
- if(signature.signatures.length > 0 && signature.signatures[0].path){
- signature.signatures[0].path = privacy_aware_path(signature.signatures[0].path)
- // send confirmation to requester window
- target_iframe.contentWindow.postMessage({
- msg: "readAppDataFileSucceeded",
- original_msg_id: msg_id,
- item: signature.signatures[0],
- }, '*');
- }else{
- // send error to requester window
- target_iframe.contentWindow.postMessage({
- msg: "readAppDataFileFailed",
- original_msg_id: msg_id,
- }, '*');
- }
+ path: file_path,
+ action: 'write',
+ }, function (signature) {
+ signature = signature.items;
+ signature.signatures = signature.signatures ?? [signature];
+ if ( signature.signatures.length > 0 && signature.signatures[0].path ) {
+ signature.signatures[0].path = privacy_aware_path(signature.signatures[0].path);
+ // send confirmation to requester window
+ target_iframe.contentWindow.postMessage({
+ msg: 'readAppDataFileSucceeded',
+ original_msg_id: msg_id,
+ item: signature.signatures[0],
+ }, '*');
+ } else {
+ // send error to requester window
+ target_iframe.contentWindow.postMessage({
+ msg: 'readAppDataFileFailed',
+ original_msg_id: msg_id,
+ }, '*');
}
- )
+ });
}
//--------------------------------------------------------
// getAppData
//--------------------------------------------------------
// todo appdata should be provided from the /open_item api call
- else if(event.data.msg === 'getAppData'){
- if(window.appdata_signatures[app_uuid]){
+ else if ( event.data.msg === 'getAppData' ) {
+ if ( window.appdata_signatures[app_uuid] ) {
target_iframe.contentWindow.postMessage({
- msg: "getAppDataSucceeded",
- original_msg_id: msg_id,
+ msg: 'getAppDataSucceeded',
+ original_msg_id: msg_id,
item: window.appdata_signatures[app_uuid],
- }, '*');
+ }, '*');
}
// make app directory if it doesn't exist
puter.fs.mkdir({
- path: path.join( window.appdata_path, app_uuid),
+ path: path.join(window.appdata_path, app_uuid),
rename: false,
overwrite: false,
- success: function(dir){
+ success: function (dir) {
puter.fs.sign(app_uuid, {
- uid: dir.uid,
+ uid: dir.uid,
action: 'write',
- success: function(signature){
+ success: function (signature) {
signature = signature.items;
window.appdata_signatures[app_uuid] = signature;
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- msg: "getAppDataSucceeded",
- original_msg_id: msg_id,
+ msg: 'getAppDataSucceeded',
+ original_msg_id: msg_id,
item: signature,
}, '*');
- }
- })
+ },
+ });
},
- error: function(err){
- if(err.existing_fsentry || err.code === 'path_exists'){
+ error: function (err) {
+ if ( err.existing_fsentry || err.code === 'path_exists' ) {
puter.fs.sign(app_uuid, {
- uid: err.existing_fsentry.uid,
+ uid: err.existing_fsentry.uid,
action: 'write',
- success: function(signature){
+ success: function (signature) {
signature = signature.items;
window.appdata_signatures[app_uuid] = signature;
// send confirmation to requester window
target_iframe.contentWindow.postMessage({
- msg: "getAppDataSucceeded",
- original_msg_id: msg_id,
+ msg: 'getAppDataSucceeded',
+ original_msg_id: msg_id,
item: signature,
}, '*');
- }
- })
+ },
+ });
}
- }
+ },
});
}
//--------------------------------------------------------
// requestPermission
//--------------------------------------------------------
- else if(event.data.msg === 'requestPermission'){
+ else if ( event.data.msg === 'requestPermission' ) {
// auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
// options must be an object
- if(event.data.options === undefined || typeof event.data.options !== 'object')
+ if ( event.data.options === undefined || typeof event.data.options !== 'object' )
+ {
event.data.options = {};
+ }
// options.permission must be provided and be a string
- if(!event.data.options.permission || typeof event.data.options.permission !== 'string')
+ if ( !event.data.options.permission || typeof event.data.options.permission !== 'string' )
+ {
return;
+ }
+
+ let granted = await UIWindowRequestPermission({
+ permission: event.data.options.permission,
+ window_options: {
+ parent_uuid: event.data.appInstanceID,
+ disable_parent_window: true,
+ },
+ app_uid: app_uuid,
+ app_name: app_name,
+ });
- let granted = await UIWindowRequestPermission(
- {
- permission: event.data.options.permission,
- window_options: {
- parent_uuid: event.data.appInstanceID,
- disable_parent_window: true,
- },
- app_uid: app_uuid,
- app_name: app_name,
- }
- );
-
// send selected font to requester window
target_iframe.contentWindow.postMessage({
- msg: "permissionGranted",
+ msg: 'permissionGranted',
granted: granted,
- original_msg_id: msg_id,
+ original_msg_id: msg_id,
}, '*');
- $(target_iframe).get(0).focus({preventScroll:true});
+ $(target_iframe).get(0).focus({ preventScroll: true });
}
//--------------------------------------------------------
// showFontPicker
//--------------------------------------------------------
- else if(event.data.msg === 'showFontPicker'){
+ else if ( event.data.msg === 'showFontPicker' ) {
// auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
// set options
event.data.options = event.data.options ?? {};
// clear window_options for security reasons
- event.data.options.window_options = {}
+ event.data.options.window_options = {};
// Set app as parent window of font picker window
event.data.options.window_options.parent_uuid = event.data.appInstanceID;
@@ -1225,25 +1315,27 @@ const ipc_listener = async (event, handled) => {
// send selected font to requester window
target_iframe.contentWindow.postMessage({
- msg: "fontPicked",
- original_msg_id: msg_id,
+ msg: 'fontPicked',
+ original_msg_id: msg_id,
font: selected_font,
}, '*');
- $(target_iframe).get(0).focus({preventScroll:true});
+ $(target_iframe).get(0).focus({ preventScroll: true });
}
//--------------------------------------------------------
// showColorPicker
//--------------------------------------------------------
- else if(event.data.msg === 'showColorPicker'){
+ else if ( event.data.msg === 'showColorPicker' ) {
// Auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
// set options
event.data.options = event.data.options ?? {};
// Clear window_options for security reasons
- event.data.options.window_options = {}
+ event.data.options.window_options = {};
// Set app as parent window of the font picker window
event.data.options.window_options.parent_uuid = event.data.appInstanceID;
@@ -1253,44 +1345,48 @@ const ipc_listener = async (event, handled) => {
// Send selected color to requester window
target_iframe.contentWindow.postMessage({
- msg: "colorPicked",
- original_msg_id: msg_id,
+ msg: 'colorPicked',
+ original_msg_id: msg_id,
color: selected_color ? selected_color.color : undefined,
}, '*');
- $(target_iframe).get(0).focus({preventScroll:true});
- }
+ $(target_iframe).get(0).focus({ preventScroll: true });
+ }
//--------------------------------------------------------
// setWallpaper
//--------------------------------------------------------
- else if(event.data.msg === 'setWallpaper'){
+ else if ( event.data.msg === 'setWallpaper' ) {
// Auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
// No options?
- if(!event.data.options)
+ if ( ! event.data.options )
+ {
event.data.options = {};
+ }
// /set-desktop-bg
- try{
+ try {
await $.ajax({
- url: window.api_origin + "/set-desktop-bg",
+ url: `${window.api_origin }/set-desktop-bg`,
type: 'POST',
- data: JSON.stringify({
+ data: JSON.stringify({
url: event.data.readURL,
fit: event.data.options.fit ?? 'cover',
color: event.data.options.color,
}),
async: true,
- contentType: "application/json",
+ contentType: 'application/json',
headers: {
- "Authorization": "Bearer "+window.auth_token
+ 'Authorization': `Bearer ${window.auth_token}`,
},
statusCode: {
401: function () {
window.logout();
},
- },
+ },
});
// Set wallpaper
@@ -1298,44 +1394,46 @@ const ipc_listener = async (event, handled) => {
url: event.data.readURL,
fit: event.data.options.fit ?? 'cover',
color: event.data.options.color,
- })
-
+ });
+
// Send success to app
target_iframe.contentWindow.postMessage({
- msg: "wallpaperSet",
- original_msg_id: msg_id,
+ msg: 'wallpaperSet',
+ original_msg_id: msg_id,
}, '*');
- $(target_iframe).get(0).focus({preventScroll:true});
- }catch(err){
+ $(target_iframe).get(0).focus({ preventScroll: true });
+ } catch ( err ) {
console.error(err);
}
- }
+ }
//--------------------------------------------------------
// showSaveFilePicker
//--------------------------------------------------------
- else if(event.data.msg === 'showSaveFilePicker'){
+ else if ( event.data.msg === 'showSaveFilePicker' ) {
//auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
//disable parent window
- $el_parent_window.addClass('window-disabled')
+ $el_parent_window.addClass('window-disabled');
$el_parent_disable_mask.show();
$el_parent_disable_mask.css('z-index', parseInt($el_parent_window.css('z-index')) + 1);
$(target_iframe).blur();
-
+
const tell_caller_and_update_views = async ({
target_path,
el_filedialog_window,
res,
}) => {
- let file_signature = await puter.fs.sign(app_uuid, {uid: res.uid, action: 'write'});
+ let file_signature = await puter.fs.sign(app_uuid, { uid: res.uid, action: 'write' });
file_signature = file_signature.items;
target_iframe.contentWindow.postMessage({
- msg: "fileSaved",
- original_msg_id: msg_id,
+ msg: 'fileSaved',
+ original_msg_id: msg_id,
filename: res.name,
saved_file: {
name: file_signature.fsentry_name,
@@ -1344,11 +1442,11 @@ const ipc_listener = async (event, handled) => {
metadataURL: file_signature.metadata_url,
type: file_signature.type,
uid: file_signature.uid,
- path: privacy_aware_path(res.path)
+ path: privacy_aware_path(res.path),
},
}, '*');
- $(target_iframe).get(0).focus({preventScroll:true});
+ $(target_iframe).get(0).focus({ preventScroll: true });
// Update matching items on open windows
// todo don't blanket-update, mostly files with thumbnails really need to be updated
// first remove overwritten items
@@ -1370,36 +1468,34 @@ const ipc_listener = async (event, handled) => {
suggested_apps: res.suggested_apps,
});
// sort each window
- $(`.item-container[data-path="${html_encode(path.dirname(target_path))}" i]`).each(function(){
- window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
- });
+ $(`.item-container[data-path="${html_encode(path.dirname(target_path))}" i]`).each(function () {
+ window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'));
+ });
$(el_filedialog_window).close();
window.show_save_account_notice_if_needed();
};
const tell_caller_its_cancelled = async () => {
target_iframe.contentWindow.postMessage({
- msg: "fileSaveCancelled",
- original_msg_id: msg_id,
+ msg: 'fileSaveCancelled',
+ original_msg_id: msg_id,
}, '*');
};
-
+
const write_file_tell_caller_and_update_views = async ({
target_path, el_filedialog_window,
file_to_upload, overwrite,
}) => {
- const res = await puter.fs.write(
- target_path,
- file_to_upload,
- {
- dedupeName: false,
- overwrite: overwrite
- }
- );
-
+ const res = await puter.fs.write(target_path,
+ file_to_upload,
+ {
+ dedupeName: false,
+ overwrite: overwrite,
+ });
+
await tell_caller_and_update_views({ res, el_filedialog_window, target_path });
- }
-
+ };
+
const handle_url_save = async ({ target_path }) => {
// download progress tracker
let dl_op_id = window.operation_id++;
@@ -1412,9 +1508,9 @@ const ipc_listener = async (event, handled) => {
window.progress_tracker[dl_op_id][0].cloud_uploaded = 0;
let item_with_same_name_already_exists = true;
- while(item_with_same_name_already_exists){
+ while ( item_with_same_name_already_exists ) {
await download({
- url: event.data.url,
+ url: event.data.url,
name: path.basename(target_path),
dest_path: path.dirname(target_path),
auth_token: window.auth_token,
@@ -1423,23 +1519,25 @@ const ipc_listener = async (event, handled) => {
overwrite: false,
operation_id: dl_op_id,
item_upload_id: 0,
- success: function(res){
+ success: function (res) {
+ },
+ error: function (err) {
+ UIAlert(err && err.message ? err.message : 'Download failed.');
},
- error: function(err){
- UIAlert(err && err.message ? err.message : "Download failed.");
- }
});
item_with_same_name_already_exists = false;
}
};
-
+
const handle_data_save = async ({ target_path, el_filedialog_window }) => {
let file_to_upload = new File([event.data.content], path.basename(target_path));
const written = await window.handle_same_name_exists({
action: async ({ overwrite }) => {
await write_file_tell_caller_and_update_views({
- target_path, el_filedialog_window,
- file_to_upload, overwrite,
+ target_path,
+ el_filedialog_window,
+ file_to_upload,
+ overwrite,
});
},
parent_uuid: $(el_filedialog_window).attr('data-element_uuid'),
@@ -1448,21 +1546,21 @@ const ipc_listener = async (event, handled) => {
if ( written ) return true;
$(el_filedialog_window).find('.window-disable-mask, .busy-indicator').hide();
};
-
+
const handle_move_save = async ({
// when 'source_path' has a value, 'save_type' is checked to determine
// if a fs.move() or fs.copy() needs to be performed.
save_type,
-
+
source_path, target_path, el_filedialog_window,
}) => {
// source path must be in appdata directory
- const stat_info = await puter.fs.stat({path: source_path, consistency: 'eventual'});
- if ( ! stat_info.appdata_app || stat_info.appdata_app !== app_uuid ) {
+ const stat_info = await puter.fs.stat({ path: source_path, consistency: 'eventual' });
+ if ( !stat_info.appdata_app || stat_info.appdata_app !== app_uuid ) {
const source_file_owner = stat_info?.appdata_app ?? 'the user';
if ( stat_info.appdata_app && stat_info.appdata_app !== app_uuid ) {
await UIAlert({
- message: `apps are prohibited from accessing AppData of other apps`
+ message: 'apps are prohibited from accessing AppData of other apps',
});
return;
}
@@ -1473,15 +1571,15 @@ const ipc_listener = async (event, handled) => {
return;
}
const FORCE_ALLOWED_APPS = [
- "app-dc2505ed-9844-4298-92fa-b72873b8381e", // OnlyOffice Word Processor
- "app-064a54ac-d07d-481e-b38c-ceb99345013d", // OnlyOffice Spreadsheet application
- "app-60b1382b-3367-4968-9259-23930c6fd376", // OnlyOffice Presentation Editor
- "app-075ddc0b-2d4e-460e-9664-a8d21b960c4a" // OnlyOffice PDF editor
- ]
+ 'app-dc2505ed-9844-4298-92fa-b72873b8381e', // OnlyOffice Word Processor
+ 'app-064a54ac-d07d-481e-b38c-ceb99345013d', // OnlyOffice Spreadsheet application
+ 'app-60b1382b-3367-4968-9259-23930c6fd376', // OnlyOffice Presentation Editor
+ 'app-075ddc0b-2d4e-460e-9664-a8d21b960c4a', // OnlyOffice PDF editor
+ ];
let alert_resp;
- if (FORCE_ALLOWED_APPS.includes(app_uuid)) {
- alert_resp = true
+ if ( FORCE_ALLOWED_APPS.includes(app_uuid) ) {
+ alert_resp = true;
} else {
alert_resp = await UIAlert({
message: `the app ${app_name} is trying to copy ${source_path}; is this okay?`,
@@ -1496,22 +1594,22 @@ const ipc_listener = async (event, handled) => {
value: false,
type: 'secondary',
},
- ]
+ ],
});
}
-
+
// `alert_resp` will be `"false"`, but this check is forward-compatible
// with a version of UIAlert that returns `false`.
- if ( ! alert_resp || alert_resp === 'false' ) return;
+ if ( !alert_resp || alert_resp === 'false' ) return;
}
-
+
let node;
const written = await window.handle_same_name_exists({
action: async ({ overwrite }) => {
if ( overwrite ) {
await puter.fs.delete(target_path);
}
-
+
if ( save_type === 'copy' ) {
const target_dir = path.dirname(target_path);
const new_name = path.basename(target_path);
@@ -1538,7 +1636,7 @@ const ipc_listener = async (event, handled) => {
};
await UIWindow({
- path: '/' + window.user.username + '/Desktop',
+ path: `/${ window.user.username }/Desktop`,
// this is the uuid of the window to which this dialog will return
parent_uuid: event.data.appInstanceID,
show_maximize_button: false,
@@ -1552,11 +1650,11 @@ const ipc_listener = async (event, handled) => {
center: true,
initiating_app_uuid: app_uuid,
onDialogCancel: () => tell_caller_its_cancelled(),
- onSaveFileDialogSave: async function(target_path, el_filedialog_window){
+ onSaveFileDialogSave: async function (target_path, el_filedialog_window) {
$(el_filedialog_window).find('.window-disable-mask, .busy-indicator').show();
let busy_init_ts = Date.now();
- if (event.data.url){
+ if ( event.data.url ) {
await handle_url_save({ target_path });
} else if ( event.data.source_path ) {
await handle_move_save({
@@ -1567,24 +1665,24 @@ const ipc_listener = async (event, handled) => {
} else {
await handle_data_save({ target_path, el_filedialog_window });
}
-
+
let busy_duration = (Date.now() - busy_init_ts);
- if( busy_duration >= window.busy_indicator_hide_delay){
- $(el_filedialog_window).close();
- }else{
+ if ( busy_duration >= window.busy_indicator_hide_delay ) {
+ $(el_filedialog_window).close();
+ } else {
setTimeout(() => {
// close this dialog
- $(el_filedialog_window).close();
+ $(el_filedialog_window).close();
}, Math.abs(window.busy_indicator_hide_delay - busy_duration));
}
- }
+ },
});
}
//--------------------------------------------------------
// saveToPictures/Desktop/Documents/Videos/Audio/AppData
//--------------------------------------------------------
- else if((event.data.msg === 'saveToPictures' || event.data.msg === 'saveToDesktop' || event.data.msg === 'saveToAppData' ||
- event.data.msg === 'saveToDocuments' || event.data.msg === 'saveToVideos' || event.data.msg === 'saveToAudio')){
+ else if (( event.data.msg === 'saveToPictures' || event.data.msg === 'saveToDesktop' || event.data.msg === 'saveToAppData' ||
+ event.data.msg === 'saveToDocuments' || event.data.msg === 'saveToVideos' || event.data.msg === 'saveToAudio' )) {
let target_path;
let create_missing_ancestors = false;
@@ -1592,23 +1690,35 @@ const ipc_listener = async (event, handled) => {
event.data.filename = path.normalize(event.data.filename)
.replace(/(\.+\/|\.+\\)/g, '');
- if(event.data.msg === 'saveToPictures')
+ if ( event.data.msg === 'saveToPictures' )
+ {
target_path = path.join(window.pictures_path, event.data.filename);
- else if(event.data.msg === 'saveToDesktop')
+ }
+ else if ( event.data.msg === 'saveToDesktop' )
+ {
target_path = path.join(window.desktop_path, event.data.filename);
- else if(event.data.msg === 'saveToDocuments')
+ }
+ else if ( event.data.msg === 'saveToDocuments' )
+ {
target_path = path.join(window.documents_path, event.data.filename);
- else if(event.data.msg === 'saveToVideos')
+ }
+ else if ( event.data.msg === 'saveToVideos' )
+ {
target_path = path.join(window.videos_path, event.data.filename);
- else if(event.data.msg === 'saveToAudio')
+ }
+ else if ( event.data.msg === 'saveToAudio' )
+ {
target_path = path.join(window.audio_path, event.data.filename);
- else if(event.data.msg === 'saveToAppData'){
+ }
+ else if ( event.data.msg === 'saveToAppData' ) {
target_path = path.join(window.appdata_path, app_uuid, event.data.filename);
create_missing_ancestors = true;
}
//auth
- if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name})))
+ if ( !window.is_auth() && !(await UIWindowSignup({ referrer: app_name })) )
+ {
return;
+ }
let item_with_same_name_already_exists = true;
let overwrite = false;
@@ -1616,7 +1726,7 @@ const ipc_listener = async (event, handled) => {
// -------------------------------------
// URL
// -------------------------------------
- if(event.data.url){
+ if ( event.data.url ) {
let overwrite = false;
// download progress tracker
let dl_op_id = window.operation_id++;
@@ -1629,9 +1739,9 @@ const ipc_listener = async (event, handled) => {
window.progress_tracker[dl_op_id][0].cloud_uploaded = 0;
let item_with_same_name_already_exists = true;
- while(item_with_same_name_already_exists){
+ while ( item_with_same_name_already_exists ) {
const res = await download({
- url: event.data.url,
+ url: event.data.url,
name: path.basename(target_path),
dest_path: path.dirname(target_path),
auth_token: window.auth_token,
@@ -1640,11 +1750,11 @@ const ipc_listener = async (event, handled) => {
overwrite: false,
operation_id: dl_op_id,
item_upload_id: 0,
- success: function(res){
+ success: function (res) {
+ },
+ error: function (err) {
+ UIAlert(err && err.message ? err.message : 'Download failed.');
},
- error: function(err){
- UIAlert(err && err.message ? err.message : "Download failed.");
- }
});
item_with_same_name_already_exists = false;
}
@@ -1652,25 +1762,27 @@ const ipc_listener = async (event, handled) => {
// -------------------------------------
// File
// -------------------------------------
- else{
+ else {
let file_to_upload = new File([event.data.content], path.basename(target_path));
-
- while(item_with_same_name_already_exists){
- if(overwrite)
+
+ while ( item_with_same_name_already_exists ) {
+ if ( overwrite )
+ {
item_with_same_name_already_exists = false;
- try{
+ }
+ try {
const res = await puter.fs.write(target_path, file_to_upload, {
dedupeName: true,
overwrite: false,
createMissingAncestors: create_missing_ancestors,
});
item_with_same_name_already_exists = false;
- let file_signature = await puter.fs.sign(app_uuid, {uid: res.uid, action: 'write'});
+ let file_signature = await puter.fs.sign(app_uuid, { uid: res.uid, action: 'write' });
file_signature = file_signature.items;
target_iframe.contentWindow.postMessage({
- msg: "fileSaved",
- original_msg_id: msg_id,
+ msg: 'fileSaved',
+ original_msg_id: msg_id,
filename: res.name,
saved_file: {
name: file_signature.fsentry_name,
@@ -1681,13 +1793,13 @@ const ipc_listener = async (event, handled) => {
path: privacy_aware_path(res.path),
},
}, '*');
- $(target_iframe).get(0).focus({preventScroll:true});
+ $(target_iframe).get(0).focus({ preventScroll: true });
}
- catch(err){
- if(err.code === 'item_with_same_name_exists'){
+ catch ( err ) {
+ if ( err.code === 'item_with_same_name_exists' ) {
const alert_resp = await UIAlert({
message: `
${html_encode(err.entry_name)} already exists.`,
- buttons:[
+ buttons: [
{
label: i18n('replace'),
value: 'replace',
@@ -1695,17 +1807,17 @@ const ipc_listener = async (event, handled) => {
},
{
label: i18n('cancel'),
- value: 'cancel'
+ value: 'cancel',
},
],
parent_uuid: event.data.appInstanceID,
- })
- if(alert_resp === 'replace'){
+ });
+ if ( alert_resp === 'replace' ) {
overwrite = true;
- }else if(alert_resp === 'cancel'){
+ } else if ( alert_resp === 'cancel' ) {
item_with_same_name_already_exists = false;
}
- }else{
+ } else {
break;
}
}
@@ -1715,7 +1827,7 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// messageToApp
//--------------------------------------------------------
- else if (event.data.msg === 'messageToApp') {
+ else if ( event.data.msg === 'messageToApp' ) {
const { appInstanceID, targetAppInstanceID, targetAppOrigin, contents } = event.data;
// TODO: Determine if we should allow the message
// TODO: Track message traffic between apps
@@ -1730,7 +1842,7 @@ const ipc_listener = async (event, handled) => {
// pass on the message
const target_iframe = window.iframe_for_app_instance(targetAppInstanceID);
- if (!target_iframe) {
+ if ( ! target_iframe ) {
console.error('Failed to send message to non-existent app', event);
return;
}
@@ -1744,11 +1856,11 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// closeApp
//--------------------------------------------------------
- else if (event.data.msg === 'closeApp') {
+ else if ( event.data.msg === 'closeApp' ) {
const { appInstanceID, targetAppInstanceID } = event.data;
const target_window = window.window_for_app_instance(targetAppInstanceID);
- if (!target_window) {
+ if ( ! target_window ) {
console.warn(`Failed to close non-existent app ${targetAppInstanceID}`);
return;
}
@@ -1756,14 +1868,14 @@ const ipc_listener = async (event, handled) => {
// Check permissions
const allowed = await (async () => {
// Parents can close their children
- if (target_window.dataset['parent_instance_id'] === appInstanceID) {
+ if ( target_window.dataset['parent_instance_id'] === appInstanceID ) {
console.log(`⚠️ Allowing app ${appInstanceID} to close child app ${targetAppInstanceID}`);
return true;
}
// God-mode apps can close anything
const app_info = await window.get_apps(app_name);
- if (app_info.godmode === 1) {
+ if ( app_info.godmode === 1 ) {
console.log(`⚠️ Allowing GODMODE app ${appInstanceID} to close app ${targetAppInstanceID}`);
return true;
}
@@ -1772,7 +1884,7 @@ const ipc_listener = async (event, handled) => {
return false;
})();
- if (allowed) {
+ if ( allowed ) {
$(target_window).close();
} else {
console.warn(`⚠️ App ${appInstanceID} is not permitted to close app ${targetAppInstanceID}`);
@@ -1782,10 +1894,10 @@ const ipc_listener = async (event, handled) => {
//--------------------------------------------------------
// exit
//--------------------------------------------------------
- else if(event.data.msg === 'exit'){
+ else if ( event.data.msg === 'exit' ) {
// Ensure status code is a number. Convert any truthy non-numbers to 1.
let status_code = event.data.statusCode ?? 0;
- if (status_code && (typeof status_code !== 'number')) {
+ if ( status_code && (typeof status_code !== 'number') ) {
status_code = 1;
}
diff --git a/src/gui/src/UI/Components/Button.js b/src/gui/src/UI/Components/Button.js
index f18319bfd0..69fb2850d5 100644
--- a/src/gui/src/UI/Components/Button.js
+++ b/src/gui/src/UI/Components/Button.js
@@ -17,7 +17,6 @@
* along with this program. If not, see
.
*/
-
const Component = use('util.Component');
export default def(class Button extends Component {
@@ -27,8 +26,8 @@ export default def(class Button extends Component {
label: { value: 'Test Label' },
on_click: { value: null },
enabled: { value: true },
- style: { value: 'primary' }
- }
+ style: { value: 'primary' },
+ };
static RENDER_MODE = Component.NO_SHADOW;
@@ -74,7 +73,7 @@ export default def(class Button extends Component {
if ( this.get('on_click') ) {
const $button = $(this.dom_).find('button');
$button.on('click', async () => {
- $button.html(`
circle anim `);
+ $button.html('
circle anim ');
const on_click = this.get('on_click');
await on_click();
$button.html(this.get('label'));
@@ -82,7 +81,7 @@ export default def(class Button extends Component {
}
listen('enabled', enabled => {
- $(this.dom_).find('button').prop('disabled', ! enabled);
+ $(this.dom_).find('button').prop('disabled', !enabled);
});
}
});
diff --git a/src/gui/src/UI/Components/CodeEntryView.js b/src/gui/src/UI/Components/CodeEntryView.js
index 4c6d230ab0..75d73c625c 100644
--- a/src/gui/src/UI/Components/CodeEntryView.js
+++ b/src/gui/src/UI/Components/CodeEntryView.js
@@ -17,7 +17,6 @@
* along with this program. If not, see
.
*/
-
const Component = use('util.Component');
export default def(class CodeEntryView extends Component {
@@ -27,7 +26,7 @@ export default def(class CodeEntryView extends Component {
value: {},
error: {},
is_checking_code: {},
- }
+ };
static RENDER_MODE = Component.NO_SHADOW;
@@ -69,7 +68,7 @@ export default def(class CodeEntryView extends Component {
font-size: 40px;
font-weight: 300;
}
- `
+ `;
create_template ({ template }) {
// TODO: static member for strings
@@ -112,7 +111,7 @@ export default def(class CodeEntryView extends Component {
$(this.dom_).find('.digit-input').val('');
return;
}
- })
+ });
listen('is_checking_code', (is_checking_code, { old_value }) => {
if ( old_value === is_checking_code ) return;
@@ -123,7 +122,7 @@ export default def(class CodeEntryView extends Component {
if ( is_checking_code ) {
// set animation
$button.prop('disabled', true);
- $button.html(`
circle anim `);
+ $button.html('
circle anim ');
return;
}
@@ -133,7 +132,7 @@ export default def(class CodeEntryView extends Component {
});
const that = this;
- $(this.dom_).find('.code-confirm-btn').on('click submit', function(e){
+ $(this.dom_).find('.code-confirm-btn').on('click submit', function (e) {
e.preventDefault();
e.stopPropagation();
@@ -143,10 +142,10 @@ export default def(class CodeEntryView extends Component {
$button.closest('.error').hide();
that.set('is_checking_code', true);
-
+
// force update to trigger the listener
that.set('value', that.get('value'));
- })
+ });
// Elements
const numberCodeForm = this.dom_.querySelector('[data-number-code-form]');
@@ -156,17 +155,19 @@ export default def(class CodeEntryView extends Component {
numberCodeForm.addEventListener('input', ({ target }) => {
const inputLength = target.value.length || 0;
let currentIndex = Number(target.dataset.numberCodeInput);
- if(inputLength === 2){
+ if ( inputLength === 2 ) {
const inputValues = target.value.split('');
target.value = inputValues[0];
}
- else if (inputLength > 1) {
+ else if ( inputLength > 1 ) {
const inputValues = target.value.split('');
inputValues.forEach((value, valueIndex) => {
const nextValueIndex = currentIndex + valueIndex;
- if (nextValueIndex >= numberCodeInputs.length) { return; }
+ if ( nextValueIndex >= numberCodeInputs.length ) {
+ return;
+ }
numberCodeInputs[nextValueIndex].value = value;
});
@@ -175,13 +176,13 @@ export default def(class CodeEntryView extends Component {
const nextIndex = currentIndex + 1;
- if (nextIndex < numberCodeInputs.length) {
+ if ( nextIndex < numberCodeInputs.length ) {
numberCodeInputs[nextIndex].focus();
}
// Concatenate all inputs into one string to create the final code
let current_code = '';
- for(let i=0; i< numberCodeInputs.length; i++){
+ for ( let i = 0; i < numberCodeInputs.length; i++ ) {
current_code += numberCodeInputs[i].value;
}
@@ -189,7 +190,7 @@ export default def(class CodeEntryView extends Component {
$(this.dom_).find('.code-confirm-btn').html(submit_btn_txt);
// Automatically submit if 6 digits entered
- if(current_code.length === 6){
+ if ( current_code.length === 6 ) {
$(this.dom_).find('.code-confirm-btn').prop('disabled', false);
this.set('value', current_code);
this.set('is_checking_code', true);
@@ -206,33 +207,33 @@ export default def(class CodeEntryView extends Component {
const nextIndex = currentIndex + 1;
const hasPreviousIndex = previousIndex >= 0;
- const hasNextIndex = nextIndex <= numberCodeInputs.length - 1
-
- switch (code) {
- case 'ArrowLeft':
- case 'ArrowUp':
- if (hasPreviousIndex) {
- numberCodeInputs[previousIndex].focus();
- }
- e.preventDefault();
- break;
-
- case 'ArrowRight':
- case 'ArrowDown':
- if (hasNextIndex) {
- numberCodeInputs[nextIndex].focus();
- }
- e.preventDefault();
- break;
- case 'Backspace':
- if (!e.target.value.length && hasPreviousIndex) {
- numberCodeInputs[previousIndex].value = null;
- numberCodeInputs[previousIndex].focus();
- }
- break;
- default:
- break;
+ const hasNextIndex = nextIndex <= numberCodeInputs.length - 1;
+
+ switch ( code ) {
+ case 'ArrowLeft':
+ case 'ArrowUp':
+ if ( hasPreviousIndex ) {
+ numberCodeInputs[previousIndex].focus();
+ }
+ e.preventDefault();
+ break;
+
+ case 'ArrowRight':
+ case 'ArrowDown':
+ if ( hasNextIndex ) {
+ numberCodeInputs[nextIndex].focus();
+ }
+ e.preventDefault();
+ break;
+ case 'Backspace':
+ if ( !e.target.value.length && hasPreviousIndex ) {
+ numberCodeInputs[previousIndex].value = null;
+ numberCodeInputs[previousIndex].focus();
+ }
+ break;
+ default:
+ break;
}
});
}
-})
+});
diff --git a/src/gui/src/UI/Components/ConfirmationsView.js b/src/gui/src/UI/Components/ConfirmationsView.js
index 09d6077d1c..b3c43f1258 100644
--- a/src/gui/src/UI/Components/ConfirmationsView.js
+++ b/src/gui/src/UI/Components/ConfirmationsView.js
@@ -17,7 +17,6 @@
* along with this program. If not, see
.
*/
-
const Component = use('util.Component');
/**
@@ -33,7 +32,7 @@ export default def(class ConfirmationsView extends Component {
confirmed: {
description: 'True iff all confirmations are checked',
},
- }
+ };
static CSS = /*css*/`
.confirmations {
@@ -47,7 +46,7 @@ export default def(class ConfirmationsView extends Component {
font-weight: 700;
display: none;
}
- `
+ `;
create_template ({ template }) {
$(template).html(/*html*/`
diff --git a/src/gui/src/UI/Components/Flexer.js b/src/gui/src/UI/Components/Flexer.js
index 915d2f96c2..a2c03a868e 100644
--- a/src/gui/src/UI/Components/Flexer.js
+++ b/src/gui/src/UI/Components/Flexer.js
@@ -17,7 +17,6 @@
* along with this program. If not, see
.
*/
-
const Component = use('util.Component');
/**
@@ -30,7 +29,7 @@ export default def(class Flexer extends Component {
static PROPERTIES = {
children: {},
gap: { value: '20pt' },
- }
+ };
static CSS = `
:host > div {
diff --git a/src/gui/src/UI/Components/JustHTML.js b/src/gui/src/UI/Components/JustHTML.js
index 925e95a799..d94c17ae3d 100644
--- a/src/gui/src/UI/Components/JustHTML.js
+++ b/src/gui/src/UI/Components/JustHTML.js
@@ -17,7 +17,6 @@
* along with this program. If not, see
.
*/
-
const Component = use('util.Component');
/**
@@ -28,7 +27,7 @@ export default def(class JustHTML extends Component {
static PROPERTIES = { html: { value: '' } };
create_template ({ template }) {
- $(template).html(`
`);
+ $(template).html('
');
}
on_ready ({ listen }) {
listen('html', html => {
@@ -36,7 +35,7 @@ export default def(class JustHTML extends Component {
});
}
- _set_dom_based_on_render_mode({ property_values }) {
+ _set_dom_based_on_render_mode ({ property_values }) {
if ( property_values.no_shadow ) {
this.dom_ = this;
return;
diff --git a/src/gui/src/UI/Components/PasswordEntry.js b/src/gui/src/UI/Components/PasswordEntry.js
index 90ecaf93e7..881eccaf43 100644
--- a/src/gui/src/UI/Components/PasswordEntry.js
+++ b/src/gui/src/UI/Components/PasswordEntry.js
@@ -17,7 +17,6 @@
* along with this program. If not, see
.
*/
-
const Component = use('util.Component');
export default def(class PasswordEntry extends Component {
@@ -29,7 +28,7 @@ export default def(class PasswordEntry extends Component {
error: {},
on_submit: {},
show_password: {},
- }
+ };
static CSS = /*css*/`
fieldset {
@@ -105,8 +104,8 @@ export default def(class PasswordEntry extends Component {
@@ -34,8 +34,8 @@ async function PuterDialog(options) {
`;
const el_window = await UIWindow({
- title: `Upload`,
- icon: window.icons[`app-icon-uploader.svg`],
+ title: 'Upload',
+ icon: window.icons['app-icon-uploader.svg'],
uid: null,
is_dir: false,
body_content: h,
@@ -52,7 +52,7 @@ async function PuterDialog(options) {
width: '100%',
top: '0',
dominant: true,
- window_css:{
+ window_css: {
height: '100%',
width: '100%',
top: '0 !important',
@@ -63,19 +63,19 @@ async function PuterDialog(options) {
width: 'initial',
'background-color': 'rgba(231, 238, 245, .95)',
'backdrop-filter': 'blur(3px)',
- }
+ },
});
$(el_window).find('#launch-auth-popup').on('click submit', function (e) {
$(el_window).close();
resolve(true);
- })
+ });
$(el_window).find('#launch-auth-popup-cancel').on('click submit', function (e) {
$(el_window).close();
resolve(false);
- })
- })
+ });
+ });
}
// export as default
export default PuterDialog;
diff --git a/src/gui/src/UI/Settings/UITabAbout.js b/src/gui/src/UI/Settings/UITabAbout.js
index 0f2d3cb619..90a1baf05c 100644
--- a/src/gui/src/UI/Settings/UITabAbout.js
+++ b/src/gui/src/UI/Settings/UITabAbout.js
@@ -7,12 +7,12 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- h += `
`;
- h += `
`;
- h += `
';
+ h += `
`;
+ h += '
';
+ h += '
`;
- h += `
${i18n('password')} `;
- h += `
`;
- h += `${i18n('change_password')} `;
- h += `
`;
- h += `
';
+ h += `
${i18n('password')} `;
+ h += '
';
+ h += `${i18n('change_password')} `;
+ h += '
';
+ h += '
`;
- h += `
`;
- h += `${i18n('username')} `;
- h += `${html_encode(window.user.username)} `;
- h += `
`;
- h += `
`;
- h += `${i18n('change_username')} `;
- h += `
`
- h += `
';
+ h += '
';
+ h += `${i18n('username')} `;
+ h += `${html_encode(window.user.username)} `;
+ h += '
';
+ h += '
';
+ h += `${i18n('change_username')} `;
+ h += '
';
+ h += '
`;
- h += `
`;
- h += `${i18n('email')} `;
- h += `${html_encode(window.user.email)} `;
- h += `
`;
- h += `
`;
- h += `${i18n('change_email')} `;
- h += `
`;
- h += `
';
+ h += '
';
+ h += `${i18n('email')} `;
+ h += `${html_encode(window.user.email)} `;
+ h += '
';
+ h += '
';
+ h += `${i18n('change_email')} `;
+ h += '
';
+ h += '
`;
- h += `
${i18n("delete_account")} `;
- h += `
`;
- h += `${i18n("delete_account")} `;
- h += `
`;
- h += `
';
+ h += `
${i18n('delete_account')} `;
+ h += '
';
+ h += `${i18n('delete_account')} `;
+ h += '
';
+ h += '
`;
- for (let lang of available_languages) {
- h += `
${html_encode(lang.name)}
`;
- }
- h += `
';
+ for ( let lang of available_languages ) {
+ h += `
${html_encode(lang.name)}
`;
+ }
+ h += '
`;
- h += `
${i18n('password')} `;
- h += `
`;
- h += `${i18n('change_password')} `;
- h += `
`;
- h += `
';
+ h += `
${i18n('password')} `;
+ h += '
';
+ h += `${i18n('change_password')} `;
+ h += '
';
+ h += '
`;
- h += `
${i18n('sessions')} `;
- h += `
`;
- h += `${i18n('manage_sessions')} `;
- h += `
`;
- h += `
';
+ h += `
${i18n('sessions')} `;
+ h += '
';
+ h += `${i18n('manage_sessions')} `;
+ h += '
';
+ h += '
`;
- h += `
`;
- h += `${i18n('two_factor')} `;
- h += `${
- i18n(user.otp ? 'two_factor_enabled' : 'two_factor_disabled')
- } `;
- h += `
`;
- h += `
`;
- h += `${i18n('enable_2fa')} `;
- h += `${i18n('disable_2fa')} `;
- h += `
`;
- h += `
';
+ h += `${i18n('two_factor')} `;
+ h += `${
+ i18n(user.otp ? 'two_factor_enabled' : 'two_factor_disabled')
+ } `;
+ h += '
';
+ h += '';
+ h += `${i18n('enable_2fa')} `;
+ h += `${i18n('disable_2fa')} `;
+ h += '
';
+ h += '';
}
return h;
@@ -100,27 +100,28 @@ export default {
/* eslint no-empty: ["error", { "allowEmptyCatch": true }] */
let message; try {
message = (await resp.json()).message;
- } catch (e) {}
+ } catch (e) {
+ }
message = message || i18n('error_unknown_cause');
password_entry.set('error', message);
return;
}
password_confirm_promise.resolve(true);
$(win).close();
- }
+ };
let h = '';
- h += ``;
- h += `
`;
+ h += '
';
+ h += '
';
h += `
${i18n('disable_2fa_confirm')} `;
h += `
${i18n('disable_2fa_instructions')}
`;
- h += `
`;
- h += `
`;
- h += `
';
+ h += '
';
+ h += '${i18n('disable_2fa')} `;
h += `${i18n('cancel')} `;
- h += `
`;
- h += `
`;
+ h += '
';
+ h += '
';
@@ -110,22 +110,24 @@ async function update_usage_details($el_window){
`;
- h += ``;
- for(let key in res.usage){
+ h += ' ';
+ for ( let key in res.usage ) {
// value must be object
- if(typeof res.usage[key] !== 'object')
+ if ( typeof res.usage[key] !== 'object' )
+ {
continue;
+ }
// get the units
let units = res.usage[key].units;
// Bytes should be formatted as human readable
- if(key.startsWith('filesystem:') && key.endsWith(':bytes')){
+ if ( key.startsWith('filesystem:') && key.endsWith(':bytes') ) {
units = window.byte_format(units);
}
// Everything else should be formatted as a number
- else{
- units = window.number_format(units, {decimals: 0, thousandSeparator: ','});
+ else {
+ units = window.number_format(units, { decimals: 0, thousandSeparator: ',' });
}
h += `
@@ -135,7 +137,7 @@ async function update_usage_details($el_window){
${window.number_format(res.usage[key].cost / 100_000_000, { decimals: 2, prefix: '$' })}
`;
}
- h += ` `;
+ h += '';
h += '
';
$('.driver-usage-details-content').html(h);
@@ -159,13 +161,12 @@ async function update_usage_details($el_window){
$('#storage-used').html(window.byte_format(general_used));
$('#storage-capacity').html(window.byte_format(res.capacity));
$('#storage-used-percent').html(
- usage_percentage + '%' +
- (host_usage_percentage > 0
- ? ' / ' + host_usage_percentage + '%' : '')
- );
- $('#storage-bar').css('width', usage_percentage + '%');
- $('#storage-bar-host').css('width', host_usage_percentage + '%');
- if (usage_percentage >= 100) {
+ `${usage_percentage }%${
+ host_usage_percentage > 0
+ ? ` / ${ host_usage_percentage }%` : ''}`);
+ $('#storage-bar').css('width', `${usage_percentage }%`);
+ $('#storage-bar-host').css('width', `${host_usage_percentage }%`);
+ if ( usage_percentage >= 100 ) {
$('#storage-bar').css({
'border-top-right-radius': '3px',
'border-bottom-right-radius': '3px',
@@ -175,14 +176,14 @@ async function update_usage_details($el_window){
// Wait for both promises to complete
await Promise.all([monthlyUsagePromise, spacePromise]);
-
+
// Ensure spinning continues for at least 1 second
const elapsed = Date.now() - startTime;
const minDuration = 1000; // 1 second
- if (elapsed < minDuration) {
+ if ( elapsed < minDuration ) {
await new Promise(resolve => setTimeout(resolve, minDuration - elapsed));
}
-
+
// Remove spinning animation
$($el_window).find('.update-usage-details-icon').css('animation', '');
}
\ No newline at end of file
diff --git a/src/gui/src/UI/Settings/UIWindowChangeEmail.js b/src/gui/src/UI/Settings/UIWindowChangeEmail.js
index cccf1e98b3..0fd394b2d0 100644
--- a/src/gui/src/UI/Settings/UIWindowChangeEmail.js
+++ b/src/gui/src/UI/Settings/UIWindowChangeEmail.js
@@ -7,23 +7,23 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- // error msg
- h += `
`;
- // success msg
- h += `
`;
- // new email
- h += `
`;
- h += `${i18n('new_email')} `;
- h += `
`;
- // password confirmation
- h += `
`;
- h += `${i18n('account_password')} `;
- h += `${place_password_entry.html}`;
- h += `
`;
+ h += '
';
+ // error msg
+ h += '
';
+ // success msg
+ h += '
';
+ // new email
+ h += '
';
+ h += `${i18n('new_email')} `;
+ h += `
';
+ // password confirmation
+ h += '
';
+ h += `${i18n('account_password')} `;
+ h += `${place_password_entry.html}`;
+ h += '
';
- // Change Email
- h += `
${i18n('change_email')} `;
- h += `
`;
+ // Change Email
+ h += `
${i18n('change_email')} `;
+ h += '
`;
- h += `
×
`;
- h += `
`;
- h += `
${i18n('confirm_delete_user')}
`;
- h += `
${i18n('proceed_with_account_deletion')} `;
- h += `
${i18n('cancel')} `;
- h += `
';
+ h += '
×
';
+ h += `
`;
+ h += `
${i18n('confirm_delete_user')}
`;
+ h += `
${i18n('proceed_with_account_deletion')} `;
+ h += `
${i18n('cancel')} `;
+ h += '
`;
- h += `
×
`;
- h += `
`;
- h += `
${i18n('type_confirm_to_delete_account')}
`;
- // error message
- h += `
`;
- // input field
- h += `
`;
- h += `
${i18n('delete_account')} `;
- h += `
${i18n('cancel')} `;
- h += `
';
+ h += '
×
';
+ h += `
`;
+ h += `
${i18n('type_confirm_to_delete_account')}
`;
+ // error message
+ h += '
';
+ // input field
+ h += `
`;
+ h += `
${i18n('delete_account')} `;
+ h += `
${i18n('cancel')} `;
+ h += '
`;
- h += `
×
`;
- h += `
`;
- h += `
${i18n('enter_password_to_confirm_delete_user')}
`;
- // error message
- h += `
`;
- // input field
- h += `
`;
- h += `
${i18n('delete_account')} `;
- h += `
${i18n('cancel')} `;
- h += `
';
+ h += '
×
';
+ h += `
`;
+ h += `
${i18n('enter_password_to_confirm_delete_user')}
`;
+ // error message
+ h += '
';
+ // input field
+ h += `
`;
+ h += `
${i18n('delete_account')} `;
+ h += `
${i18n('cancel')} `;
+ h += '
`;
- h += `
`;
- // sidebar toggle
- h += ``;
- // sidebar
- h += ``;
-
- // content
- h += `
`;
-
- tabs.forEach((tab, i) => {
- h += `
`;
- if ( tab.factory || tab.dom ) {
- tab_placeholders[i] = Placeholder();
- h += tab_placeholders[i].html;
- } else {
- h += tab.html();
- }
- h += `
`;
- });
+ h += '
';
+ h += '
';
+ // sidebar toggle
+ h += '';
+ // sidebar
+ h += '`;
- h += `
`;
- h += `
`;
+ // sidebar items
+ h += ``;
+ tabs.forEach((tab, i) => {
+ h += ``;
+ });
+ h += '
';
+
+ // content
+ h += '
';
+
+ tabs.forEach((tab, i) => {
+ h += `
`;
+ if ( tab.factory || tab.dom ) {
+ tab_placeholders[i] = Placeholder();
+ h += tab_placeholders[i].html;
+ } else {
+ h += tab.html();
+ }
+ h += '
';
+ });
+
+ h += '
';
+ h += '
';
+ h += '
${santized_message}
`;
// buttons
- if (options.buttons && options.buttons.length > 0) {
- h += ``;
- for (let y = 0; y < options.buttons.length; y++) {
+ if ( options.buttons && options.buttons.length > 0 ) {
+ h += '
';
+ for ( let y = 0; y < options.buttons.length; y++ ) {
h += `${html_encode(options.buttons[y].label)} `;
}
- h += `
`;
+ h += '
} options.items - Array of menu items or dividers ('-')
* @param {string} options.items[].html - HTML content for the menu item
@@ -388,7 +388,7 @@
* @param {string} [options.parent_id] - ID of parent menu for nested menus
* @param {boolean} [options.is_submenu] - Whether this is a nested submenu, default: false
* @param {Function} [options.onClose] - Callback function when menu closes
- *
+ *
* @example
* // Basic usage with simple items
* UIContextMenu({
@@ -398,20 +398,20 @@
* { html: 'Paste', icon: '📌', disabled: true }
* ]
* });
- *
+ *
* @example
* // Usage with nested submenus and custom positioning
* UIContextMenu({
* position: { top: 100, left: 200 },
* items: [
- * {
+ * {
* html: 'File',
* items: [
* { html: 'New', icon: '📄' },
* { html: 'Open', icon: '📂' }
* ]
* },
- * {
+ * {
* html: 'Edit',
* items: [
* { html: 'Cut', icon: '✂️' },
@@ -420,32 +420,32 @@
* }
* ]
* });
- *
+ *
* @example
* // Usage with menu controller
* const menu = UIContextMenu({
* items: [{ html: 'Close', onClick: () => menu.cancel() }]
* });
* menu.onClose = () => console.log('Menu closed');
- *
+ *
* @fires ctxmenu-will-open - Dispatched on window before menu opens
* @listens mousemove - Tracks mouse position for submenu positioning
* @listens click - Handles menu item selection
* @listens contextmenu - Prevents default context menu
* @listens mouseenter - Handles submenu activation
* @listens mouseleave - Handles menu item deactivation
- *
+ *
* @requires jQuery
* @requires jQuery-menu-aim
*/
-function UIContextMenu(options){
+function UIContextMenu (options) {
$('.window-active .window-app-iframe').css('pointer-events', 'none');
const menu_id = window.global_element_id++;
- // Dispatch 'ctxmenu-will-open' event
- window.dispatchEvent(new CustomEvent('ctxmenu-will-open', { detail: { options: options} }));
+ // Dispatch 'ctxmenu-will-open' event
+ window.dispatchEvent(new CustomEvent('ctxmenu-will-open', { detail: { options: options } }));
let h = '';
h += ``
- $('body').append(h)
-
+ // divider
+ else if ( options.items[i].is_divider || options.items[i] === '-' )
+ {
+ h += '';
+ }
+ }
+ h += '';
+ $('body').append(h);
const contextMenu = document.getElementById(`context-menu-${menu_id}`);
const menu_width = $(contextMenu).width();
@@ -515,12 +516,12 @@ function UIContextMenu(options){
//--------------------------------
// Auto position
//--------------------------------
- if(!options.position){
- if(isMobile.phone || isMobile.tablet){
+ if ( ! options.position ) {
+ if ( isMobile.phone || isMobile.tablet ) {
start_x = window.last_touch_x;
start_y = window.last_touch_y;
- }else{
+ } else {
start_x = window.mouseX;
start_y = window.mouseY;
}
@@ -528,49 +529,53 @@ function UIContextMenu(options){
//--------------------------------
// custom position
//--------------------------------
- else{
+ else {
start_x = options.position.left;
start_y = options.position.top;
}
// X position
let x_pos;
- if( start_x + menu_width > window.innerWidth){
+ if ( start_x + menu_width > window.innerWidth ) {
x_pos = start_x - menu_width;
// if this is a child menu, the width of parent must also be considered
- if(options.parent_id && $(`.context-menu[data-element-id="${options.parent_id}"]`).length > 0){
+ if ( options.parent_id && $(`.context-menu[data-element-id="${options.parent_id}"]`).length > 0 ) {
x_pos -= $(`.context-menu[data-element-id="${options.parent_id}"]`).width() + 30;
}
- }else{
- x_pos = start_x
+ } else {
+ x_pos = start_x;
}
// Y position
let y_pos;
// is the menu going to go out of the window from the bottom?
- if( (start_y + menu_height) > (window.innerHeight - window.taskbar_height - 10))
+ if ( (start_y + menu_height) > (window.innerHeight - window.taskbar_height - 10) )
+ {
y_pos = window.innerHeight - menu_height - window.taskbar_height - 10;
+ }
else
+ {
y_pos = start_y;
+ }
// In the right position (the mouse)
$(contextMenu).css({
- top: y_pos + "px",
- left: x_pos + "px"
+ top: `${y_pos }px`,
+ left: `${x_pos }px`,
});
// Some times we need to apply custom CSS to the context menu
// This is different from the option flags for positioning and other basic styling
// This is for more advanced styling , like adding a border radius or a shadow that don't merit a new option
// Option flags should be reserved for essential styling that may have logic and sanitization attached to them
- if(options.css){
+ if ( options.css ) {
$(contextMenu).css(options.css);
}
// Show ContextMenu
- if ( options?.delay === false) {
+ if ( options?.delay === false ) {
$(contextMenu).show(0);
- } else if(options?.delay === true || options?.delay === 1 || options?.delay === undefined) {
+ } else if ( options?.delay === true || options?.delay === 1 || options?.delay === undefined ) {
$(contextMenu).fadeIn(50).show(0);
} else {
$(contextMenu).fadeIn(options?.delay).show(0);
@@ -581,7 +586,7 @@ function UIContextMenu(options){
let cancel_options_ = null;
const fade_remove = (item) => {
- $(`#context-menu-${menu_id}, .context-menu[data-element-id="${$(item).closest('.context-menu').attr('data-parent-id')}"]`).fadeOut(200, function(){
+ $(`#context-menu-${menu_id}, .context-menu[data-element-id="${$(item).closest('.context-menu').attr('data-parent-id')}"]`).fadeOut(200, function () {
$(contextMenu).remove();
});
};
@@ -591,41 +596,41 @@ function UIContextMenu(options){
// An item is clicked
$(document).on('click', `#context-menu-${menu_id} > li:not(.context-menu-item-disabled)`, function (e) {
-
+
// onClick
- if(options.items[$(this).attr("data-action")].onClick && typeof options.items[$(this).attr("data-action")].onClick === 'function'){
+ if ( options.items[$(this).attr('data-action')].onClick && typeof options.items[$(this).attr('data-action')].onClick === 'function' ) {
let event = e;
- event.value = options.items[$(this).attr("data-action")]['val'] ?? undefined;
- options.items[$(this).attr("data-action")].onClick(event);
+ event.value = options.items[$(this).attr('data-action')]['val'] ?? undefined;
+ options.items[$(this).attr('data-action')].onClick(event);
}
// "action" - onClick without un-clonable pointer event
- else if(options.items[$(this).attr("data-action")].action && typeof options.items[$(this).attr("data-action")].action === 'function'){
- options.items[$(this).attr("data-action")].action();
+ else if ( options.items[$(this).attr('data-action')].action && typeof options.items[$(this).attr('data-action')].action === 'function' ) {
+ options.items[$(this).attr('data-action')].action();
}
// close menu and, if exists, its parent
- if(!$(this).hasClass('context-menu-item-submenu')){
+ if ( ! $(this).hasClass('context-menu-item-submenu') ) {
fade_remove(this);
}
return false;
});
// This will hold the timer for the submenu delay:
- // There is a delay in opening the submenu, this is to make sure that if the mouse is
+ // There is a delay in opening the submenu, this is to make sure that if the mouse is
// just passing over the item, the submenu doesn't open immediately.
let submenu_delay_timer;
// Initialize the menuAim plugin
$(contextMenu).menuAim({
- rowSelector: ".context-menu-item",
- submenuSelector: ".context-menu-item-submenu",
- submenuDirection: function(){
+ rowSelector: '.context-menu-item',
+ submenuSelector: '.context-menu-item-submenu',
+ submenuDirection: function () {
// If not submenu
- if(!options.is_submenu){
+ if ( ! options.is_submenu ) {
// if submenu's left postiton is greater than main menu's left position
- if($(contextMenu).offset().left + 2 * $(contextMenu).width() + 15 < window.innerWidth ){
- return "right";
+ if ( $(contextMenu).offset().left + 2 * $(contextMenu).width() + 15 < window.innerWidth ) {
+ return 'right';
} else {
- return "left";
+ return 'left';
}
}
},
@@ -637,7 +642,7 @@ function UIContextMenu(options){
activate: function (e, event, data) {
// make sure last recorded mouse position is the same as the current one before activating
// this is because switching contexts from iframe to window can cause the mouse position to be off
- if(!data?.keyboard && (e.pageX !== window.mouseX || e.pageY !== window.mouseY)){
+ if ( !data?.keyboard && (e.pageX !== window.mouseX || e.pageY !== window.mouseY) ) {
return;
}
// activate items
@@ -654,10 +659,10 @@ function UIContextMenu(options){
submenu_delay_timer = setTimeout(() => {
// activate submenu
// open submenu if applicable
- if($(e).hasClass('context-menu-item-submenu')){
+ if ( $(e).hasClass('context-menu-item-submenu') ) {
let item_rect_box = e.getBoundingClientRect();
// open submenu only if it's not already open
- if($(`.context-menu[data-id="${menu_id}-${$(e).attr('data-action')}"]`).length === 0){
+ if ( $(`.context-menu[data-id="${menu_id}-${$(e).attr('data-action')}"]`).length === 0 ) {
// close other submenus
$(`.context-menu[parent-element-id="${menu_id}"]`).remove();
// add `has-open-context-menu-submenu` class to the parent menu item
@@ -665,25 +670,25 @@ function UIContextMenu(options){
// Calculate the position for the submenu
let submenu_x_pos, submenu_y_pos;
- if (isMobile.phone || isMobile.tablet) {
+ if ( isMobile.phone || isMobile.tablet ) {
submenu_y_pos = y_pos;
submenu_x_pos = x_pos;
} else {
- submenu_y_pos = item_rect_box.top - 5;
+ submenu_y_pos = item_rect_box.top - 5;
submenu_x_pos = x_pos + item_rect_box.width + 15;
}
// open the new submenu
- UIContextMenu({
+ UIContextMenu({
items: options.items[parseInt($(e).attr('data-action'))].items,
parent_id: menu_id,
is_submenu: true,
- id: menu_id + '-' + $(e).attr('data-action'),
- position:{
+ id: `${menu_id }-${ $(e).attr('data-action')}`,
+ position: {
top: submenu_y_pos,
left: submenu_x_pos,
- }
- })
+ },
+ });
}
}
}, 300);
@@ -693,7 +698,7 @@ function UIContextMenu(options){
// disable submenu delay timer to cancel submenu opening
clearTimeout(submenu_delay_timer);
// close submenu
- if($(e).hasClass('has-open-context-menu-submenu')){
+ if ( $(e).hasClass('has-open-context-menu-submenu') ) {
$(`.context-menu[data-id="${menu_id}-${$(e).attr('data-action')}"]`).remove();
// remove `has-open-context-menu-submenu` class from the parent menu item
$(e).removeClass('has-open-context-menu-submenu');
@@ -704,13 +709,13 @@ function UIContextMenu(options){
$(e.target).removeClass('context-menu-item-active');
},
});
-
+
// disabled item mousedown event
$(`#context-menu-${menu_id} > li.context-menu-item-disabled`).on('mousedown', function (e) {
e.preventDefault();
e.stopPropagation();
return false;
- })
+ });
// Useful in cases such as where a menu item is over a window, this prevents the mousedown event from
// reaching the window underneath
@@ -718,45 +723,45 @@ function UIContextMenu(options){
e.preventDefault();
e.stopPropagation();
return false;
- })
+ });
// Disable parent scroll
- if(options.parent_element){
+ if ( options.parent_element ) {
$(options.parent_element).css('overflow', 'hidden');
$(options.parent_element).parent().addClass('children-have-open-contextmenu');
$(options.parent_element).addClass('has-open-contextmenu');
}
- $(contextMenu).on("remove", function () {
- if(submenu_delay_timer) clearTimeout(submenu_delay_timer);
+ $(contextMenu).on('remove', function () {
+ if ( submenu_delay_timer ) clearTimeout(submenu_delay_timer);
if ( options.onClose ) options.onClose(cancel_options_);
// when removing, make parent scrollable again
- if(options.parent_element){
+ if ( options.parent_element ) {
$(options.parent_element).parent().removeClass('children-have-open-contextmenu');
// make parent scrollable again
$(options.parent_element).css('overflow', 'scroll');
-
+
$(options.parent_element).removeClass('has-open-contextmenu');
- if($(options.parent_element).hasClass('taskbar-item')){
- window.make_taskbar_sortable()
+ if ( $(options.parent_element).hasClass('taskbar-item') ) {
+ window.make_taskbar_sortable();
}
}
- })
+ });
- $(contextMenu).on("contextmenu", function (e) {
+ $(contextMenu).on('contextmenu', function (e) {
e.preventDefault();
e.stopPropagation();
return false;
- })
+ });
- $(contextMenu).on("mouseleave", function (e) {
+ $(contextMenu).on('mouseleave', function (e) {
$(contextMenu).find('.context-menu-item').removeClass('context-menu-item-active');
clearTimeout(submenu_delay_timer);
- })
+ });
- $(contextMenu).on("mouseenter", function (e) {
- })
+ $(contextMenu).on('mouseenter', function (e) {
+ });
return {
cancel: (cancel_options) => {
@@ -769,37 +774,37 @@ function UIContextMenu(options){
},
set onClose (fn) {
options.onClose = fn;
- }
+ },
};
}
-window.select_ctxmenu_item = function ($ctxmenu_item){
+window.select_ctxmenu_item = function ($ctxmenu_item) {
// remove active class from other items
$($ctxmenu_item).siblings('.context-menu-item').removeClass('context-menu-item-active');
// remove `has-open-context-menu-submenu` class from other items
$($ctxmenu_item).siblings('.context-menu-item').removeClass('has-open-context-menu-submenu');
// add active class to the selected item
$($ctxmenu_item).addClass('context-menu-item-active');
-}
+};
-$(document).on('mouseleave', '.context-menu', function(){
+$(document).on('mouseleave', '.context-menu', function () {
// when mouse leaves the context menu, remove active class from all items
$(this).find('.context-menu-item').removeClass('context-menu-item-active');
-})
+});
-$(document).on('mouseenter', '.context-menu', function(e){
+$(document).on('mouseenter', '.context-menu', function (e) {
// when mouse enters the context menu, convert all items with submenu to active
- $(this).find('.has-open-context-menu-submenu').each(function(){
+ $(this).find('.has-open-context-menu-submenu').each(function () {
$(this).addClass('context-menu-item-active');
- })
-})
+ });
+});
-$(document).on('mouseenter', '.context-menu-item', function(e, data){
-})
+$(document).on('mouseenter', '.context-menu-item', function (e, data) {
+});
-$(document).on('mouseenter', '.context-menu-divider', function(e){
+$(document).on('mouseenter', '.context-menu-divider', function (e) {
// unselect all items
$(this).siblings('.context-menu-item:not(.has-open-context-menu-submenu)').removeClass('context-menu-item-active');
-})
+});
export default UIContextMenu;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIDesktop.js b/src/gui/src/UI/UIDesktop.js
index 1c7c698ed3..10b164e17f 100644
--- a/src/gui/src/UI/UIDesktop.js
+++ b/src/gui/src/UI/UIDesktop.js
@@ -7,47 +7,47 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
`;
+ h += '
';
// Desktop
// If desktop is not in fullpage/embedded mode, we hide it until files and directories are loaded and then fade in the UI
@@ -674,28 +702,28 @@ async function UIDesktop(options) {
data-path="${html_encode(window.desktop_path)}"
>`;
- // show AI button
- if(window.user.email_confirmed){
- h += ``;
- }
- h += ``;
+ // show AI button
+ if ( window.user.email_confirmed ) {
+ h += '';
+ }
+ h += '';
// Get window sidebar width
puter.kv.get('window_sidebar_width').then(async (val) => {
let value = parseInt(val);
// if value is a valid number
- if (!isNaN(value) && value > 0) {
+ if ( !isNaN(value) && value > 0 ) {
window.window_sidebar_width = value;
}
- })
+ });
// load window sidebar items from KV
- puter.kv.get("sidebar_items").then(async (val) => {
+ puter.kv.get('sidebar_items').then(async (val) => {
window.sidebar_items = val;
- })
+ });
// Remove `?ref=...` from navbar URL
- if (window.url_query_params.has('ref')) {
+ if ( window.url_query_params.has('ref') ) {
window.history.pushState(null, document.title, '/');
}
@@ -720,14 +748,14 @@ async function UIDesktop(options) {
$('body').append(h);
// Set desktop height based on taskbar height
- $('.desktop').css('height', `calc(100vh - ${window.taskbar_height + window.toolbar_height}px)`)
+ $('.desktop').css('height', `calc(100vh - ${window.taskbar_height + window.toolbar_height}px)`);
// Initialize the preference early
puter.kv.get('desktop_icons_hidden').then(async (val) => {
window.desktop_icons_hidden = (val === 'true' || val === true);
// Apply the setting immediately if needed
- if (window.desktop_icons_hidden) {
+ if ( window.desktop_icons_hidden ) {
hideDesktopIcons();
}
});
@@ -758,17 +786,19 @@ async function UIDesktop(options) {
drop: async function (dragsterEvent, event) {
const e = event.originalEvent;
// no drop on item
- if ($(event.target).hasClass('item') || $(event.target).parent('.item').length > 0)
+ if ( $(event.target).hasClass('item') || $(event.target).parent('.item').length > 0 )
+ {
return false;
+ }
// recursively create directories and upload files
- if (e.dataTransfer?.items?.length > 0) {
+ if ( e.dataTransfer?.items?.length > 0 ) {
window.upload_items(e.dataTransfer.items, window.desktop_path);
}
e.stopPropagation();
e.preventDefault();
return false;
- }
+ },
});
// --------------------------------------------------------
@@ -776,70 +806,86 @@ async function UIDesktop(options) {
// --------------------------------------------------------
$(el_desktop).droppable({
accept: '.item',
- tolerance: "intersect",
+ tolerance: 'intersect',
drop: function (event, ui) {
// Check if item was actually dropped on desktop and not a window
- if (window.mouseover_window !== undefined)
+ if ( window.mouseover_window !== undefined )
+ {
return;
+ }
// Can't drop anything but UIItems on desktop
- if (!$(ui.draggable).hasClass('item'))
+ if ( ! $(ui.draggable).hasClass('item') )
+ {
return;
+ }
// Don't move an item to its current directory
- if (path.dirname($(ui.draggable).attr('data-path')) === window.desktop_path && !event.ctrlKey)
+ if ( path.dirname($(ui.draggable).attr('data-path')) === window.desktop_path && !event.ctrlKey )
+ {
return;
+ }
// If ctrl is pressed and source is Trashed, cancel whole operation
- if (event.ctrlKey && path.dirname($(ui.draggable).attr('data-path')) === window.trash_path)
+ if ( event.ctrlKey && path.dirname($(ui.draggable).attr('data-path')) === window.trash_path )
+ {
return;
+ }
// Unselect previously selected items
$(el_desktop).children('.item-selected').removeClass('item-selected');
- const items_to_move = []
+ const items_to_move = [];
// first item
items_to_move.push(ui.draggable);
// all subsequent items
const cloned_items = document.getElementsByClassName('item-selected-clone');
- for (let i = 0; i < cloned_items.length; i++) {
- const source_item = document.getElementById('item-' + $(cloned_items[i]).attr('data-id'));
- if (source_item !== null)
+ for ( let i = 0; i < cloned_items.length; i++ ) {
+ const source_item = document.getElementById(`item-${ $(cloned_items[i]).attr('data-id')}`);
+ if ( source_item !== null )
+ {
items_to_move.push(source_item);
+ }
}
// if ctrl key is down, copy items
- if (event.ctrlKey) {
+ if ( event.ctrlKey ) {
// unless source is Trash
- if (path.dirname($(ui.draggable).attr('data-path')) === window.trash_path)
+ if ( path.dirname($(ui.draggable).attr('data-path')) === window.trash_path )
+ {
return;
+ }
- window.copy_items(items_to_move, window.desktop_path)
+ window.copy_items(items_to_move, window.desktop_path);
}
// otherwise, move items
else {
window.move_items(items_to_move, window.desktop_path);
}
- }
+ },
});
//--------------------------------------------------
// ContextMenu
//--------------------------------------------------
- $(el_desktop).bind("contextmenu taphold", function (event) {
+ $(el_desktop).bind('contextmenu taphold', function (event) {
// dismiss taphold on regular devices
- if (event.type === 'taphold' && !isMobile.phone && !isMobile.tablet)
+ if ( event.type === 'taphold' && !isMobile.phone && !isMobile.tablet )
+ {
return;
+ }
const $target = $(event.target);
// elements that should retain native ctxmenu
- if ($target.is('input') || $target.is('textarea'))
- return true
+ if ( $target.is('input') || $target.is('textarea') )
+ {
+ return true;
+ }
// custom ctxmenu for all other elements
- if (event.target === el_desktop) {
+ if ( event.target === el_desktop ) {
event.preventDefault();
UIContextMenu({
position: event.type === 'taphold' ? undefined : { left: event.pageX, top: event.pageY },
@@ -856,14 +902,14 @@ async function UIDesktop(options) {
onClick: async function () {
window.is_auto_arrange_enabled = !window.is_auto_arrange_enabled;
window.store_auto_arrange_preference(window.is_auto_arrange_enabled);
- if (window.is_auto_arrange_enabled) {
+ if ( window.is_auto_arrange_enabled ) {
window.sort_items(el_desktop, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order'));
- window.set_sort_by(options.desktop_fsentry.uid, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order'))
+ window.set_sort_by(options.desktop_fsentry.uid, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order'));
window.clear_desktop_item_positions(el_desktop);
} else {
- window.set_desktop_item_positions(el_desktop)
+ window.set_desktop_item_positions(el_desktop);
}
- }
+ },
},
// -------------------------------------------
// -
@@ -875,8 +921,8 @@ async function UIDesktop(options) {
icon: $(el_desktop).attr('data-sort_by') === 'name' ? '✓' : '',
onClick: async function () {
window.sort_items(el_desktop, 'name', $(el_desktop).attr('data-sort_order'));
- window.set_sort_by(options.desktop_fsentry.uid, 'name', $(el_desktop).attr('data-sort_order'))
- }
+ window.set_sort_by(options.desktop_fsentry.uid, 'name', $(el_desktop).attr('data-sort_order'));
+ },
},
{
html: i18n('date_modified'),
@@ -884,8 +930,8 @@ async function UIDesktop(options) {
icon: $(el_desktop).attr('data-sort_by') === 'modified' ? '✓' : '',
onClick: async function () {
window.sort_items(el_desktop, 'modified', $(el_desktop).attr('data-sort_order'));
- window.set_sort_by(options.desktop_fsentry.uid, 'modified', $(el_desktop).attr('data-sort_order'))
- }
+ window.set_sort_by(options.desktop_fsentry.uid, 'modified', $(el_desktop).attr('data-sort_order'));
+ },
},
{
html: i18n('type'),
@@ -893,8 +939,8 @@ async function UIDesktop(options) {
icon: $(el_desktop).attr('data-sort_by') === 'type' ? '✓' : '',
onClick: async function () {
window.sort_items(el_desktop, 'type', $(el_desktop).attr('data-sort_order'));
- window.set_sort_by(options.desktop_fsentry.uid, 'type', $(el_desktop).attr('data-sort_order'))
- }
+ window.set_sort_by(options.desktop_fsentry.uid, 'type', $(el_desktop).attr('data-sort_order'));
+ },
},
{
html: i18n('size'),
@@ -902,8 +948,8 @@ async function UIDesktop(options) {
icon: $(el_desktop).attr('data-sort_by') === 'size' ? '✓' : '',
onClick: async function () {
window.sort_items(el_desktop, 'size', $(el_desktop).attr('data-sort_order'));
- window.set_sort_by(options.desktop_fsentry.uid, 'size', $(el_desktop).attr('data-sort_order'))
- }
+ window.set_sort_by(options.desktop_fsentry.uid, 'size', $(el_desktop).attr('data-sort_order'));
+ },
},
// -------------------------------------------
// -
@@ -914,22 +960,22 @@ async function UIDesktop(options) {
disabled: !window.is_auto_arrange_enabled,
icon: $(el_desktop).attr('data-sort_order') === 'asc' ? '✓' : '',
onClick: async function () {
- const sort_by = $(el_desktop).attr('data-sort_by')
+ const sort_by = $(el_desktop).attr('data-sort_by');
window.sort_items(el_desktop, sort_by, 'asc');
- window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'asc')
- }
+ window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'asc');
+ },
},
{
html: i18n('descending'),
disabled: !window.is_auto_arrange_enabled,
icon: $(el_desktop).attr('data-sort_order') === 'desc' ? '✓' : '',
onClick: async function () {
- const sort_by = $(el_desktop).attr('data-sort_by')
+ const sort_by = $(el_desktop).attr('data-sort_by');
window.sort_items(el_desktop, sort_by, 'desc');
- window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'desc')
- }
+ window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'desc');
+ },
},
- ]
+ ],
},
// -------------------------------------------
// Refresh
@@ -938,7 +984,7 @@ async function UIDesktop(options) {
html: i18n('refresh'),
onClick: function () {
refresh_item_container(el_desktop, { consistency: 'strong' });
- }
+ },
},
// -------------------------------------------
// Show/Hide hidden files
@@ -951,7 +997,7 @@ async function UIDesktop(options) {
show_hidden_files: !window.user_preferences.show_hidden_files,
});
window.show_or_hide_files(document.querySelectorAll('.item-container'));
- }
+ },
},
// -------------------------------------------
// Hide Desktop Icons
@@ -960,7 +1006,7 @@ async function UIDesktop(options) {
html: window.desktop_icons_hidden ? i18n('Show desktop icons') : i18n('Hide desktop icons'),
onClick: function () {
toggleDesktopIcons();
- }
+ },
},
// -------------------------------------------
// -
@@ -981,11 +1027,15 @@ async function UIDesktop(options) {
html: i18n('paste'),
disabled: window.clipboard.length > 0 ? false : true,
onClick: function () {
- if (window.clipboard_op === 'copy')
+ if ( window.clipboard_op === 'copy' )
+ {
window.copy_clipboard_items(window.desktop_path, el_desktop);
- else if (window.clipboard_op === 'move')
- window.move_clipboard_items(el_desktop)
- }
+ }
+ else if ( window.clipboard_op === 'move' )
+ {
+ window.move_clipboard_items(el_desktop);
+ }
+ },
},
// -------------------------------------------
// Undo
@@ -995,7 +1045,7 @@ async function UIDesktop(options) {
disabled: window.actions_history.length > 0 ? false : true,
onClick: function () {
window.undo_last_action();
- }
+ },
},
// -------------------------------------------
// Upload Here
@@ -1004,7 +1054,7 @@ async function UIDesktop(options) {
html: i18n('upload_here'),
onClick: function () {
window.init_upload_using_dialog(el_desktop);
- }
+ },
},
// -------------------------------------------
// -
@@ -1017,10 +1067,10 @@ async function UIDesktop(options) {
html: i18n('change_desktop_background'),
onClick: function () {
UIWindowDesktopBGSettings();
- }
+ },
},
- ]
+ ],
});
}
});
@@ -1030,29 +1080,29 @@ async function UIDesktop(options) {
// we don't need to get the desktop items if we're in embedded or fullpage mode
// because the items aren't visible anyway and we don't need to waste bandwidth/server resources
//-------------------------------------------
- if (!window.is_embedded && !window.is_fullpage_mode) {
- refresh_item_container(el_desktop, {
+ if ( !window.is_embedded && !window.is_fullpage_mode ) {
+ refresh_item_container(el_desktop, {
fadeInItems: true,
onComplete: () => {
// End transaction when desktop is fully ready for user interaction
transaction.end();
- }
- })
+ },
+ });
// perform readdirs for caching purposes
// home directory
- puter.fs.readdir({path: window.home_path, consistency: 'strong'});
+ puter.fs.readdir({ path: window.home_path, consistency: 'strong' });
- // Show welcome window if user hasn't already seen it and hasn't directly navigated to an app
- if (!window.url_paths[0]?.toLocaleLowerCase() === 'app' || !window.url_paths[1]) {
- if (!isMobile.phone && !isMobile.tablet) {
+ // Show welcome window if user hasn't already seen it and hasn't directly navigated to an app
+ if ( !window.url_paths[0]?.toLocaleLowerCase() === 'app' || !window.url_paths[1] ) {
+ if ( !isMobile.phone && !isMobile.tablet ) {
setTimeout(() => {
puter.kv.get('has_seen_welcome_window').then(async (val) => {
- if (val === null) {
+ if ( val === null ) {
await UIWindowWelcome();
}
- })
+ });
}, 1000);
}
}
@@ -1062,7 +1112,7 @@ async function UIDesktop(options) {
// Selectable
// Only for desktop
// -------------------------------------------
- if (!isMobile.phone && !isMobile.tablet) {
+ if ( !isMobile.phone && !isMobile.tablet ) {
let selected_ctrl_items = [];
const selection = new SelectionArea({
selectionContainerClass: '.selection-area-container',
@@ -1077,17 +1127,17 @@ async function UIDesktop(options) {
scrolling: {
speedDivider: 10,
manualSpeed: 750,
- startScrollMargins: { x: 0, y: 0 }
- }
+ startScrollMargins: { x: 0, y: 0 },
+ },
},
features: {
touch: true,
range: true,
singleTap: {
allow: true,
- intersect: 'native'
- }
- }
+ intersect: 'native',
+ },
+ },
});
selection.on('beforestart', ({ event }) => {
@@ -1098,8 +1148,8 @@ async function UIDesktop(options) {
.on('beforedrag', evt => {
})
.on('start', ({ store, event }) => {
- if (!event.ctrlKey && !event.metaKey) {
- for (const el of store.stored) {
+ if ( !event.ctrlKey && !event.metaKey ) {
+ for ( const el of store.stored ) {
el.classList.remove('item-selected');
}
@@ -1112,9 +1162,9 @@ async function UIDesktop(options) {
.on('move', ({ store: { changed: { added, removed } }, event }) => {
window.desktop_selectable_is_active = true;
- for (const el of added) {
+ for ( const el of added ) {
// if ctrl or meta key is pressed and the item is already selected, then unselect it
- if ((event.ctrlKey || event.metaKey) && $(el).hasClass('item-selected')) {
+ if ( (event.ctrlKey || event.metaKey) && $(el).hasClass('item-selected') ) {
el.classList.remove('item-selected');
selected_ctrl_items.push(el);
}
@@ -1124,11 +1174,13 @@ async function UIDesktop(options) {
}
}
- for (const el of removed) {
+ for ( const el of removed ) {
el.classList.remove('item-selected');
// in case this item was selected by ctrl+click before, then reselect it again
- if (selected_ctrl_items.includes(el))
+ if ( selected_ctrl_items.includes(el) )
+ {
$(el).not('.item-disabled').addClass('item-selected');
+ }
}
})
.on('stop', evt => {
@@ -1141,15 +1193,15 @@ async function UIDesktop(options) {
// ----------------------------------------------------
// Has user seen the toolbar animation?
window.has_seen_toolbar_animation = await puter.kv.get('has_seen_toolbar_animation') ?? false;
-
+
let ht = '';
let style = '';
let class_name = '';
- if(window.has_seen_toolbar_animation && !isMobile.phone && !isMobile.tablet){
+ if ( window.has_seen_toolbar_animation && !isMobile.phone && !isMobile.tablet ) {
style = 'top: -20px; width: 40px;';
class_name = 'toolbar-hidden';
- }else{
- style= 'height:30px; min-height:30px; max-height:30px;';
+ } else {
+ style = 'height:30px; min-height:30px; max-height:30px;';
}
ht += `';
// 'Show Desktop'
ht += `${i18n('desktop_show_desktop')} `;
// refer
- if (window.user.referral_code) {
+ if ( window.user.referral_code ) {
ht += `
`;
}
@@ -1176,35 +1228,37 @@ async function UIDesktop(options) {
ht += `
`;
}
// qr code button -- only show if not embedded
- if (!window.is_embedded)
+ if ( ! window.is_embedded )
+ {
ht += `
`;
+ }
// search button
ht += `
`;
- //clock
- ht += `12:00 AM Sun, Jan 01
`;
+ //clock
+ ht += '12:00 AM Sun, Jan 01
';
// user options menu
- ht += ``;
+ ht += '';
+ ht += '';
// prepend toolbar to desktop
$(ht).insertBefore(el_desktop);
// If auto-hide is disabled, ensure toolbar is visible on load
- if (!window.toolbar_auto_hide_enabled) {
+ if ( ! window.toolbar_auto_hide_enabled ) {
// Make sure toolbar is visible when auto-hide is disabled
setTimeout(() => {
- if ($('.toolbar').hasClass('toolbar-hidden')) {
+ if ( $('.toolbar').hasClass('toolbar-hidden') ) {
window.show_toolbar();
}
}, 100); // Small delay to ensure DOM is ready
@@ -1230,29 +1284,29 @@ async function UIDesktop(options) {
//--------------------------------------------------------
// Open the AI app
- //--------------------------------------------------------
- if(window.user.email_confirmed){
+ //--------------------------------------------------------
+ if ( window.user.email_confirmed ) {
launch_app({
name: 'ai',
window_options: {
is_panel: true,
- }
- })
+ },
+ });
}
//--------------------------------------------------------------------------------------
// Determine if an app was launched from URL
// i.e. https://puter.com/app/
//--------------------------------------------------------------------------------------
- if (window.url_paths[0]?.toLocaleLowerCase() === 'app' && window.url_paths[1]) {
+ if ( window.url_paths[0]?.toLocaleLowerCase() === 'app' && window.url_paths[1] ) {
window.app_launched_from_url = window.url_paths[1];
// get app metadata
try {
- window.app_launched_from_url = await puter.apps.get(window.url_paths[1], { icon_size: 64 })
+ window.app_launched_from_url = await puter.apps.get(window.url_paths[1], { icon_size: 64 });
window.is_fullpage_mode = window.app_launched_from_url.metadata?.fullpage_on_landing ?? window.is_fullpage_mode ?? false;
// show 'Show Desktop' button
- if (window.is_fullpage_mode) {
+ if ( window.is_fullpage_mode ) {
$('.show-desktop-btn').removeClass('hidden');
}
} catch (e) {
@@ -1261,32 +1315,36 @@ async function UIDesktop(options) {
// get query params, any param that doesn't start with 'puter.' will be passed to the app
window.app_query_params = {};
- for (let [key, value] of window.url_query_params) {
- if (!key.startsWith('puter.'))
+ for ( let [key, value] of window.url_query_params ) {
+ if ( ! key.startsWith('puter.') )
+ {
window.app_query_params[key] = value;
+ }
}
}
//--------------------------------------------------------------------------------------
// /settings will open settings in fullpage mode
//--------------------------------------------------------------------------------------
- else if (window.url_paths[0]?.toLocaleLowerCase() === 'settings') {
+ else if ( window.url_paths[0]?.toLocaleLowerCase() === 'settings' ) {
// open settings
UIWindowSettings({
tab: window.url_paths[1] || 'about',
window_options: {
is_fullpage: true,
- }
+ },
});
}
// ---------------------------------------------
// Run apps from insta-login URL
// ---------------------------------------------
- if (window.url_query_params.has('app')) {
+ if ( window.url_query_params.has('app') ) {
let url_app_name = window.url_query_params.get('app');
- if (url_app_name === 'explorer') {
+ if ( url_app_name === 'explorer' ) {
let predefined_path = window.home_path;
- if (window.url_query_params.has('path'))
- predefined_path = window.url_query_params.get('path')
+ if ( window.url_query_params.has('path') )
+ {
+ predefined_path = window.url_query_params.get('path');
+ }
// launch explorer
UIWindow({
path: predefined_path,
@@ -1304,10 +1362,10 @@ async function UIDesktop(options) {
// ---------------------------------------------
// load from direct app URLs: /app/app-name
// ---------------------------------------------
- else if (window.app_launched_from_url) {
- if (!window.url_query_params.has('c')) {
+ else if ( window.app_launched_from_url ) {
+ if ( ! window.url_query_params.has('c') ) {
let posargs = undefined;
- if (window.app_query_params && window.app_query_params.posargs) {
+ if ( window.app_query_params && window.app_query_params.posargs ) {
posargs = JSON.parse(window.app_query_params.posargs);
}
launch_app({
@@ -1318,47 +1376,49 @@ async function UIDesktop(options) {
params: window.app_query_params ?? [],
...(posargs ? {
args: {
- command_line: { args: posargs }
- }
+ command_line: { args: posargs },
+ },
} : {}),
is_fullpage: window.is_fullpage_mode,
window_options: {
stay_on_top: false,
- }
+ },
});
}
}
$(el_desktop).on('mousedown touchstart', { passive: true }, function (e) {
// dimiss touchstart on regular devices
- if (e.type === 'taphold' && !isMobile.phone && !isMobile.tablet)
+ if ( e.type === 'taphold' && !isMobile.phone && !isMobile.tablet )
+ {
return;
+ }
// disable pointer-events for all app iframes, this is to make sure selectable works
$('.window-app-iframe').css('pointer-events', 'none');
$('.window').find('.item-selected').addClass('item-blurred');
$('.desktop').find('.item-blurred').removeClass('item-blurred');
- })
+ });
$(el_desktop).on('click', function (e) {
// blur all windows
$('.window-active').removeClass('window-active');
// hide all global menubars
$('.window-menubar-global').hide();
- })
+ });
- function display_ct() {
+ function display_ct () {
- var x = new Date()
+ var x = new Date();
var ampm = x.getHours() >= 12 ? ' PM' : ' AM';
let hours = x.getHours() % 12;
hours = hours ? hours : 12;
hours = hours.toString().length == 1 ? 0 + hours.toString() : hours;
- var minutes = x.getMinutes().toString()
+ var minutes = x.getMinutes().toString();
minutes = minutes.length == 1 ? 0 + minutes : minutes;
- var seconds = x.getSeconds().toString()
+ var seconds = x.getSeconds().toString();
seconds = seconds.length == 1 ? 0 + seconds : seconds;
var month = x.toLocaleString('default', { month: 'short' });
@@ -1368,48 +1428,47 @@ async function UIDesktop(options) {
var day = x.toLocaleString('default', { weekday: 'short' });
-
- var x1 = day + ", " + month + " " + dt;
- x1 = hours + ":" + minutes + ampm + " " + x1;
+ var x1 = `${day }, ${ month } ${ dt}`;
+ x1 = `${hours }:${ minutes }${ampm } ${ x1}`;
$('#clock').html(x1);
}
- display_ct()
+ display_ct();
setInterval(display_ct, 1000);
// show referral notice window
- if (window.show_referral_notice && !window.user.email_confirmed) {
+ if ( window.show_referral_notice && !window.user.email_confirmed ) {
puter.kv.get('shown_referral_notice').then(async (val) => {
- if (!val || val === 'false' || val === false) {
+ if ( !val || val === 'false' || val === false ) {
setTimeout(() => {
UIWindowClaimReferral();
}, 1000);
puter.kv.set({
- key: "shown_referral_notice",
+ key: 'shown_referral_notice',
value: true,
- })
+ });
}
- })
+ });
}
window.hide_toolbar = (animate = true) => {
// Always show toolbar on mobile and tablet devices
- if (isMobile.phone || isMobile.tablet) {
+ if ( isMobile.phone || isMobile.tablet ) {
return;
}
-
+
// Don't hide toolbar if auto-hide is disabled
- if (!window.toolbar_auto_hide_enabled) {
+ if ( ! window.toolbar_auto_hide_enabled ) {
return;
}
-
- if ($('.toolbar').hasClass('toolbar-hidden')) return;
+
+ if ( $('.toolbar').hasClass('toolbar-hidden') ) return;
// attach hidden class to toolbar
$('.toolbar').addClass('toolbar-hidden');
// animate the toolbar to top = -20px;
// animate width to 40px;
- if (animate) {
+ if ( animate ) {
$('.toolbar').animate({
top: '-20px',
width: '40px',
@@ -1421,7 +1480,7 @@ async function UIDesktop(options) {
});
}
// animate hide toolbar-btn, toolbar-clock
- if (animate) {
+ if ( animate ) {
$('.toolbar-btn, #clock, .user-options-menu-btn').animate({
opacity: 0,
}, 10);
@@ -1431,18 +1490,18 @@ async function UIDesktop(options) {
});
}
- if(!window.has_seen_toolbar_animation){
+ if ( ! window.has_seen_toolbar_animation ) {
puter.kv.set({
- key: "has_seen_toolbar_animation",
+ key: 'has_seen_toolbar_animation',
value: true,
- })
+ });
window.has_seen_toolbar_animation = true;
}
- }
+ };
window.show_toolbar = () => {
- if (!$('.toolbar').hasClass('toolbar-hidden')) return;
+ if ( ! $('.toolbar').hasClass('toolbar-hidden') ) return;
// remove hidden class from toolbar
$('.toolbar').removeClass('toolbar-hidden');
@@ -1455,7 +1514,7 @@ async function UIDesktop(options) {
$('.toolbar-btn, #clock, .user-options-menu-btn').animate({
opacity: 0.8,
}, 50);
- }
+ };
// Toolbar hide/show logic with improved UX
window.toolbarHideTimeout = null;
@@ -1469,78 +1528,76 @@ async function UIDesktop(options) {
// Function to check if mouse is in the safe zone around toolbar
window.isMouseInToolbarSafeZone = (mouseX, mouseY) => {
const toolbar = $('.toolbar')[0];
- if (!toolbar) return false;
-
+ if ( ! toolbar ) return false;
+
const rect = toolbar.getBoundingClientRect();
-
+
// Expand the toolbar bounds by the safe zone
const safeZone = {
top: rect.top - TOOLBAR_SAFE_ZONE,
bottom: rect.bottom + TOOLBAR_SAFE_ZONE,
left: rect.left - TOOLBAR_SAFE_ZONE,
- right: rect.right + TOOLBAR_SAFE_ZONE
+ right: rect.right + TOOLBAR_SAFE_ZONE,
};
-
- return mouseX >= safeZone.left &&
- mouseX <= safeZone.right &&
- mouseY >= safeZone.top &&
- mouseY <= safeZone.bottom;
+
+ return mouseX >= safeZone.left &&
+ mouseX <= safeZone.right &&
+ mouseY >= safeZone.top &&
+ mouseY <= safeZone.bottom;
};
// Function to handle toolbar hiding with improved logic
window.handleToolbarHiding = (mouseX, mouseY) => {
// Always show toolbar on mobile and tablet devices
- if (isMobile.phone || isMobile.tablet) {
+ if ( isMobile.phone || isMobile.tablet ) {
return;
}
-
+
// Don't hide toolbar if auto-hide is disabled
- if (!window.toolbar_auto_hide_enabled) {
+ if ( ! window.toolbar_auto_hide_enabled ) {
return;
}
-
+
// Clear any existing timeout
- if (window.toolbarHideTimeout) {
+ if ( window.toolbarHideTimeout ) {
clearTimeout(window.toolbarHideTimeout);
window.toolbarHideTimeout = null;
}
-
+
// Don't hide if toolbar is already hidden
- if ($('.toolbar').hasClass('toolbar-hidden')) return;
-
+ if ( $('.toolbar').hasClass('toolbar-hidden') ) return;
+
const wasNearToolbar = isMouseNearToolbar;
isMouseNearToolbar = window.isMouseInToolbarSafeZone(mouseX, mouseY);
-
+
// If mouse is in safe zone, don't hide
- if (isMouseNearToolbar) {
+ if ( isMouseNearToolbar ) {
return;
}
-
+
// Determine hide delay based on mouse movement pattern
let hideDelay = TOOLBAR_HIDE_DELAY;
-
+
// If mouse was previously near toolbar and now moved far away, hide quicker
- if (wasNearToolbar && !isMouseNearToolbar) {
+ if ( wasNearToolbar && !isMouseNearToolbar ) {
// Check if mouse moved significantly away
const toolbar = $('.toolbar')[0];
- if (toolbar) {
+ if ( toolbar ) {
const rect = toolbar.getBoundingClientRect();
- const distanceFromToolbar = Math.min(
- Math.abs(mouseY - rect.bottom),
- Math.abs(mouseY - rect.top)
- );
-
+ const distanceFromToolbar = Math.min(Math.abs(mouseY - rect.bottom),
+ Math.abs(mouseY - rect.top));
+
// If mouse is far from toolbar, hide quicker
- if (distanceFromToolbar > TOOLBAR_SAFE_ZONE * 2) {
+ if ( distanceFromToolbar > TOOLBAR_SAFE_ZONE * 2 ) {
hideDelay = TOOLBAR_QUICK_HIDE_DELAY;
}
}
}
-
+
// Set timeout to hide toolbar
window.toolbarHideTimeout = setTimeout(() => {
// Double-check mouse position before hiding
- if (!window.isMouseInToolbarSafeZone(window.mouseX, window.mouseY)) {
+ if ( ! window.isMouseInToolbarSafeZone(window.mouseX, window.mouseY) ) {
window.hide_toolbar();
}
window.toolbarHideTimeout = null;
@@ -1549,18 +1606,18 @@ async function UIDesktop(options) {
// debounce timer to prevent toolbar showing immediately after drag ends
window.drag_release_debounce_timer = null;
- const DRAG_RELEASE_DEBOUNCE_MS = 300;
+ const DRAG_RELEASE_DEBOUNCE_MS = 300;
// track when drag operations end to enable debounce
- $(document).on('dragend', function() {
+ $(document).on('dragend', function () {
window.drag_release_debounce_timer = setTimeout(() => {
window.drag_release_debounce_timer = null;
}, DRAG_RELEASE_DEBOUNCE_MS);
});
// also debounce when mouseup occurs while in drag state
- $(document).on('mouseup', function() {
- if (window.a_window_is_being_dragged || window.an_item_is_being_dragged) {
+ $(document).on('mouseup', function () {
+ if ( window.a_window_is_being_dragged || window.an_item_is_being_dragged ) {
window.drag_release_debounce_timer = setTimeout(() => {
window.drag_release_debounce_timer = null;
}, DRAG_RELEASE_DEBOUNCE_MS);
@@ -1570,23 +1627,31 @@ async function UIDesktop(options) {
// hovering over a hidden toolbar will show it
$(document).on('mouseenter', '.toolbar-hidden', function () {
// if a window is being dragged or currently in drag release debounce period, don't show the toolbar
- if(window.a_window_is_being_dragged || window.drag_release_debounce_timer !== null)
+ if ( window.a_window_is_being_dragged || window.drag_release_debounce_timer !== null )
+ {
return;
+ }
// if selectable is active , don't show the toolbar
- if(window.desktop_selectable_is_active)
+ if ( window.desktop_selectable_is_active )
+ {
return;
+ }
// if an item is being dragged, don't show the toolbar
- if(window.an_item_is_being_dragged)
+ if ( window.an_item_is_being_dragged )
+ {
return;
+ }
- if(window.is_fullpage_mode)
+ if ( window.is_fullpage_mode )
+ {
$('.window-app-iframe').css('pointer-events', 'none');
+ }
window.show_toolbar();
// Clear any pending hide timeout
- if (window.toolbarHideTimeout) {
+ if ( window.toolbarHideTimeout ) {
clearTimeout(window.toolbarHideTimeout);
window.toolbarHideTimeout = null;
}
@@ -1595,11 +1660,13 @@ async function UIDesktop(options) {
// hovering over a visible toolbar will show it and cancel hiding
$(document).on('mouseenter', '.toolbar:not(.toolbar-hidden)', function () {
// if a window is being dragged, don't show the toolbar
- if(window.a_window_is_being_dragged)
+ if ( window.a_window_is_being_dragged )
+ {
return;
+ }
// Clear any pending hide timeout when entering toolbar
- if (window.toolbarHideTimeout) {
+ if ( window.toolbarHideTimeout ) {
clearTimeout(window.toolbarHideTimeout);
window.toolbarHideTimeout = null;
}
@@ -1607,84 +1674,94 @@ async function UIDesktop(options) {
});
$(document).on('mouseenter', '.toolbar', function () {
- if(window.is_fullpage_mode)
+ if ( window.is_fullpage_mode )
+ {
$('.toolbar').focus();
+ }
});
// any click will hide the toolbar, unless:
// - it's on the toolbar
// - it's the user options menu button
// - the user options menu is open
- $(document).on('click', function(e){
+ $(document).on('click', function (e) {
// Always show toolbar on mobile and tablet devices
- if (isMobile.phone || isMobile.tablet) {
+ if ( isMobile.phone || isMobile.tablet ) {
return;
}
-
+
// Don't hide toolbar if auto-hide is disabled
- if (!window.toolbar_auto_hide_enabled) {
+ if ( ! window.toolbar_auto_hide_enabled ) {
return;
}
-
+
// if the user has not seen the toolbar animation, don't hide the toolbar
- if(!window.has_seen_toolbar_animation)
+ if ( ! window.has_seen_toolbar_animation )
+ {
return;
+ }
- if(
- !$(e.target).hasClass('toolbar') &&
- !$(e.target).hasClass('user-options-menu-btn') &&
+ if (
+ !$(e.target).hasClass('toolbar') &&
+ !$(e.target).hasClass('user-options-menu-btn') &&
$('.context-menu[data-id="user-options-menu"]').length === 0 &&
true
- ){
+ ) {
window.hide_toolbar(false);
}
- })
+ });
// Handle mouse leaving the toolbar
$(document).on('mouseleave', '.toolbar', function () {
// Always show toolbar on mobile and tablet devices
- if (isMobile.phone || isMobile.tablet) {
+ if ( isMobile.phone || isMobile.tablet ) {
return;
}
-
+
// Don't hide toolbar if auto-hide is disabled
- if (!window.toolbar_auto_hide_enabled) {
+ if ( ! window.toolbar_auto_hide_enabled ) {
return;
}
-
+
window.has_left_toolbar_at_least_once = true;
// if the user options menu is open, don't hide the toolbar
- if ($('.context-menu[data-id="user-options-menu"]').length > 0)
+ if ( $('.context-menu[data-id="user-options-menu"]').length > 0 )
+ {
return;
-
+ }
+
// Start the hiding logic with current mouse position
window.handleToolbarHiding(window.mouseX, window.mouseY);
});
// Track mouse movement globally to update toolbar hiding logic
- $(document).on('mousemove', function(e) {
+ $(document).on('mousemove', function (e) {
// Always show toolbar on mobile and tablet devices
- if (isMobile.phone || isMobile.tablet) {
+ if ( isMobile.phone || isMobile.tablet ) {
return;
}
-
+
// Don't hide toolbar if auto-hide is disabled
- if (!window.toolbar_auto_hide_enabled) {
+ if ( ! window.toolbar_auto_hide_enabled ) {
return;
}
-
+
// if the user has not seen the toolbar animation, don't hide the toolbar
- if(!window.has_seen_toolbar_animation && !window.has_left_toolbar_at_least_once)
+ if ( !window.has_seen_toolbar_animation && !window.has_left_toolbar_at_least_once )
+ {
return;
+ }
// if the user options menu is open, don't hide the toolbar
- if ($('.context-menu[data-id="user-options-menu"]').length > 0)
+ if ( $('.context-menu[data-id="user-options-menu"]').length > 0 )
+ {
return;
+ }
// Only handle toolbar hiding if toolbar is visible and mouse moved significantly
- if (!$('.toolbar').hasClass('toolbar-hidden')) {
+ if ( ! $('.toolbar').hasClass('toolbar-hidden') ) {
// Use throttling to avoid excessive calls
- if (!window.mouseMoveThrottle) {
+ if ( ! window.mouseMoveThrottle ) {
window.mouseMoveThrottle = setTimeout(() => {
window.handleToolbarHiding(window.mouseX, window.mouseY);
window.mouseMoveThrottle = null;
@@ -1698,18 +1775,18 @@ async function UIDesktop(options) {
// i.e. https://puter.com/@
//--------------------------------------------------------------------------------------
const url_paths = window.location.pathname.split('/').filter(element => element);
- if (window.url_paths[0]?.startsWith('@')) {
+ if ( window.url_paths[0]?.startsWith('@') ) {
const username = window.url_paths[0].substring(1);
- let item_path = '/' + username + '/Public';
+ let item_path = `/${ username }/Public`;
if ( window.url_paths.length > 1 ) {
- item_path += '/' + window.url_paths.slice(1).join('/');
+ item_path += `/${ window.url_paths.slice(1).join('/')}`;
}
// GUARD: avoid invalid user directories
{
- if (!username.match(/^[a-z0-9_]+$/i)) {
+ if ( ! username.match(/^[a-z0-9_]+$/i) ) {
UIAlert({
- message: i18n('error_invalid_username')
+ message: i18n('error_invalid_username'),
});
return;
}
@@ -1717,12 +1794,12 @@ async function UIDesktop(options) {
let stat;
try {
- stat = await puter.fs.stat({path: item_path, consistency: 'eventual'});
+ stat = await puter.fs.stat({ path: item_path, consistency: 'eventual' });
} catch ( e ) {
window.history.replaceState(null, document.title, '/');
UIAlert({
message: i18n('error_user_or_path_not_found'),
- type: 'error'
+ type: 'error',
});
return;
}
@@ -1736,10 +1813,10 @@ async function UIDesktop(options) {
launch_app({ name: stat.associated_app.name });
return;
}
-
+
const ext_pref =
window.user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`];
-
+
if ( ext_pref ) {
launch_app({
name: ext_pref,
@@ -1747,17 +1824,16 @@ async function UIDesktop(options) {
});
return;
}
-
const open_item_meta = await $.ajax({
- url: window.api_origin + "/open_item",
+ url: `${window.api_origin }/open_item`,
type: 'POST',
- contentType: "application/json",
+ contentType: 'application/json',
data: JSON.stringify({
path: item_path,
}),
headers: {
- "Authorization": "Bearer "+window.auth_token
+ 'Authorization': `Bearer ${window.auth_token}`,
},
statusCode: {
401: function () {
@@ -1766,7 +1842,7 @@ async function UIDesktop(options) {
},
});
const suggested_apps = open_item_meta?.suggested_apps ?? await window.suggest_apps_for_fsentry({
- path: item_path
+ path: item_path,
});
// Note: I'm not adding unzipping logic here. We'll wait until
@@ -1774,7 +1850,7 @@ async function UIDesktop(options) {
// properly-reusable open function.
if ( suggested_apps.length !== 0 ) {
launch_app({
- name: suggested_apps[0].name,
+ name: suggested_apps[0].name,
token: open_item_meta.token,
file_path: item_path,
app_obj: suggested_apps[0],
@@ -1788,9 +1864,9 @@ async function UIDesktop(options) {
await UIAlert({
message: 'Cannot find an app to open this file; ' +
- 'opening directory instead.'
+ 'opening directory instead.',
});
- item_path = item_path.split('/').slice(0, -1).join('/')
+ item_path = item_path.split('/').slice(0, -1).join('/');
}
UIWindow({
@@ -1806,7 +1882,7 @@ async function UIDesktop(options) {
// Direct download link
// i.e. https://puter.com/?download=
//--------------------------------------------------------------------------------------
- if (window.url_paths.length === 0 && window.url_query_params.has('download')) {
+ if ( window.url_paths.length === 0 && window.url_query_params.has('download') ) {
const url = window.url_query_params.get('download');
let file_name = url.split('/').pop().split('?')[0];
@@ -1814,33 +1890,33 @@ async function UIDesktop(options) {
message: i18n('confirm_download_file_to_desktop', file_name),
type: 'confirm',
buttons: [
- { label: i18n('alert_yes'), value: true, type: "primary" },
- { label: i18n('alert_no'), value: false, type: "secondary" }
+ { label: i18n('alert_yes'), value: true, type: 'primary' },
+ { label: i18n('alert_no'), value: false, type: 'secondary' },
],
});
- if (!response)
+ if ( ! response )
+ {
return;
-
-
+ }
let cancelled = false;
let upload_xhr = null;
const abort_controller = new AbortController();
-
+
// create progressbar dialog
let progwin = await UIWindowProgress({
title: i18n('downloading'),
- icon: window.icons[`app-icon-uploader.svg`],
+ icon: window.icons['app-icon-uploader.svg'],
operation_id: window.uuidv4(),
show_progress: true,
on_cancel: () => {
cancelled = true;
abort_controller.abort();
- if (upload_xhr) {
+ if ( upload_xhr ) {
upload_xhr.abort();
}
- }
+ },
});
progwin?.set_status(i18n('downloading_file', file_name));
@@ -1853,15 +1929,15 @@ async function UIDesktop(options) {
const total = Number(response.headers.get('content-length'));
const reader = response.body.getReader();
-
+
const chunks = [];
let received = 0;
- while (true) {
+ while ( true ) {
const { done, value } = await reader.read();
- if (done || cancelled) break;
+ if ( done || cancelled ) break;
- if (value) {
+ if ( value ) {
// store the chunk
chunks.push(value);
received += value.length;
@@ -1874,7 +1950,7 @@ async function UIDesktop(options) {
}
}
- if (cancelled) {
+ if ( cancelled ) {
progwin?.close();
return;
}
@@ -1883,7 +1959,7 @@ async function UIDesktop(options) {
let blob = new Blob(chunks, {
type: response.headers.get('content-type') ?? 'application/octet-stream',
});
-
+
// reset progressbar
progwin?.set_progress(0);
progwin?.set_status(i18n('uploading_file', file_name));
@@ -1897,13 +1973,13 @@ async function UIDesktop(options) {
},
init: (_, xhr) => {
upload_xhr = xhr;
- }
+ },
});
} catch (e) {
// alert the user if there's a genuine error
- if (!cancelled && e.name !== 'AbortError') {
+ if ( !cancelled && e.name !== 'AbortError' ) {
await UIAlert({
- message: i18n('error_download_failed') + ': ' + e.message,
+ message: `${i18n('error_download_failed') }: ${ e.message}`,
type: 'error',
});
}
@@ -1916,68 +1992,70 @@ async function UIDesktop(options) {
$(document).on('contextmenu taphold', '.taskbar', function (event) {
// dismiss taphold on regular devices
- if (event.type === 'taphold' && !isMobile.phone && !isMobile.tablet)
+ if ( event.type === 'taphold' && !isMobile.phone && !isMobile.tablet )
+ {
return;
+ }
event.preventDefault();
event.stopPropagation();
-
+
// Get current taskbar position
const currentPosition = window.taskbar_position || 'bottom';
-
+
// Create base menu items
let menuItems = [];
-
+
// Only show position submenu on desktop devices
- if (!isMobile.phone && !isMobile.tablet) {
+ if ( !isMobile.phone && !isMobile.tablet ) {
menuItems.push({
html: i18n('desktop_position'),
items: [
{
html: i18n('desktop_position_left'),
checked: currentPosition === 'left',
- onClick: function() {
+ onClick: function () {
window.update_taskbar_position('left');
- }
+ },
},
{
html: i18n('desktop_position_bottom'),
checked: currentPosition === 'bottom',
- onClick: function() {
+ onClick: function () {
window.update_taskbar_position('bottom');
- }
+ },
},
{
html: i18n('desktop_position_right'),
checked: currentPosition === 'right',
- onClick: function() {
+ onClick: function () {
window.update_taskbar_position('right');
- }
- }
- ]
+ },
+ },
+ ],
});
menuItems.push('-'); // divider
}
-
+
// Add the "Show open windows" option for all devices
menuItems.push({
html: i18n('desktop_show_open_windows'),
onClick: function () {
- $(`.window`).showWindow();
- }
+ $('.window').showWindow();
+ },
});
-
+
// Add the "Show the desktop" option for all devices
menuItems.push({
html: i18n('desktop_show_desktop'),
onClick: function () {
- $(`.window`).hideWindow();
- }
+ $('.window').hideWindow();
+ },
});
-
+
UIContextMenu({
parent_element: $('.taskbar'),
- items: menuItems
+ items: menuItems,
});
return false;
});
@@ -1985,16 +2063,20 @@ $(document).on('contextmenu taphold', '.taskbar', function (event) {
// Toolbar context menu
$(document).on('contextmenu taphold', '.toolbar', function (event) {
// dismiss taphold on regular devices
- if (event.type === 'taphold' && !isMobile.phone && !isMobile.tablet)
+ if ( event.type === 'taphold' && !isMobile.phone && !isMobile.tablet )
+ {
return;
+ }
// Don't show context menu on mobile devices since toolbar auto-hide is disabled there
- if (isMobile.phone || isMobile.tablet)
+ if ( isMobile.phone || isMobile.tablet )
+ {
return;
+ }
event.preventDefault();
event.stopPropagation();
-
+
UIContextMenu({
parent_element: $('.toolbar'),
items: [
@@ -2006,26 +2088,26 @@ $(document).on('contextmenu taphold', '.toolbar', function (event) {
onClick: function () {
// Toggle the preference
window.toolbar_auto_hide_enabled = !window.toolbar_auto_hide_enabled;
-
+
// Save the preference
puter.kv.set('toolbar_auto_hide_enabled', window.toolbar_auto_hide_enabled.toString());
-
+
// If auto-hide was just disabled and toolbar is currently hidden, show it
- if (!window.toolbar_auto_hide_enabled && $('.toolbar').hasClass('toolbar-hidden')) {
+ if ( !window.toolbar_auto_hide_enabled && $('.toolbar').hasClass('toolbar-hidden') ) {
window.show_toolbar();
}
-
+
// Clear any pending hide timeout
- if (window.toolbarHideTimeout) {
+ if ( window.toolbarHideTimeout ) {
clearTimeout(window.toolbarHideTimeout);
window.toolbarHideTimeout = null;
}
// hide toolbar
window.hide_toolbar();
- }
- }
- ]
+ },
+ },
+ ],
});
return false;
});
@@ -2033,93 +2115,93 @@ $(document).on('contextmenu taphold', '.toolbar', function (event) {
$(document).on('click', '.qr-btn', async function (e) {
UIWindowQR({
message_i18n_key: 'scan_qr_c2a',
- text: window.gui_origin + '?auth_token=' + window.auth_token,
+ text: `${window.gui_origin }?auth_token=${ window.auth_token}`,
});
-})
+});
$(document).on('click', '.user-options-menu-btn', async function (e) {
const pos = this.getBoundingClientRect();
- if ($('.context-menu[data-id="user-options-menu"]').length > 0)
+ if ( $('.context-menu[data-id="user-options-menu"]').length > 0 )
+ {
return;
+ }
let items = [];
let parent_element = this;
//--------------------------------------------------
// Save Session
//--------------------------------------------------
- if (window.user.is_temp) {
- items.push(
- {
- html: i18n('save_session'),
- icon: `${i18n('confirm_open_apps_log_out')}
`,
buttons: [
@@ -2204,89 +2286,93 @@ $(document).on('click', '.user-options-menu-btn', async function (e) {
type: 'primary',
},
{
- label: i18n('cancel')
+ label: i18n('cancel'),
},
- ]
- })
- if (alert_resp === 'close_and_log_out')
+ ],
+ });
+ if ( alert_resp === 'close_and_log_out' )
+ {
window.logout();
+ }
}
// no open windows
else
+ {
window.logout();
- }
+ }
+ },
},
- ]
+ ],
});
-})
+});
$(document).on('click', '.fullscreen-btn', async function (e) {
- if (!window.is_fullscreen()) {
+ if ( ! window.is_fullscreen() ) {
var elem = document.documentElement;
- if (elem.requestFullscreen) {
+ if ( elem.requestFullscreen ) {
elem.requestFullscreen();
- } else if (elem.webkitRequestFullscreen) { /* Safari */
+ } else if ( elem.webkitRequestFullscreen ) { /* Safari */
elem.webkitRequestFullscreen();
- } else if (elem.mozRequestFullScreen) { /* moz */
+ } else if ( elem.mozRequestFullScreen ) { /* moz */
elem.mozRequestFullScreen();
- } else if (elem.msRequestFullscreen) { /* IE11 */
+ } else if ( elem.msRequestFullscreen ) { /* IE11 */
elem.msRequestFullscreen();
}
}
else {
- if (document.exitFullscreen) {
+ if ( document.exitFullscreen ) {
document.exitFullscreen();
- } else if (document.webkitExitFullscreen) {
+ } else if ( document.webkitExitFullscreen ) {
document.webkitExitFullscreen();
- } else if (document.mozCancelFullScreen) {
+ } else if ( document.mozCancelFullScreen ) {
document.mozCancelFullScreen();
- } else if (document.msExitFullscreen) {
+ } else if ( document.msExitFullscreen ) {
document.msExitFullscreen();
}
}
-})
+});
$(document).on('click', '.close-launch-popover', function () {
- $(".launch-popover").closest('.popover').fadeOut(200, function () {
- $(".launch-popover").closest('.popover').remove();
+ $('.launch-popover').closest('.popover').fadeOut(200, function () {
+ $('.launch-popover').closest('.popover').remove();
});
});
$(document).on('click', '.search-btn', function () {
UIWindowSearch();
-})
+});
$(document).on('click', '.toolbar-puter-logo', function () {
UIWindowSettings();
-})
+});
$(document).on('click', '.user-options-create-account-btn', async function (e) {
UIWindowSaveAccount({
send_confirmation_code: false,
default_username: window.user.username,
});
-})
+});
$(document).on('click', '.refer-btn', async function (e) {
UIWindowRefer();
-})
+});
$(document).on('click', '.start-app', async function (e) {
launch_app({
- name: $(this).attr('data-app-name')
- })
+ name: $(this).attr('data-app-name'),
+ });
// close popovers
- $(".popover").fadeOut(200, function () {
- $(".popover").remove();
+ $('.popover').fadeOut(200, function () {
+ $('.popover').remove();
});
- $(".context-menu").fadeOut(200, function(){
+ $('.context-menu').fadeOut(200, function () {
$(this).remove();
});
-})
+});
$(document).on('click', '.user-options-login-btn', async function (e) {
const alert_resp = await UIAlert({
- message: `Save session before exiting! You are in a temporary session and logging into another account will erase all data in your current session.
`,
+ message: 'Save session before exiting! You are in a temporary session and logging into another account will erase all data in your current session.
',
buttons: [
{
label: i18n('save_session'),
@@ -2298,28 +2384,30 @@ $(document).on('click', '.user-options-login-btn', async function (e) {
value: 'login',
},
{
- label: i18n('cancel')
+ label: i18n('cancel'),
},
- ]
- })
+ ],
+ });
- if (alert_resp === 'save-session') {
+ if ( alert_resp === 'save-session' ) {
let saved = await UIWindowSaveAccount({
send_confirmation_code: false,
});
- if (saved)
+ if ( saved )
+ {
UIWindowLogin({ show_signup_button: false, reload_on_success: true });
- } else if (alert_resp === 'login') {
+ }
+ } else if ( alert_resp === 'login' ) {
UIWindowLogin({
show_signup_button: false,
reload_on_success: true,
window_options: {
backdrop: true,
close_on_backdrop_click: false,
- }
+ },
});
}
-})
+});
$(document).on('click mousedown', '.launch-search, .launch-popover', function (e) {
$(this).focus();
@@ -2327,21 +2415,21 @@ $(document).on('click mousedown', '.launch-search, .launch-popover', function (e
e.preventDefault();
// don't let click bubble up to window
e.stopImmediatePropagation();
-})
+});
$(document).on('focus', '.launch-search', function (e) {
// remove all selected items in start menu
$('.launch-app-selected').removeClass('launch-app-selected');
// scroll popover to top
$('.launch-popover').scrollTop(0);
-})
+});
$(document).on('change keyup keypress keydown paste', '.launch-search', function (e) {
// search window.launch_apps.recommended for query
const query = $(this).val().toLowerCase();
- if (query === '') {
+ if ( query === '' ) {
$('.launch-search-clear').hide();
- $(`.start-app-card`).show();
+ $('.start-app-card').show();
$('.launch-apps-recent').show();
$('.start-section-heading').show();
} else {
@@ -2349,27 +2437,27 @@ $(document).on('change keyup keypress keydown paste', '.launch-search', function
$('.start-section-heading').hide();
$('.launch-search-clear').show();
window.launch_apps.recommended.forEach((app) => {
- if (app.title.toLowerCase().includes(query.toLowerCase())) {
+ if ( app.title.toLowerCase().includes(query.toLowerCase()) ) {
$(`.start-app-card[data-name="${app.name}"]`).show();
} else {
$(`.start-app-card[data-name="${app.name}"]`).hide();
}
- })
+ });
}
-})
+});
$(document).on('click', '.launch-search-clear', function (e) {
$('.launch-search').val('');
$('.launch-search').trigger('change');
$('.launch-search').focus();
-})
+});
document.addEventListener('fullscreenchange', (event) => {
// document.fullscreenElement will point to the element that
// is in fullscreen mode if there is one. If there isn't one,
// the value of the property is null.
- if (document.fullscreenElement) {
+ if ( document.fullscreenElement ) {
$('.fullscreen-btn').css('background-image', `url(${window.icons['shrink.svg']})`);
$('.fullscreen-btn').attr('title', i18n('desktop_exit_full_screen'));
window.user_preferences.clock_visible === 'auto' && $('#clock').show();
@@ -2378,82 +2466,84 @@ document.addEventListener('fullscreenchange', (event) => {
$('.fullscreen-btn').attr('title', i18n('desktop_enter_full_screen'));
window.user_preferences.clock_visible === 'auto' && $('#clock').hide();
}
-})
+});
window.set_desktop_background = function (options) {
- if (options.fit) {
+ if ( options.fit ) {
let fit = options.fit;
- if (fit === 'cover' || fit === 'contain') {
+ if ( fit === 'cover' || fit === 'contain' ) {
$('body').css('background-size', fit);
- $('body').css('background-repeat', `no-repeat`);
- $('body').css('background-position', `center center`);
+ $('body').css('background-repeat', 'no-repeat');
+ $('body').css('background-position', 'center center');
}
- else if (fit === 'center') {
+ else if ( fit === 'center' ) {
$('body').css('background-size', 'auto');
- $('body').css('background-repeat', `no-repeat`);
- $('body').css('background-position', `center center`);
+ $('body').css('background-repeat', 'no-repeat');
+ $('body').css('background-position', 'center center');
}
- else if (fit === 'repeat') {
- $('body').css('background-size', `auto`);
- $('body').css('background-repeat', `repeat`);
+ else if ( fit === 'repeat' ) {
+ $('body').css('background-size', 'auto');
+ $('body').css('background-repeat', 'repeat');
}
window.desktop_bg_fit = fit;
}
- if (options.url) {
+ if ( options.url ) {
$('body').css('background-image', `url(${options.url})`);
window.desktop_bg_url = options.url;
window.desktop_bg_color = undefined;
}
- else if (options.color) {
+ else if ( options.color ) {
$('body').css({
- 'background-image': `none`,
+ 'background-image': 'none',
'background-color': options.color,
});
window.desktop_bg_color = options.color;
window.desktop_bg_url = undefined;
}
-}
+};
window.update_taskbar = function () {
- let items = []
+ let items = [];
$('.taskbar-item-sortable[data-keep-in-taskbar="true"]').each(function (index) {
items.push({
name: $(this).attr('data-app'),
type: 'app',
- })
- })
+ });
+ });
// update taskbar in the server-side
$.ajax({
- url: window.api_origin + "/update-taskbar-items",
+ url: `${window.api_origin }/update-taskbar-items`,
type: 'POST',
data: JSON.stringify({
items: items,
}),
async: true,
- contentType: "application/json",
+ contentType: 'application/json',
headers: {
- "Authorization": "Bearer " + window.auth_token
+ 'Authorization': `Bearer ${ window.auth_token}`,
},
- })
-}
+ });
+};
window.remove_taskbar_item = function (item) {
- $(item).find('*').fadeOut(100, function () { });
+ $(item).find('*').fadeOut(100, function () {
+
+ });
$(item).animate({ width: 0 }, 200, function () {
$(item).remove();
-
+
// Adjust taskbar item sizes after removing an item
- if (window.adjust_taskbar_item_sizes) {
+ if ( window.adjust_taskbar_item_sizes ) {
setTimeout(() => {
window.adjust_taskbar_item_sizes();
}, 10);
}
- })
-}
+ });
+};
window.enter_fullpage_mode = (el_window) => {
$('.taskbar').hide();
@@ -2462,11 +2552,11 @@ window.enter_fullpage_mode = (el_window) => {
$(el_window).css({
width: '100%',
height: '100%',
- top: window.toolbar_height + 'px',
+ top: `${window.toolbar_height }px`,
left: 0,
'border-radius': 0,
});
-}
+};
window.exit_fullpage_mode = (el_window) => {
$('body').removeClass('fullpage-mode');
@@ -2475,8 +2565,8 @@ window.exit_fullpage_mode = (el_window) => {
$('.taskbar').show();
refresh_item_container($('.desktop.item-container'), { fadeInItems: true });
$(el_window).removeAttr('data-is_fullpage');
- if (el_window) {
- window.reset_window_size_and_position(el_window)
+ if ( el_window ) {
+ window.reset_window_size_and_position(el_window);
$(el_window).find('.window-head').show();
}
@@ -2488,7 +2578,7 @@ window.exit_fullpage_mode = (el_window) => {
// refresh desktop background
window.refresh_desktop_background();
-}
+};
window.reset_window_size_and_position = (el_window) => {
$(el_window).css({
@@ -2498,7 +2588,7 @@ window.reset_window_size_and_position = (el_window) => {
top: 'calc(50% - 190px)',
left: 'calc(50% - 340px)',
});
-}
+};
// Modify the hide/show functions to use CSS rules that will apply to all icons, including future ones
window.hideDesktopIcons = function () {
@@ -2513,7 +2603,7 @@ window.showDesktopIcons = function () {
window.toggleDesktopIcons = function () {
window.desktop_icons_hidden = !window.desktop_icons_hidden;
- if (window.desktop_icons_hidden) {
+ if ( window.desktop_icons_hidden ) {
hideDesktopIcons();
} else {
showDesktopIcons();
diff --git a/src/gui/src/UI/UIElement.js b/src/gui/src/UI/UIElement.js
index 198cb3a799..d17187e120 100644
--- a/src/gui/src/UI/UIElement.js
+++ b/src/gui/src/UI/UIElement.js
@@ -1,25 +1,25 @@
/*
* Copyright (C) 2024-present Puter Technologies Inc.
- *
+ *
* This file is part of Puter.
- *
+ *
* Puter is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- // spinner
- h += `
`;
- h += `
`;
- // modified
- h += `
`;
- h += `${options.modified === 0 ? '-' : timeago.format(options.modified*1000)} `;
- h += `
`;
- // size
- h += `
`;
- h += `${options.size ? window.byte_format(options.size) : '-'} `;
- h += `
`;
- // type
- h += `
`;
- if(options.is_dir)
- h += `${i18n('folder')} `;
- else
- h += `${options.type ? html_encode(options.type) : '-'} `;
- h += `
`;
-
-
- // icon
- h += `
`;
- h += `
`;
- h += `
`;
- // badges
- h += `
`;
- // website badge
- h += `
${options.modified === 0 ? '-' : timeago.format(options.modified * 1000)}`;
+ h += '
';
+ // size
+ h += '
';
+ h += `${options.size ? window.byte_format(options.size) : '-'} `;
+ h += '
';
+ // type
+ h += '
';
+ if ( options.is_dir )
+ {
+ h += `${i18n('folder')} `;
+ }
+ else
+ {
+ h += `${options.type ? html_encode(options.type) : '-'} `;
+ }
+ h += '
';
+
+ // icon
+ h += '
';
+ h += `
`;
+ h += '
';
+ // badges
+ h += '
';
+ // website badge
+ h += `
`;
- // link badge
- h += `
`;
- // shared badge
- h += `
`;
- // owner-shared badge
- h += `
`;
- // shortcut badge
- h += `
`;
- h += `
`;
-
- // divider
- h += `
`;
- // name
- let display_name = options.name;
- // Use i18n for system directories
- if (options.is_trash) {
- display_name = i18n('trash');
- } else if (options.path === window.desktop_path) {
- display_name = i18n('desktop');
- } else if (options.path === window.home_path) {
- display_name = i18n('home');
- } else if (options.path === window.docs_path || options.path === window.documents_path) {
- display_name = i18n('documents');
- } else if (options.path === window.pictures_path) {
- display_name = i18n('pictures');
- } else if (options.path === window.videos_path) {
- display_name = i18n('videos');
- } else if (options.path === window.public_path) {
- display_name = i18n('public');
- } else {
- display_name = html_encode(truncate_filename(options.name));
- }
- h += `
${display_name} `
- // name editor
- h += `
`
- h += `
';
+ // name
+ let display_name = options.name;
+ // Use i18n for system directories
+ if ( options.is_trash ) {
+ display_name = i18n('trash');
+ } else if ( options.path === window.desktop_path ) {
+ display_name = i18n('desktop');
+ } else if ( options.path === window.home_path ) {
+ display_name = i18n('home');
+ } else if ( options.path === window.docs_path || options.path === window.documents_path ) {
+ display_name = i18n('documents');
+ } else if ( options.path === window.pictures_path ) {
+ display_name = i18n('pictures');
+ } else if ( options.path === window.videos_path ) {
+ display_name = i18n('videos');
+ } else if ( options.path === window.public_path ) {
+ display_name = i18n('public');
+ } else {
+ display_name = html_encode(truncate_filename(options.name));
+ }
+ h += `${display_name} `;
+ // name editor
+ h += ``;
+ h += '';
// append to options.appendTo
$(options.appendTo).append(h);
@@ -202,33 +207,35 @@ function UIItem(options){
const el_item_name = document.querySelector(`#item-${item_id} > .item-name`);
const el_item_icon = document.querySelector(`#item-${item_id} .item-icon`);
const el_item_name_editor = document.querySelector(`#item-${item_id} > .item-name-editor`);
- const is_trashed = ($(el_item).attr('data-path') || '').startsWith(window.trash_path + '/');
+ const is_trashed = ($(el_item).attr('data-path') || '').startsWith(`${window.trash_path }/`);
// update parent window's explorer item count if applicable
- if(options.appendTo !== undefined){
+ if ( options.appendTo !== undefined ) {
let el_window = options.appendTo;
- if(!$(el_window).hasClass('.window'))
+ if ( ! $(el_window).hasClass('.window') )
+ {
el_window = $(el_window).closest('.window');
+ }
window.update_explorer_footer_item_count(el_window);
}
// manual positioning
- if( !window.is_auto_arrange_enabled &&
- options.position &&
+ if ( !window.is_auto_arrange_enabled &&
+ options.position &&
// item is on the desktop (must be desktop itself and not a window, hence the '.desktop' class check)
$(el_item).closest('.item-container.desktop').attr('data-path') === window.desktop_path
- ){
+ ) {
el_item.style.position = 'absolute';
- el_item.style.left = options.position.left + 'px';
- el_item.style.top = options.position.top + 'px';
+ el_item.style.left = `${options.position.left }px`;
+ el_item.style.top = `${options.position.top }px`;
}
// --------------------------------------------------------
// Dragster
// allow dragging of local files on this window, if it's is_dir
// --------------------------------------------------------
- if(options.is_dir){
+ if ( options.is_dir ) {
$(el_item).dragster({
enter: function () {
$(el_item).not('.item-disabled').addClass('item-selected');
@@ -237,17 +244,17 @@ function UIItem(options){
$(el_item).removeClass('item-selected');
},
drop: function (dragsterEvent, event) {
- const e = event.originalEvent;
+ const e = event.originalEvent;
$(el_item).removeClass('item-selected');
// if files were dropped...
- if(e.dataTransfer?.items?.length > 0){
- window.upload_items( e.dataTransfer.items, $(el_item).attr('data-path'))
+ if ( e.dataTransfer?.items?.length > 0 ) {
+ window.upload_items(e.dataTransfer.items, $(el_item).attr('data-path'));
}
e.stopPropagation();
e.preventDefault();
return false;
- }
+ },
});
}
@@ -258,15 +265,15 @@ function UIItem(options){
let last_window_dragged_over;
$(el_item).draggable({
- appendTo: "body",
- helper: "clone",
- revert: "invalid",
+ appendTo: 'body',
+ helper: 'clone',
+ revert: 'invalid',
//containment: "document",
zIndex: 10000,
- scroll:false,
+ scroll: false,
distance: 5,
revertDuration: 100,
- start: function(event, ui) {
+ start: function (event, ui) {
// select this item and its helper
$(el_item).addClass('item-selected');
$('.ui-draggable-dragging').addClass('item-selected');
@@ -284,19 +291,19 @@ function UIItem(options){
// count badge
const item_count = $('.item-selected-clone').length;
- if(item_count > 0){
+ if ( item_count > 0 ) {
$('body').append(`${item_count + 1} `);
}
// Disable all droppable UIItems that are not a dir/app to avoid accidental cancellation
// on Items that are not droppables. In general if an item is dropped on another, if the
// target is not a dir, the source needs to be dropped on the target's container.
- $(`.item[data-is_dir="0"][data-associated_app_name=""]:not(.item-selected)`).droppable('disable');
+ $('.item[data-is_dir="0"][data-associated_app_name=""]:not(.item-selected)').droppable('disable');
// Disable pointer events on all app iframes. This is needed because as soon as
// a dragging event enters the iframe the event is delegated to iframe which makes the item
// stuck at the edge of the iframe not allowing us to move items freely across the screen
- $('.window-app-iframe').css('pointer-events', 'none')
+ $('.window-app-iframe').css('pointer-events', 'none');
// reset longer hover timeout and last window dragged over
longer_hover_timeout = null;
@@ -305,26 +312,26 @@ function UIItem(options){
window.an_item_is_being_dragged = true;
$('.toolbar').css('pointer-events', 'none');
},
- drag: function(event, ui) {
+ drag: function (event, ui) {
// Constrain item within desktop bounds
const minLeft = -50;
const maxLeft = window.desktop_width - 50;
const minTop = window.toolbar_height;
const maxTop = window.desktop_height + window.toolbar_height;
-
+
// Apply constraints to ui.position
ui.position.left = Math.max(minLeft, Math.min(maxLeft, ui.position.left));
ui.position.top = Math.max(minTop, Math.min(maxTop, ui.position.top));
-
+
// Only show drag helpers if the item has been moved more than 5px
- if( Math.abs(ui.originalPosition.top - ui.offset.top) > 5
+ if ( Math.abs(ui.originalPosition.top - ui.offset.top) > 5
||
- Math.abs(ui.originalPosition.left - ui.offset.left) > 5 ){
+ Math.abs(ui.originalPosition.left - ui.offset.left) > 5 ) {
$('.ui-draggable-dragging').show();
$('.item-selected-clone').show();
$('.draggable-count-badge').show();
- }
-
+ }
+
const other_selected_items = $('.item-selected-clone');
const item_count = other_selected_items.length + 1;
@@ -332,81 +339,81 @@ function UIItem(options){
$('.draggable-count-badge').css({
top: event.pageY,
left: event.pageX + 10,
- })
+ });
// Move other selected items
- for(let i=0; i < item_count - 1; i++){
+ for ( let i = 0; i < item_count - 1; i++ ) {
// Apply same constraints to cloned items with their offset
- const cloneLeft = Math.max(minLeft, Math.min(maxLeft, ui.position.left + 3 * (i+1)));
- const cloneTop = Math.max(minTop, Math.min(maxTop, ui.position.top + 3 * (i+1)));
-
+ const cloneLeft = Math.max(minLeft, Math.min(maxLeft, ui.position.left + 3 * (i + 1)));
+ const cloneTop = Math.max(minTop, Math.min(maxTop, ui.position.top + 3 * (i + 1)));
+
$(other_selected_items[i]).css({
'left': cloneLeft,
'top': cloneTop,
'z-index': 999 - (i),
- 'opacity': 0.5 - i*0.1,
- })
+ 'opacity': 0.5 - i * 0.1,
+ });
}
// remove all item-container active borders
$('.item-container').removeClass('item-container-active');
// if item has changed container, remove timeout for window focus and reset last target
- if(longer_hover_timeout && last_window_dragged_over !== window.mouseover_window){
+ if ( longer_hover_timeout && last_window_dragged_over !== window.mouseover_window ) {
clearTimeout(longer_hover_timeout);
longer_hover_timeout = null;
last_window_dragged_over = window.mouseover_window;
}
// if item hover for more than 1.2s, focus the window
- if(!longer_hover_timeout){
+ if ( ! longer_hover_timeout ) {
longer_hover_timeout = setTimeout(() => {
$(last_window_dragged_over).focusWindow();
}, 1200);
}
// Highlight item container to help user see more clearly where the item is going to be dropped
- if($(window.mouseover_item_container).closest('.window').is(window.mouseover_window) &&
+ if ( $(window.mouseover_item_container).closest('.window').is(window.mouseover_window) &&
// do not highlight if the target is the same as the item being moved
$(el_item).attr('data-path') !== $(window.mouseover_item_container).attr('data-path') &&
// do not highlight if item is being moved to where it already is
- $(el_item).attr('data-path') !== $(window.mouseover_item_container).attr('data-path')){
+ $(el_item).attr('data-path') !== $(window.mouseover_item_container).attr('data-path') ) {
// highlight item container
$(window.mouseover_item_container).addClass('item-container-active');
}
// send drag event to iframe if mouse is inside iframe
- if(window.mouseover_window){
+ if ( window.mouseover_window ) {
const $app_iframe = $(window.mouseover_window).find('.window-app-iframe');
- if(!$(window.mouseover_window).hasClass('window-disabled') && $app_iframe.length > 0){
+ if ( !$(window.mouseover_window).hasClass('window-disabled') && $app_iframe.length > 0 ) {
var rect = $app_iframe.get(0).getBoundingClientRect();
// if mouse is inside iframe, send drag message to iframe
- if(window.mouseX > rect.left && window.mouseX < rect.right && window.mouseY > rect.top && window.mouseY < rect.bottom){
- $app_iframe.get(0).contentWindow.postMessage({msg: "drag", x: (window.mouseX - rect.left), y: (window.mouseY - rect.top)}, '*');
+ if ( window.mouseX > rect.left && window.mouseX < rect.right && window.mouseY > rect.top && window.mouseY < rect.bottom ) {
+ $app_iframe.get(0).contentWindow.postMessage({ msg: 'drag', x: (window.mouseX - rect.left), y: (window.mouseY - rect.top) }, '*');
}
}
}
},
- stop: function(event, ui){
+ stop: function (event, ui) {
// Allow rearranging only if item is on desktop, not trash container, auto arrange is disabled and item is not dropped into another item
- if($(el_item).closest('.item-container').attr('data-path') === window.desktop_path &&
+ if ( $(el_item).closest('.item-container').attr('data-path') === window.desktop_path &&
!window.is_auto_arrange_enabled && $(el_item).attr('data-path') !== window.trash_path && !ui.helper.data('dropped') &&
// Item must be dropped on the Desktop and not on the taskbar
- window.mouseover_window === undefined && ui.position.top <= window.desktop_height - window.taskbar_height - 15){
-
+ window.mouseover_window === undefined && ui.position.top <= window.desktop_height - window.taskbar_height - 15 ) {
+
el_item.style.position = 'absolute';
- el_item.style.left = ui.position.left + 'px';
- el_item.style.top = ui.position.top + 'px';
+ el_item.style.left = `${ui.position.left }px`;
+ el_item.style.top = `${ui.position.top }px`;
$('.ui-draggable-dragging').remove();
window.desktop_item_positions[$(el_item).attr('data-uid')] = ui.position;
- window.save_desktop_item_positions()
+ window.save_desktop_item_positions();
}
$('.item-selected-clone').remove();
$('.draggable-count-badge').remove();
// re-enable all droppable UIItems that are not a dir
- $(`.item[data-is_dir='0']:not(.item-selected)`).droppable('enable');
+ $('.item[data-is_dir=\'0\']:not(.item-selected)').droppable('enable');
// remove active item-container border highlights
$('.item-container').removeClass('item-container-active');
// reset longer hover timeout and last window dragged over
@@ -414,7 +421,7 @@ function UIItem(options){
last_window_dragged_over = null;
window.an_item_is_being_dragged = false;
$('.toolbar').css('pointer-events', 'auto');
- }
+ },
});
// --------------------------------------------------------
@@ -424,54 +431,60 @@ function UIItem(options){
accept: '.item',
// 'pointer' is very important because of active window tracking is based on the position of cursor.
tolerance: 'pointer',
- drop: async function( event, ui ) {
+ drop: async function ( event, ui ) {
// Check if hovering over an item that is VISIBILE
- if($(event.target).closest('.window').attr('data-id') !== $(window.mouseover_window).attr('data-id'))
+ if ( $(event.target).closest('.window').attr('data-id') !== $(window.mouseover_window).attr('data-id') )
+ {
return;
+ }
// If ctrl is pressed and source is Trashed, cancel whole operation
- if(event.ctrlKey && path.dirname($(ui.draggable).attr('data-path')) === window.trash_path)
+ if ( event.ctrlKey && path.dirname($(ui.draggable).attr('data-path')) === window.trash_path )
+ {
return;
+ }
// Adding a flag to know whether item is rearraged or dropped
ui.helper.data('dropped', true);
- const items_to_move = []
-
+ const items_to_move = [];
+
// First item
- items_to_move.push(ui.draggable);
-
+ items_to_move.push(ui.draggable);
+
// All subsequent items
const cloned_items = document.getElementsByClassName('item-selected-clone');
- for(let i =0; i {
- window.create_shortcut(
- path.basename($(item_to_move).attr('data-path')),
- $(item_to_move).attr('data-is_dir') === '1',
- options.is_dir ? $(el_item).attr('data-path') : path.dirname($(el_item).attr('data-path')),
- null,
- $(item_to_move).attr('data-shortcut_to') === '' ? $(item_to_move).attr('data-uid') : $(item_to_move).attr('data-shortcut_to'),
- $(item_to_move).attr('data-shortcut_to_path') === '' ? $(item_to_move).attr('data-path') : $(item_to_move).attr('data-shortcut_to_path'),
- );
+ window.create_shortcut(path.basename($(item_to_move).attr('data-path')),
+ $(item_to_move).attr('data-is_dir') === '1',
+ options.is_dir ? $(el_item).attr('data-path') : path.dirname($(el_item).attr('data-path')),
+ null,
+ $(item_to_move).attr('data-shortcut_to') === '' ? $(item_to_move).attr('data-uid') : $(item_to_move).attr('data-shortcut_to'),
+ $(item_to_move).attr('data-shortcut_to_path') === '' ? $(item_to_move).attr('data-path') : $(item_to_move).attr('data-shortcut_to_path'));
});
}
// Otherwise, move items
- else if(options.is_dir){
- if($(el_item).closest('.item-container').attr('data-path') === window.desktop_path){
+ else if ( options.is_dir ) {
+ if ( $(el_item).closest('.item-container').attr('data-path') === window.desktop_path ) {
delete window.desktop_item_positions[$(el_item).attr('data-uid')];
- window.save_desktop_item_positions()
+ window.save_desktop_item_positions();
}
window.move_items(items_to_move, $(el_item).attr('data-shortcut_to_path') !== '' ? $(el_item).attr('data-shortcut_to_path') : $(el_item).attr('data-path'));
}
}
// Re-enable droppable on all 'item-container's
- $('.item-container').droppable('enable')
+ $('.item-container').droppable('enable');
return false;
},
- over: function(event, ui){
+ over: function (event, ui) {
// Check hovering over an item that is VISIBILE
- const $event_parent_win = $(event.target).closest('.window')
- if( $event_parent_win.length > 0 && $event_parent_win.attr('data-id') !== $(window.mouseover_window).attr('data-id'))
+ const $event_parent_win = $(event.target).closest('.window');
+ if ( $event_parent_win.length > 0 && $event_parent_win.attr('data-id') !== $(window.mouseover_window).attr('data-id') )
+ {
return;
+ }
// Don't do anything if the dragged item is NOT a UIItem
- if(!$(ui.draggable).hasClass('item'))
+ if ( ! $(ui.draggable).hasClass('item') )
+ {
return;
+ }
// If this is a directory or an app, and an item was dragged over it, highlight it.
- if(options.is_dir || options.associated_app_name){
+ if ( options.is_dir || options.associated_app_name ) {
$(el_item).addClass('item-selected');
- $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 0.1)
+ $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 0.1);
// remove all item-container active borders
- $('.item-container').addClass('item-container-transparent-border')
+ $('.item-container').addClass('item-container-transparent-border');
}
- // Disable all window bodies
- $('.item-container').droppable( 'disable' )
+ // Disable all window bodies
+ $('.item-container').droppable( 'disable');
},
- out: function(event, ui){
+ out: function (event, ui) {
// Don't do anything if the dragged item is NOT a UIItem
- if(!$(ui.draggable).hasClass('item'))
+ if ( ! $(ui.draggable).hasClass('item') )
+ {
return;
+ }
// Unselect directory/app if item is dragged out
- if(options.is_dir || options.associated_app_name){
+ if ( options.is_dir || options.associated_app_name ) {
$(el_item).removeClass('item-selected');
- $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 'initial')
- $('.item-container').removeClass('item-container-transparent-border')
+ $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 'initial');
+ $('.item-container').removeClass('item-container-transparent-border');
}
- $('.item-container').droppable( 'enable' )
- }
+ $('.item-container').droppable( 'enable');
+ },
});
// --------------------------------------------------------
// Double Click/Single Tap on Item
// --------------------------------------------------------
- if(isMobile.phone || isMobile.tablet){
+ if ( isMobile.phone || isMobile.tablet ) {
$(el_item).on('click', async function (e) {
// if item is disabled, do not allow any action
- if($(el_item).hasClass('item-disabled'))
+ if ( $(el_item).hasClass('item-disabled') )
+ {
return false;
+ }
- if($(e.target).hasClass('item-name-editor'))
+ if ( $(e.target).hasClass('item-name-editor') )
+ {
return false;
-
+ }
+
open_item({
- item: el_item,
+ item: el_item,
maximized: true,
});
});
-
- }else{
+
+ } else {
$(el_item).on('dblclick', async function (e) {
// if item is disabled, do not allow any action
- if($(el_item).hasClass('item-disabled'))
+ if ( $(el_item).hasClass('item-disabled') )
+ {
return false;
+ }
- if($(e.target).hasClass('item-name-editor'))
+ if ( $(e.target).hasClass('item-name-editor') )
+ {
return false;
-
+ }
+
open_item({
- item: el_item,
+ item: el_item,
new_window: e.metaKey || e.ctrlKey,
});
});
}
-
+
// --------------------------------------------------------
// Mousedown
// --------------------------------------------------------
$(el_item).on('mousedown', function (e) {
// if item is disabled, do not allow any action
- if($(el_item).hasClass('item-disabled'))
+ if ( $(el_item).hasClass('item-disabled') )
+ {
return false;
-
+ }
+
// if link badge is clicked, don't continue
- if($(e.target).hasClass('item-has-website-url-badge'))
+ if ( $(e.target).hasClass('item-has-website-url-badge') )
+ {
return false;
+ }
// get the parent window
const $el_parent_window = $(el_item).closest('.window');
// first see if this is a ContextMenu call on multiple items
- if(e.which === 3 && $(el_item).hasClass('item-selected') && $(el_item).siblings('.item-selected').length > 0){
- $(".context-menu").remove();
+ if ( e.which === 3 && $(el_item).hasClass('item-selected') && $(el_item).siblings('.item-selected').length > 0 ) {
+ $('.context-menu').remove();
return false;
}
// unselect other items if neither CTRL nor Command key are held
// or
// if parent is not multiselectable
- if((!e.ctrlKey && !e.metaKey && !$(this).hasClass('item-selected')) || ($el_parent_window.length>0 && $el_parent_window.attr('data-multiselectable') !== 'true')){
+ if ( (!e.ctrlKey && !e.metaKey && !$(this).hasClass('item-selected')) || ($el_parent_window.length > 0 && $el_parent_window.attr('data-multiselectable') !== 'true') ) {
$(this).closest('.item-container').find('.item-selected').removeClass('item-selected');
}
- if((e.ctrlKey || e.metaKey) && $(this).hasClass('item-selected')){
- $(this).removeClass('item-selected')
+ if ( (e.ctrlKey || e.metaKey) && $(this).hasClass('item-selected') ) {
+ $(this).removeClass('item-selected');
}
- else{
- $(this).addClass('item-selected')
+ else {
+ $(this).addClass('item-selected');
}
- window.update_explorer_footer_selected_items_count($el_parent_window)
+ window.update_explorer_footer_selected_items_count($el_parent_window);
});
// --------------------------------------------------------
// Click
// --------------------------------------------------------
$(el_item).on('click', function (e) {
// if item is disabled, do not allow any action
- if($(el_item).hasClass('item-disabled'))
+ if ( $(el_item).hasClass('item-disabled') )
+ {
return false;
+ }
skip_a_rename_click = false;
const $el_parent_window = $(el_item).closest('.window');
-
+
// do not unselect other items if:
// CTRL/Command key is pressed or clicking an item that is already selected
- if(!e.ctrlKey && !e.metaKey){
+ if ( !e.ctrlKey && !e.metaKey ) {
$(this).closest('.item-container').find('.item-selected').not(this).removeClass('item-selected');
- window.update_explorer_footer_selected_items_count($el_parent_window)
+ window.update_explorer_footer_selected_items_count($el_parent_window);
}
//----------------------------------------------------------------
// On an OpenFileDialog?
//----------------------------------------------------------------
- if($el_parent_window.attr('data-is_openFileDialog') === 'true'){
- if(!options.is_dir)
+ if ( $el_parent_window.attr('data-is_openFileDialog') === 'true' ) {
+ if ( ! options.is_dir )
+ {
$el_parent_window.find('.openfiledialog-open-btn').removeClass('disabled');
+ }
else
+ {
$el_parent_window.find('.openfiledialog-open-btn').addClass('disabled');
+ }
}
//----------------------------------------------------------------
// On a SaveFileDialog?
//----------------------------------------------------------------
- if($el_parent_window.attr('data-is_saveFileDialog') === 'true' && !options.is_dir){
+ if ( $el_parent_window.attr('data-is_saveFileDialog') === 'true' && !options.is_dir ) {
$el_parent_window.find('.savefiledialog-filename').val($(el_item).attr('data-name'));
$el_parent_window.find('.savefiledialog-save-btn').removeClass('disabled');
}
});
- $(document).on('click', function(e){
- if(!$(e.target).hasClass('item') && !$(e.target).hasClass('item-name') && !$(e.target).hasClass('item-icon')){
+ $(document).on('click', function (e) {
+ if ( !$(e.target).hasClass('item') && !$(e.target).hasClass('item-name') && !$(e.target).hasClass('item-icon') ) {
skip_a_rename_click = true;
}
- if($(e.target).parents('.item').data('id') !== item_id){
+ if ( $(e.target).parents('.item').data('id') !== item_id ) {
skip_a_rename_click = true;
}
- })
+ });
// --------------------------------------------------------
// Rename
// --------------------------------------------------------
- function rename(){
- if(rename_cancelled){
+ function rename () {
+ if ( rename_cancelled ) {
rename_cancelled = false;
return;
}
@@ -684,15 +725,15 @@ function UIItem(options){
const new_name = $(el_item_name_editor).val();
// Don't send a rename request if:
- // the new name is the same as the old one,
+ // the new name is the same as the old one,
// or it's empty,
// or editable was not even active at all
- if(old_name === new_name || !new_name || new_name === '.' || new_name === '..' || !$(el_item_name_editor).hasClass('item-name-editor-active')){
- if(new_name === '.'){
- UIAlert(`The name "." is not allowed, because it is a reserved name. Please choose another name.`);
+ if ( old_name === new_name || !new_name || new_name === '.' || new_name === '..' || !$(el_item_name_editor).hasClass('item-name-editor-active') ) {
+ if ( new_name === '.' ) {
+ UIAlert('The name "." is not allowed, because it is a reserved name. Please choose another name.');
}
- else if(new_name === '..'){
- UIAlert(`The name ".." is not allowed, because it is a reserved name. Please choose another name.`)
+ else if ( new_name === '..' ) {
+ UIAlert('The name ".." is not allowed, because it is a reserved name. Please choose another name.');
}
$(el_item_name).html(html_encode(truncate_filename(options.name)));
@@ -707,17 +748,19 @@ function UIItem(options){
// Perform rename request
window.rename_file(options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url);
}
-
+
// --------------------------------------------------------
// Rename if enter pressed on Item Name Editor
// --------------------------------------------------------
- $(el_item_name_editor).on('keypress',function(e) {
+ $(el_item_name_editor).on('keypress', function (e) {
// If name editor is not active don't continue
- if(!$(el_item_name_editor).is(":visible"))
+ if ( ! $(el_item_name_editor).is(':visible') )
+ {
return;
+ }
// Enter key = rename
- if(e.which === 13) {
+ if ( e.which === 13 ) {
e.stopPropagation();
e.preventDefault();
$(el_item_name_editor).blur();
@@ -726,17 +769,19 @@ function UIItem(options){
window.update_explorer_footer_selected_items_count($(el_item).closest('.item-container'));
return false;
}
- })
+ });
// --------------------------------------------------------
// Cancel and undo if escape pressed on Item Name Editor
// --------------------------------------------------------
- $(el_item_name_editor).on('keyup',function(e) {
- if(!$(el_item_name_editor).is(":visible"))
+ $(el_item_name_editor).on('keyup', function (e) {
+ if ( ! $(el_item_name_editor).is(':visible') )
+ {
return;
+ }
// Escape = undo rename
- else if(e.which === 27){
+ else if ( e.which === 27 ) {
e.stopPropagation();
e.preventDefault();
rename_cancelled = true;
@@ -746,7 +791,7 @@ function UIItem(options){
}
});
- $(el_item_name_editor).on('focusout',function(e) {
+ $(el_item_name_editor).on('focusout', function (e) {
e.stopPropagation();
e.preventDefault();
rename();
@@ -756,45 +801,55 @@ function UIItem(options){
* Takes care of 'click to edit item name'
************************************************/
let skip_a_rename_click = true;
- $(el_item_name).on('click', function(e){
- if( !skip_a_rename_click && e.which !== 3 && $(el_item_name).parent('.item-selected').length > 0){
- last_mousedown_ts = Date.now();
+ $(el_item_name).on('click', function (e) {
+ if ( !skip_a_rename_click && e.which !== 3 && $(el_item_name).parent('.item-selected').length > 0 ) {
+ last_mousedown_ts = Date.now();
setTimeout(() => {
- if(!skip_a_rename_click && (Date.now() - last_mousedown_ts) > 400){
- if (!e.ctrlKey && !e.metaKey)
- window.activate_item_name_editor(el_item)
- last_mousedown_ts = 0
- }else{
+ if ( !skip_a_rename_click && (Date.now() - last_mousedown_ts) > 400 ) {
+ if ( !e.ctrlKey && !e.metaKey )
+ {
+ window.activate_item_name_editor(el_item);
+ }
+ last_mousedown_ts = 0;
+ } else {
last_mousedown_ts = Date.now() + 500;
- skip_a_rename_click= false;
+ skip_a_rename_click = false;
}
}, 500);
}
skip_a_rename_click = false;
- })
- $(el_item_name).on('dblclick', function(e){
+ });
+ $(el_item_name).on('dblclick', function (e) {
skip_a_rename_click = true;
- })
+ });
// --------------------------------------------------------
// ContextMenu
// --------------------------------------------------------
- $(el_item).bind("contextmenu taphold", async function (event) {
+ $(el_item).bind('contextmenu taphold', async function (event) {
// if item is disabled, do not allow any action
- if($(el_item).hasClass('item-disabled'))
+ if ( $(el_item).hasClass('item-disabled') )
+ {
return false;
+ }
// if on website link badge, don't continue
- if($(event.target).hasClass('item-has-website-url-badge'))
+ if ( $(event.target).hasClass('item-has-website-url-badge') )
+ {
return false;
+ }
// dimiss taphold on regular devices
- if(event.type==='taphold' && !isMobile.phone && !isMobile.tablet)
+ if ( event.type === 'taphold' && !isMobile.phone && !isMobile.tablet )
+ {
return;
+ }
// if editing item name, preserve native context menu
- if(event.target === el_item_name_editor)
+ if ( event.target === el_item_name_editor )
+ {
return;
+ }
event.preventDefault();
let menu_items;
@@ -802,53 +857,57 @@ function UIItem(options){
// -------------------------------------------------------
// Multiple items selected
// -------------------------------------------------------
- if($selected_items.length > 1){
- const are_trashed = ($selected_items.attr('data-path') || '').startsWith(window.trash_path + '/');
- menu_items = []
+ if ( $selected_items.length > 1 ) {
+ const are_trashed = ($selected_items.attr('data-path') || '').startsWith(`${window.trash_path }/`);
+ menu_items = [];
// -------------------------------------------
// Restore
// -------------------------------------------
- if(are_trashed){
+ if ( are_trashed ) {
menu_items.push({
html: i18n('restore'),
- onClick: function(){
- $selected_items.each(function() {
+ onClick: function () {
+ $selected_items.each(function () {
const ell = this;
- let metadata = $(ell).attr('data-metadata') === '' ? {} : JSON.parse($(ell).attr('data-metadata'))
+ let metadata = $(ell).attr('data-metadata') === '' ? {} : JSON.parse($(ell).attr('data-metadata'));
window.move_items([ell], path.dirname(metadata.original_path));
- })
- }
+ });
+ },
});
// -------------------------------------------
// -
// -------------------------------------------
menu_items.push('-');
}
- if(!are_trashed){
+ if ( ! are_trashed ) {
menu_items.push({
html: i18n('Share With…'),
- onClick: async function(){
- if(window.user.is_temp &&
+ onClick: async function () {
+ if ( window.user.is_temp &&
!await UIWindowSaveAccount({
send_confirmation_code: true,
message: 'Please create an account to proceed.',
window_options: {
backdrop: true,
close_on_backdrop_click: false,
- }
- }))
+ },
+ }) )
+ {
return;
- else if(!window.user.email_confirmed && !await UIWindowEmailConfirmationRequired())
+ }
+ else if ( !window.user.email_confirmed && !await UIWindowEmailConfirmationRequired() )
+ {
return;
+ }
let items = [];
- $selected_items.each(function() {
+ $selected_items.each(function () {
const ell = this;
- items.push({uid: $(ell).attr('data-uid'), path: $(ell).attr('data-path'), icon: $(ell).find('.item-icon img').attr('src'), name: $(ell).attr('data-name')});
- })
+ items.push({ uid: $(ell).attr('data-uid'), path: $(ell).attr('data-path'), icon: $(ell).find('.item-icon img').attr('src'), name: $(ell).attr('data-name') });
+ });
UIWindowShare(items);
- }
- })
+ },
+ });
// -------------------------------------------
// -
// -------------------------------------------
@@ -859,56 +918,56 @@ function UIItem(options){
// -------------------------------------------
menu_items.push({
html: i18n('download'),
- onClick: async function(){
+ onClick: async function () {
let items = [];
- for (let index = 0; index < $selected_items.length; index++) {
+ for ( let index = 0; index < $selected_items.length; index++ ) {
items.push($selected_items[index]);
}
window.zipItems(items, path.dirname($(el_item).attr('data-path')), true);
- }
+ },
});
// -------------------------------------------
// Zip
// -------------------------------------------
menu_items.push({
html: i18n('zip'),
- onClick: async function(){
+ onClick: async function () {
let items = [];
- for (let index = 0; index < $selected_items.length; index++) {
+ for ( let index = 0; index < $selected_items.length; index++ ) {
items.push($selected_items[index]);
}
window.zipItems(items, path.dirname($(el_item).attr('data-path')), false);
- }
+ },
});
// -------------------------------------------
// Download as Tar
// -------------------------------------------
menu_items.push({
html: i18n('download_as_tar'),
- onClick: async function(){
+ onClick: async function () {
let items = [];
- for (let index = 0; index < $selected_items.length; index++) {
+ for ( let index = 0; index < $selected_items.length; index++ ) {
items.push($selected_items[index]);
}
window.tarItems(items, path.dirname($(el_item).attr('data-path')), true);
- }
+ },
});
// -------------------------------------------
// Tar
// -------------------------------------------
menu_items.push({
html: i18n('tar'),
- onClick: async function(){
+ onClick: async function () {
let items = [];
- for (let index = 0; index < $selected_items.length; index++) {
+ for ( let index = 0; index < $selected_items.length; index++ ) {
items.push($selected_items[index]);
}
window.tarItems(items, path.dirname($(el_item).attr('data-path')), false);
- }
+ },
});
// -------------------------------------------
// -
@@ -920,29 +979,29 @@ function UIItem(options){
// -------------------------------------------
menu_items.push({
html: i18n('cut'),
- onClick: function(){
- window.clipboard_op= 'move';
+ onClick: function () {
+ window.clipboard_op = 'move';
window.clipboard = [];
- $selected_items.each(function() {
+ $selected_items.each(function () {
const ell = this;
window.clipboard.push($(ell).attr('data-path'));
- })
- }
+ });
+ },
});
// -------------------------------------------
// Copy
// -------------------------------------------
- if(!are_trashed){
+ if ( ! are_trashed ) {
menu_items.push({
html: i18n('copy'),
- onClick: function(){
- window.clipboard_op= 'copy';
+ onClick: function () {
+ window.clipboard_op = 'copy';
window.clipboard = [];
- $selected_items.each(function() {
+ $selected_items.each(function () {
const ell = this;
- window.clipboard.push({path: $(ell).attr('data-path')});
- })
- }
+ window.clipboard.push({ path: $(ell).attr('data-path') });
+ });
+ },
});
}
// -------------------------------------------
@@ -952,79 +1011,77 @@ function UIItem(options){
// -------------------------------------------
// Delete Permanently
// -------------------------------------------
- if(are_trashed){
+ if ( are_trashed ) {
menu_items.push({
html: i18n('delete_permanently'),
- onClick: async function(){
+ onClick: async function () {
const alert_resp = await UIAlert({
message: i18n('confirm_delete_multiple_items'),
- buttons:[
+ buttons: [
{
label: i18n('delete'),
type: 'primary',
},
{
- label: i18n('cancel')
+ label: i18n('cancel'),
},
- ]
- })
- if((alert_resp) === 'Delete'){
- for (let index = 0; index < $selected_items.length; index++) {
+ ],
+ });
+ if ( (alert_resp) === 'Delete' ) {
+ for ( let index = 0; index < $selected_items.length; index++ ) {
const element = $selected_items[index];
await window.delete_item(element);
}
- const trash = await puter.fs.stat({path: window.trash_path, consistency: 'eventual'});
+ const trash = await puter.fs.stat({ path: window.trash_path, consistency: 'eventual' });
// update other clients
- if(window.socket){
- window.socket.emit('trash.is_empty', {is_empty: trash.is_empty});
+ if ( window.socket ) {
+ window.socket.emit('trash.is_empty', { is_empty: trash.is_empty });
}
- if(trash.is_empty){
+ if ( trash.is_empty ) {
$(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${window.trash_path}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
$(`.window[data-path="${html_encode(window.trash_path)}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
- }
+ }
}
- }
+ },
});
}
// -------------------------------------------
// Create Shortcut
// -------------------------------------------
- if(!are_trashed && window.feature_flags.create_shortcut){
+ if ( !are_trashed && window.feature_flags.create_shortcut ) {
menu_items.push({
html: i18n('create_shortcut'),
html: is_shared_with_me ? i18n('create_desktop_shortcut_s') : i18n('create_shortcut_s'),
- onClick: async function(){
- $selected_items.each(function() {
+ onClick: async function () {
+ $selected_items.each(function () {
let base_dir = path.dirname($(this).attr('data-path'));
// Trash on Desktop is a special case
- if($(this).attr('data-path') && $(this).closest('.item-container').attr('data-path') === window.desktop_path){
+ if ( $(this).attr('data-path') && $(this).closest('.item-container').attr('data-path') === window.desktop_path ) {
base_dir = window.desktop_path;
}
if ( is_shared_with_me ) base_dir = window.desktop_path;
// create shortcut
- window.create_shortcut(
- path.basename($(this).attr('data-path')),
- $(this).attr('data-is_dir') === '1',
- base_dir,
- $(this).closest('.item-container'),
- $(this).attr('data-shortcut_to') === '' ? $(this).attr('data-uid') : $(this).attr('data-shortcut_to'),
- $(this).attr('data-shortcut_to_path') === '' ? $(this).attr('data-path') : $(this).attr('data-shortcut_to_path'),
- );
- })
- }
+ window.create_shortcut(path.basename($(this).attr('data-path')),
+ $(this).attr('data-is_dir') === '1',
+ base_dir,
+ $(this).closest('.item-container'),
+ $(this).attr('data-shortcut_to') === '' ? $(this).attr('data-uid') : $(this).attr('data-shortcut_to'),
+ $(this).attr('data-shortcut_to_path') === '' ? $(this).attr('data-path') : $(this).attr('data-shortcut_to_path'));
+ });
+ },
});
}
// -------------------------------------------
// Delete
// -------------------------------------------
- if(!are_trashed){
+ if ( ! are_trashed ) {
menu_items.push({
html: i18n('delete'),
- onClick: async function(){
+ onClick: async function () {
window.move_items($selected_items, window.trash_path);
- }
+ },
});
}
@@ -1032,80 +1089,82 @@ function UIItem(options){
// -------------------------------------------------------
// One item selected
- // -------------------------------------------------------
- else{
+ // -------------------------------------------------------
+ else {
const is_trash = $(el_item).attr('data-path') === window.trash_path || $(el_item).attr('data-shortcut_to_path') === window.trash_path;
menu_items = [];
// -------------------------------------------
// Open
// -------------------------------------------
- if(!is_trashed){
+ if ( ! is_trashed ) {
menu_items.push({
html: i18n('open'),
- onClick: function(){
- open_item({item: el_item});
- }
+ onClick: function () {
+ open_item({ item: el_item });
+ },
});
// -------------------------------------------
// -
// -------------------------------------------
- if(options.associated_app_name || is_trash)
+ if ( options.associated_app_name || is_trash )
+ {
menu_items.push('-');
+ }
}
// -------------------------------------------
// Open With
// -------------------------------------------
- if(!is_trashed && !is_trash && (options.associated_app_name === null || options.associated_app_name === undefined)){
+ if ( !is_trashed && !is_trash && (options.associated_app_name === null || options.associated_app_name === undefined) ) {
let items = [];
- if(!options.suggested_apps || options.suggested_apps.length === 0){
+ if ( !options.suggested_apps || options.suggested_apps.length === 0 ) {
// try to find suitable apps
const suitable_apps = await window.suggest_apps_for_fsentry({
uid: options.uid,
path: options.path,
});
- if(suitable_apps && suitable_apps.length > 0){
+ if ( suitable_apps && suitable_apps.length > 0 ) {
options.suggested_apps = suitable_apps;
}
}
- if(options.suggested_apps && options.suggested_apps.length > 0){
- for (let index = 0; index < options.suggested_apps.length; index++) {
+ if ( options.suggested_apps && options.suggested_apps.length > 0 ) {
+ for ( let index = 0; index < options.suggested_apps.length; index++ ) {
const suggested_app = options.suggested_apps[index];
if ( ! suggested_app ) {
- console.warn(`suggested_app is null`, options.suggested_apps, index);
+ console.warn('suggested_app is null', options.suggested_apps, index);
continue;
}
items.push({
html: suggested_app.title,
icon: ``;
+
+ if ( fsentry.subdomains ) {
+ let h = '
';
h += `
${i18n(fsentry.subdomains.length > 1 ? 'item_associated_websites_plural' : 'item_associated_websites')}
`;
fsentry.subdomains.forEach(subdomain => {
h += `
@@ -1683,7 +1763,7 @@ $(document).on('long-hover', '.item-has-website-badge', function(e){
`;
});
- h += `
`;
+ h += '
`;
- h += `
`;
- h += `
`;
- h += `
`;
- h += `
`;
- h += `
`;
- h += `
${html_encode(options.title)}
`;
- h += `
${html_encode(options.text)}
`;
- h += `
`;
- h += `
';
+ h += `
`;
+ h += '
';
+ h += `
${html_encode(options.title)}
`;
+ h += `
${html_encode(options.text)}
`;
+ h += '
');
- $(el_notification).show(0, function(e){
+ $(el_notification).show(0, function (e) {
// options.onAppend()
- if(options.onAppend && typeof options.onAppend === 'function'){
+ if ( options.onAppend && typeof options.onAppend === 'function' ) {
options.onAppend(el_notification);
}
- })
+ });
// Notification Clicked
- $(el_notification).on('click', function(e){
+ $(el_notification).on('click', function (e) {
// close button clicked
- if($(e.target).hasClass('notification-close')){
+ if ( $(e.target).hasClass('notification-close') ) {
return;
}
// click event
- if(options.click && typeof options.click === 'function'){
+ if ( options.click && typeof options.click === 'function' ) {
options.click(options.value);
}
// close notification
close_notification(el_notification);
- })
+ });
// Close Button Clicked
- $(el_notification).find('.notification-close').on('click', function(e, data){
+ $(el_notification).find('.notification-close').on('click', function (e, data) {
let closingMultiple = false;
- if(data?.closingAll)
+ if ( data?.closingAll )
+ {
closingMultiple = true;
+ }
close_notification(el_notification, closingMultiple);
e.stopPropagation();
e.preventDefault();
- return false;
+ return false;
});
- const close_notification = function(el_notification, closingMultiple = false){
+ const close_notification = function (el_notification, closingMultiple = false) {
// hide notification wrapper by animating height and opacity
// only if closing one notification and there are multiple notifications
// otherwise the animation is not needed
- if(!closingMultiple && $('.notification').length > 1){
+ if ( !closingMultiple && $('.notification').length > 1 ) {
$(el_notification).closest('.notification-wrapper').animate({
height: 0,
- opacity: 0
+ opacity: 0,
}, 300);
}
// hide notification by fading out to the right
$(el_notification).addClass('animate__fadeOutRight');
-
+
// close callback
- if(options.close && typeof options.close === 'function'){
+ if ( options.close && typeof options.close === 'function' ) {
options.close(options.value);
}
// remove notification and wrapper after animation
- setTimeout(function(){
+ setTimeout(function () {
$(el_notification).closest('.notification-wrapper').remove();
$(el_notification).remove();
// count notifications
let count = $('.notification-container').find('.notification-wrapper').length;
- if(count <= 1){
+ if ( count <= 1 ) {
$('.notification-container').removeClass('has-multiple');
- }else{
+ } else {
$('.notification-container').addClass('has-multiple');
}
update_tab_notif_count_badge();
}, 500);
- }
+ };
// Show Notification
$(el_notification).delay(100).show(0);
// count notifications
let count = $('.notification-container').find('.notification-wrapper').length;
- if(count <= 1){
+ if ( count <= 1 ) {
$('.notification-container').removeClass('has-multiple');
- }else{
+ } else {
$('.notification-container').addClass('has-multiple');
}
return el_notification;
}
-$(document).on('click', '.notifications-close-all', function(e){
+$(document).on('click', '.notifications-close-all', function (e) {
// close all notifications
- $('.notification-container').find('.notification-close').trigger('click', {closingAll: true});
+ $('.notification-container').find('.notification-close').trigger('click', { closingAll: true });
// hide 'Close all' button
$('.notifications-close-all').animate({
- opacity: 0
+ opacity: 0,
}, 300);
// remove the 'has-multiple' class
$('.notification-container').removeClass('has-multiple');
@@ -143,26 +144,26 @@ $(document).on('click', '.notifications-close-all', function(e){
e.stopPropagation();
e.preventDefault();
return false;
-})
+});
-window.update_tab_notif_count_badge = function(){
+window.update_tab_notif_count_badge = function () {
// count open notifications
let count = $('.notification').length;
// see if title is in the format "(n) Title"
let title = document.title;
let titleMatch = title.match(/^\((\d+)\) (.*)/);
- if(titleMatch){
+ if ( titleMatch ) {
// remove the count
title = titleMatch[2];
}
// if there are notifications, add the count to the title
- if(count > 0){
+ if ( count > 0 ) {
document.title = `(${count}) ${title}`;
- }else{
+ } else {
document.title = title;
}
-}
+};
export default UINotification;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIPopover.js b/src/gui/src/UI/UIPopover.js
index b626bb2b46..3489f035fa 100644
--- a/src/gui/src/UI/UIPopover.js
+++ b/src/gui/src/UI/UIPopover.js
@@ -7,21 +7,23 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- h += options.content;
- h += `
`;
+ h += ``;
+ h += options.content;
+ h += '
';
$('body').append(h);
-
const el_popover = document.getElementById(`popover-${window.global_element_id}`);
- $(el_popover).show(0, function(e){
+ $(el_popover).show(0, function (e) {
// options.onAppend()
- if(options.onAppend && typeof options.onAppend === 'function'){
+ if ( options.onAppend && typeof options.onAppend === 'function' ) {
options.onAppend(el_popover);
}
- })
+ });
let x_pos;
let y_pos;
- if(options.parent_element){
+ if ( options.parent_element ) {
$(options.parent_element).addClass('has-open-popover');
}
- $(el_popover).on("remove", function () {
- if(options.parent_element){
+ $(el_popover).on('remove', function () {
+ if ( options.parent_element ) {
$(options.parent_element).removeClass('has-open-popover');
}
- })
+ });
- function position_popover(){
+ function position_popover () {
// X position
const popover_width = options.width ?? $(el_popover).width();
- if(options.center_horizontally){
+ if ( options.center_horizontally ) {
// Check taskbar position to determine popover positioning
const taskbar_position = window.taskbar_position || 'bottom';
-
- if(taskbar_position === 'left'){
+
+ if ( taskbar_position === 'left' ) {
// Position in top-left corner for left taskbar
x_pos = window.taskbar_height + 10; // Just to the right of the taskbar
- }else if(taskbar_position === 'right'){
- // Position in top-right corner for right taskbar
+ } else if ( taskbar_position === 'right' ) {
+ // Position in top-right corner for right taskbar
x_pos = window.innerWidth - popover_width - window.taskbar_height - 40; // Just to the left of the taskbar
- }else{
+ } else {
// Default bottom taskbar behavior - center horizontally
- x_pos = window.innerWidth/2 - popover_width/2 - 15;
+ x_pos = window.innerWidth / 2 - popover_width / 2 - 15;
// if sidepanel (visible), shift to the left
- if($('.window[data-is_panel][data-is_visible="1"]').length > 0){
+ if ( $('.window[data-is_panel][data-is_visible="1"]').length > 0 ) {
x_pos -= 200;
}
}
- }else{
- if(options.position === 'bottom' || options.position === 'top')
- x_pos = options.left ?? ($(options.snapToElement).offset().left - (popover_width/ 2) + 10);
+ } else {
+ if ( options.position === 'bottom' || options.position === 'top' )
+ {
+ x_pos = options.left ?? ($(options.snapToElement).offset().left - (popover_width / 2) + 10);
+ }
else
+ {
x_pos = options.left ?? ($(options.snapToElement).offset().left + 5);
+ }
}
// Y position
const popover_height = options.height ?? $(el_popover).height();
- if(options.center_horizontally){
+ if ( options.center_horizontally ) {
// Check taskbar position to determine popover positioning
const taskbar_position = window.taskbar_position || 'bottom';
-
- if(taskbar_position === 'left' || taskbar_position === 'right'){
+
+ if ( taskbar_position === 'left' || taskbar_position === 'right' ) {
// Position at top for left/right taskbars
y_pos = window.toolbar_height + 10; // Just below the toolbar
- }else{
+ } else {
// Default bottom taskbar behavior - position above taskbar
y_pos = options.top ?? (window.innerHeight - (window.taskbar_height + popover_height + 10));
}
- }else{
+ } else {
y_pos = options.top ?? ($(options.snapToElement).offset().top + $(options.snapToElement).height() + 5);
}
$(el_popover).css({
- left: x_pos + "px",
- top: y_pos + "px",
+ left: `${x_pos }px`,
+ top: `${y_pos }px`,
});
}
position_popover();
// If the window is resized, reposition the popover
- $(window).on('resize', function(){
+ $(window).on('resize', function () {
position_popover();
});
-
+
// Show Popover
- $(el_popover).delay(100).show(0).
+ $(el_popover).delay(100).show(0)
// In the right position (the mouse)
- css({
- left: x_pos + "px",
- top: y_pos + "px",
- });
+ .css({
+ left: `${x_pos }px`,
+ top: `${y_pos }px`,
+ });
return el_popover;
}
diff --git a/src/gui/src/UI/UIPrompt.js b/src/gui/src/UI/UIPrompt.js
index 3629a2bef6..0110104898 100644
--- a/src/gui/src/UI/UIPrompt.js
+++ b/src/gui/src/UI/UIPrompt.js
@@ -7,54 +7,54 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see ${options.message}
`;
// prompt
- h += ``;
- h += `
`;
+ h += '';
+ h += `
';
// buttons
- if(options.buttons && options.buttons.length > 0){
- h += ``;
- h += `${i18n('cancel')} `;
- h += `${i18n('ok')} `;
- h += `
`;
+ if ( options.buttons && options.buttons.length > 0 ) {
+ h += '';
+ h += `${i18n('cancel')} `;
+ h += `${i18n('ok')} `;
+ h += '
';
}
const el_window = await UIWindow({
@@ -77,14 +77,14 @@ function UIPrompt(options){
body_content: h,
width: 450,
parent_uuid: options.parent_uuid,
- onAppend: function(this_window){
- setTimeout(function(){
- $(this_window).find('.prompt-input').get(0).focus({preventScroll:true});
+ onAppend: function (this_window) {
+ 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') {
+ $(document).on('keyup.uiprompt', function (e) {
+ if ( e.key === 'Escape' ) {
resolve(false);
$(el_window).close();
$(document).off('keyup.uiprompt'); // Remove event listener
@@ -92,7 +92,7 @@ function UIPrompt(options){
});
},
...options.window_options,
- window_css:{
+ window_css: {
height: 'initial',
},
body_css: {
@@ -100,7 +100,7 @@ function UIPrompt(options){
padding: '20px',
'background-color': 'rgba(231, 238, 245, .95)',
'backdrop-filter': 'blur(3px)',
- }
+ },
});
// focus to primary btn
$(el_window).find('.button-primary').focus();
@@ -108,25 +108,25 @@ function UIPrompt(options){
// --------------------------------------------------------
// Button pressed
// --------------------------------------------------------
- $(el_window).find('.prompt-resp-button').on('click', async function(event){
- event.preventDefault();
+ $(el_window).find('.prompt-resp-button').on('click', async function (event) {
+ event.preventDefault();
event.stopPropagation();
- if($(this).attr('data-value') === 'true'){
+ if ( $(this).attr('data-value') === 'true' ) {
resolve($(el_window).find('.prompt-input').val());
- }else{
+ } else {
resolve(false);
}
$(el_window).close();
$(document).off('keyup.uiprompt'); // Remove event listener
return false;
- })
+ });
- $(el_window).find('.prompt-input').on('keyup', async function(e){
- if(e.keyCode === 13){
+ $(el_window).find('.prompt-input').on('keyup', async function (e) {
+ if ( e.keyCode === 13 ) {
$(el_window).find('.prompt-resp-btn-ok').click();
}
- })
- })
+ });
+ });
}
export default UIPrompt;
\ No newline at end of file
diff --git a/src/gui/src/UI/UITaskbar.js b/src/gui/src/UI/UITaskbar.js
index a96c3d53cc..021c608703 100644
--- a/src/gui/src/UI/UITaskbar.js
+++ b/src/gui/src/UI/UITaskbar.js
@@ -7,22 +7,22 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
';
+ h += '';
- if(taskbar_position === 'left' || taskbar_position === 'right'){
+ if ( taskbar_position === 'left' || taskbar_position === 'right' ) {
$('.desktop').addClass(`desktop-taskbar-position-${taskbar_position}`);
}
$('.desktop').append(h);
-
//---------------------------------------------
// add `Start` to taskbar
//---------------------------------------------
@@ -87,14 +86,16 @@ async function UITaskbar(options){
sortable: false,
keep_in_taskbar: true,
disable_context_menu: true,
- onClick: async function(item){
+ onClick: async function (item) {
// skip if popover already open
- if($(item).hasClass('has-open-popover'))
+ if ( $(item).hasClass('has-open-popover') )
+ {
return;
+ }
// show popover
let popover = UIPopover({
- content: `
`,
+ content: '
',
snapToElement: item,
parent_element: item,
width: 500,
@@ -105,180 +106,184 @@ async function UITaskbar(options){
// In the rare case that launch_apps is not populated yet, get it from the server
// then populate the popover
- if(!window.launch_apps || !window.launch_apps.recent || window.launch_apps.recent.length === 0){
+ if ( !window.launch_apps || !window.launch_apps.recent || window.launch_apps.recent.length === 0 ) {
// get launch apps
window.launch_apps = await $.ajax({
- url: window.api_origin + "/get-launch-apps?icon_size=64",
+ url: `${window.api_origin }/get-launch-apps?icon_size=64`,
type: 'GET',
async: true,
- contentType: "application/json",
+ contentType: 'application/json',
headers: {
- "Authorization": "Bearer "+window.auth_token
+ 'Authorization': `Bearer ${window.auth_token}`,
},
});
}
-
+
let apps_str = '';
- apps_str += ``
- apps_str += `
`;
- apps_str += `
`;
- apps_str += `
';
+ apps_str += `
`;
+ apps_str += `
`;
+ apps_str += '
${i18n('recent')} `;
// apps
- apps_str += ``;
- for (let index = 0; index < window.launch_recent_apps_count && index < window.launch_apps.recent.length; index++) {
+ apps_str += '
';
+ for ( let index = 0; index < window.launch_recent_apps_count && index < window.launch_apps.recent.length; index++ ) {
const app_info = window.launch_apps.recent[index];
apps_str += `
`;
- apps_str += `
`;
- apps_str += `
`;
- apps_str += `
${html_encode(app_info.title)} `;
- apps_str += `
`;
- apps_str += `
`;
+ apps_str += `
`;
+ apps_str += `
`;
+ apps_str += `
${html_encode(app_info.title)} `;
+ apps_str += '
';
+ apps_str += '
';
}
- apps_str += `
${i18n('recommended')} `;
// apps
- apps_str += ``;
- for (let index = 0; index < window.launch_apps.recommended.length; index++) {
+ apps_str += '
';
+ for ( let index = 0; index < window.launch_apps.recommended.length; index++ ) {
const app_info = window.launch_apps.recommended[index];
apps_str += `
`;
- apps_str += `
`;
- apps_str += `
`;
- apps_str += `
${html_encode(app_info.title)} `;
- apps_str += `
`;
- apps_str += `
`;
+ apps_str += `
`;
+ apps_str += `
`;
+ apps_str += `
${html_encode(app_info.title)} `;
+ apps_str += '
';
+ apps_str += '
';
}
- apps_str += `
" )
- .addClass( "arrow" )
- .addClass( feedback.vertical )
- .addClass( feedback.horizontal )
- .appendTo( this );
- }
- }
+ using: function ( position, feedback ) {
+ $(this).css( position);
+ $('
')
+ .addClass( 'arrow')
+ .addClass( feedback.vertical)
+ .addClass( feedback.horizontal)
+ .appendTo( this);
+ },
+ },
});
});
};
// Function to update desktop dimensions based on taskbar position
-window.update_desktop_dimensions_for_taskbar = function() {
+window.update_desktop_dimensions_for_taskbar = function () {
const position = window.taskbar_position || 'bottom';
-
- if (position === 'bottom') {
+
+ if ( position === 'bottom' ) {
$('.desktop').css({
'height': `calc(100vh - ${window.taskbar_height + window.toolbar_height}px)`,
'width': '100%',
'left': '0',
- 'top': `${window.toolbar_height}px`
+ 'top': `${window.toolbar_height}px`,
});
- } else if (position === 'left') {
+ } else if ( position === 'left' ) {
$('.desktop').css({
'height': `calc(100vh - ${window.toolbar_height}px)`,
'width': `calc(100% - ${window.taskbar_height}px)`,
'left': `${window.taskbar_height}px`,
- 'top': `${window.toolbar_height}px`
+ 'top': `${window.toolbar_height}px`,
});
- } else if (position === 'right') {
+ } else if ( position === 'right' ) {
$('.desktop').css({
'height': `calc(100vh - ${window.toolbar_height}px)`,
'width': `calc(100% - ${window.taskbar_height}px)`,
'left': '0',
- 'top': `${window.toolbar_height}px`
+ 'top': `${window.toolbar_height}px`,
});
}
};
@@ -607,11 +611,11 @@ window.update_desktop_dimensions_for_taskbar = function() {
//-------------------------------------------
// Dynamic taskbar item resizing for left/right positions
//-------------------------------------------
-window.adjust_taskbar_item_sizes = function() {
+window.adjust_taskbar_item_sizes = function () {
const position = window.taskbar_position || 'bottom';
-
+
// Only apply to left and right positions
- if (position !== 'left' && position !== 'right') {
+ if ( position !== 'left' && position !== 'right' ) {
// Reset to default sizes for bottom position
$('.taskbar .taskbar-item').css({
'width': '40px',
@@ -622,34 +626,34 @@ window.adjust_taskbar_item_sizes = function() {
$('.taskbar-icon').css('height', '40px');
return;
}
-
+
const taskbar = $('.taskbar')[0];
const taskbarItems = $('.taskbar .taskbar-item:visible');
-
- if (!taskbar || taskbarItems.length === 0) return;
-
+
+ if ( !taskbar || taskbarItems.length === 0 ) return;
+
// Get available height (minus padding)
const totalItemsNeeded = taskbarItems.length;
const taskbarHeight = taskbar.clientHeight;
const paddingTop = 20; // from CSS
const paddingBottom = 20; // from CSS
const availableHeight = taskbarHeight - paddingTop - paddingBottom - 180;
-
+
// Calculate space needed with default sizes
const defaultItemSize = 40;
const defaultMargin = 5;
const spaceNeededDefault = (totalItemsNeeded * defaultItemSize) + ((totalItemsNeeded - 1) * defaultMargin);
-
- if (spaceNeededDefault <= availableHeight) {
+
+ if ( spaceNeededDefault <= availableHeight ) {
// No overflow, use default sizes
taskbarItems.css({
'width': '40px',
'height': '40px',
'min-width': '40px',
'min-height': '40px',
- 'padding': '6px 5px 10px 5px' // default padding
+ 'padding': '6px 5px 10px 5px', // default padding
});
- $('.taskbar-icon').css('height', defaultItemSize + 'px');
+ $('.taskbar-icon').css('height', `${defaultItemSize }px`);
$('.taskbar-icon').css('width', '40px');
$('.taskbar-icon > img').css('width', 'auto');
$('.taskbar-icon > img').css('margin', 'auto');
@@ -665,42 +669,42 @@ window.adjust_taskbar_item_sizes = function() {
const marginSpace = (totalItemsNeeded - 1) * minMargin;
const availableForItems = availableHeight - marginSpace;
const newItemSize = Math.floor(availableForItems / totalItemsNeeded);
-
+
// Ensure minimum size of 20px
const finalItemSize = Math.max(20, newItemSize);
-
+
// Calculate proportional padding based on size ratio
const sizeRatio = finalItemSize / defaultItemSize;
const paddingTop = Math.max(1, Math.floor(6 * sizeRatio));
const paddingRight = Math.max(1, Math.floor(5 * sizeRatio));
const paddingBottom = Math.max(1, Math.floor(10 * sizeRatio));
const paddingLeft = Math.max(1, Math.floor(5 * sizeRatio));
-
+
// Apply new sizes and padding
taskbarItems.css({
'width': '40px',
- 'height': finalItemSize + 'px',
+ 'height': `${finalItemSize }px`,
'min-width': '40px',
- 'min-height': finalItemSize + 'px',
- 'padding': `${paddingTop}px ${paddingRight}px ${paddingBottom}px ${paddingLeft}px`
+ 'min-height': `${finalItemSize }px`,
+ 'padding': `${paddingTop}px ${paddingRight}px ${paddingBottom}px ${paddingLeft}px`,
});
- $('.taskbar-icon').css('height', finalItemSize + 'px');
+ $('.taskbar-icon').css('height', `${finalItemSize }px`);
$('.taskbar-icon').css('width', '40px');
$('.taskbar-icon > img').css('width', 'auto');
$('.taskbar-icon > img').css('margin', 'auto');
$('.taskbar-icon > img').css('display', 'block');
// Adjust margins
- taskbarItems.css('margin-bottom', minMargin + 'px');
+ taskbarItems.css('margin-bottom', `${minMargin }px`);
taskbarItems.last().css('margin-bottom', '0px');
}
};
// Hook into existing taskbar functionality
-$(document).ready(function() {
+$(document).ready(function () {
// Watch for taskbar item changes
- const observer = new MutationObserver(function(mutations) {
- mutations.forEach(function(mutation) {
- if (mutation.type === 'childList' || mutation.type === 'attributes') {
+ const observer = new MutationObserver(function (mutations) {
+ mutations.forEach(function (mutation) {
+ if ( mutation.type === 'childList' || mutation.type === 'attributes' ) {
// Delay to ensure DOM updates are complete
setTimeout(() => {
window.adjust_taskbar_item_sizes();
@@ -708,25 +712,25 @@ $(document).ready(function() {
}
});
});
-
+
// Start observing when taskbar is available
const checkTaskbar = setInterval(() => {
const taskbar = document.querySelector('.taskbar-sortable');
- if (taskbar) {
+ if ( taskbar ) {
observer.observe(taskbar, {
childList: true,
attributes: true,
- subtree: true
+ subtree: true,
});
clearInterval(checkTaskbar);
-
+
// Initial call
setTimeout(() => {
window.adjust_taskbar_item_sizes();
}, 100);
}
}, 100);
-
+
// Also watch for window resize events
window.addEventListener('resize', () => {
setTimeout(() => {
diff --git a/src/gui/src/UI/UITaskbarItem.js b/src/gui/src/UI/UITaskbarItem.js
index ff6da1bc04..898c4578d6 100644
--- a/src/gui/src/UI/UITaskbarItem.js
+++ b/src/gui/src/UI/UITaskbarItem.js
@@ -7,24 +7,24 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
import UIContextMenu from './UIContextMenu.js';
import path from '../lib/path.js';
-import launch_app from "../helpers/launch_app.js"
+import launch_app from '../helpers/launch_app.js';
let tray_item_id = 1;
-function UITaskbarItem(options){
- let h = ``;
+function UITaskbarItem (options) {
+ let h = '';
tray_item_id++;
options.sortable = options.sortable ?? true;
options.open_windows_count = options.open_windows_count ?? 0;
@@ -45,38 +45,48 @@ function UITaskbarItem(options){
title = "${html_encode(options.name)}"
style= "${options.style ? html_encode(options.style) : ''}"
>`;
- let icon = options.icon ? options.icon : window.icons['app.svg'];
- if(options.app === 'explorer')
- icon = window.icons['folders.svg'];
-
- // taskbar icon
- h += `
`;
- // Don't add img tag for separator
- if(options.app !== 'separator') {
- h += `
`;
- }
- h += `
`;
+ let icon = options.icon ? options.icon : window.icons['app.svg'];
+ if ( options.app === 'explorer' )
+ {
+ icon = window.icons['folders.svg'];
+ }
- // active indicator
- if(options.app !== 'apps')
- h += `
`;
- h += `
`;
+ // taskbar icon
+ h += '
';
+ // Don't add img tag for separator
+ if ( options.app !== 'separator' ) {
+ h += `
`;
+ }
+ h += '
';
- if(options.append_to_taskbar) {
- if (options.before_trash){
+ // active indicator
+ if ( options.app !== 'apps' )
+ {
+ h += '
';
+ }
+ h += '
" )
- .addClass( "arrow" )
- .addClass( feedback.vertical )
- .addClass( feedback.horizontal )
- .appendTo( this );
- }
+ using: function ( position, feedback ) {
+ $(this).css( position);
+ $('
')
+ .addClass( 'arrow')
+ .addClass( feedback.vertical)
+ .addClass( feedback.horizontal)
+ .appendTo( this);
+ },
},
});
@@ -368,127 +388,141 @@ function UITaskbarItem(options){
// Droppable
// --------------------------------------------------------
// Don't make separators droppable
- if(options.app !== 'separator') {
+ if ( options.app !== 'separator' ) {
$(el_taskbar_item).droppable({
- accept: '.item',
- // 'pointer' is very important because of active window tracking is based on the position of cursor.
- tolerance: 'pointer',
- drop: async function( event, ui ) {
+ accept: '.item',
+ // 'pointer' is very important because of active window tracking is based on the position of cursor.
+ tolerance: 'pointer',
+ drop: async function ( event, ui ) {
// Check if hovering over an item that is VISIBILE
- if($(event.target).closest('.window').attr('data-id') !== $(window.mouseover_window).attr('data-id'))
- return;
-
- // If ctrl is pressed and source is Trashed, cancel whole operation
- if(event.ctrlKey && path.dirname($(ui.draggable).attr('data-path')) === window.trash_path)
- return;
-
- const items_to_move = []
-
- // First item
- items_to_move.push(ui.draggable);
-
- // All subsequent items
- const cloned_items = document.getElementsByClassName('item-selected-clone');
- for(let i =0; i
0 && $event_parent_win.attr('data-id') !== $(window.mouseover_window).attr('data-id'))
- return;
- // Don't do anything if the dragged item is NOT a UIItem
- if(!$(ui.draggable).hasClass('item'))
- return;
- // If this is a directory or an app, and an item was dragged over it, highlight it.
- if(options.is_dir || options.app){
- $(el_taskbar_item).addClass('active');
- // show tooltip of this item
- $(el_taskbar_item).tooltip().mouseover();
- // make item name partially transparent
- $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 0.1)
- // remove all item-container active borders
- $('.item-container').addClass('item-container-transparent-border')
- }
- // Disable all window bodies
- $('.item-container').droppable( 'disable' )
- },
- out: function(event, ui){
+ const $event_parent_win = $(event.target).closest('.window');
+ if ( $event_parent_win.length > 0 && $event_parent_win.attr('data-id') !== $(window.mouseover_window).attr('data-id') )
+ {
+ return;
+ }
+ // Don't do anything if the dragged item is NOT a UIItem
+ if ( ! $(ui.draggable).hasClass('item') )
+ {
+ return;
+ }
+ // If this is a directory or an app, and an item was dragged over it, highlight it.
+ if ( options.is_dir || options.app ) {
+ $(el_taskbar_item).addClass('active');
+ // show tooltip of this item
+ $(el_taskbar_item).tooltip().mouseover();
+ // make item name partially transparent
+ $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 0.1);
+ // remove all item-container active borders
+ $('.item-container').addClass('item-container-transparent-border');
+ }
+ // Disable all window bodies
+ $('.item-container').droppable( 'disable');
+ },
+ out: function (event, ui) {
// Don't do anything if the dragged item is NOT a UIItem
- if(!$(ui.draggable).hasClass('item'))
- return;
-
- // Unselect directory/app if item is dragged out
- if(options.is_dir || options.app){
- $(el_taskbar_item).removeClass('active');
- $(el_taskbar_item).tooltip('close');
- $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 'initial')
- $('.item-container').removeClass('item-container-transparent-border')
- }
- $('.item-container').droppable( 'enable' )
- }
- });
+ if ( ! $(ui.draggable).hasClass('item') )
+ {
+ return;
+ }
+
+ // Unselect directory/app if item is dragged out
+ if ( options.is_dir || options.app ) {
+ $(el_taskbar_item).removeClass('active');
+ $(el_taskbar_item).tooltip('close');
+ $('.ui-draggable-dragging .item-name, .item-selected-clone .item-name').css('opacity', 'initial');
+ $('.item-container').removeClass('item-container-transparent-border');
+ }
+ $('.item-container').droppable( 'enable');
+ },
+ });
}
return el_taskbar_item;
}
-export default UITaskbarItem
\ No newline at end of file
+export default UITaskbarItem;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindow.js b/src/gui/src/UI/UIWindow.js
index 960338ea46..1ef2e90478 100644
--- a/src/gui/src/UI/UIWindow.js
+++ b/src/gui/src/UI/UIWindow.js
@@ -7,12 +7,12 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- // window mask
- h += `
`;
- //busy indicator
- h += `
BUSY
`;
- h += `
`;
-
-
- // Head
- if(options.has_head){
- h += `
`;
- // draggable handle which also contains icon and title
- h+=`
`;
- // icon
- if(options.icon)
- h += `
`;
- // title
- h += `
`;
- h += `
`;
- // Minimize button, only if window is resizable and not embedded
- if(options.is_resizable && options.show_minimize_button && !window.is_embedded)
- h += `
`;
- // Maximize button
- if(options.is_resizable && options.show_maximize_button)
- h += `
`;
- // Close button
- h += `
`;
- h += `
`;
+ // window mask
+ h += '
';
+ //busy indicator
+ h += '
BUSY
';
+ h += '
';
+
+ // Head
+ if ( options.has_head ) {
+ h += '
';
+ // draggable handle which also contains icon and title
+ h += '
';
+ // icon
+ if ( options.icon )
+ {
+ h += '
';
}
+ // title
+ h += `
`;
+ h += '
';
+ // Minimize button, only if window is resizable and not embedded
+ if ( options.is_resizable && options.show_minimize_button && !window.is_embedded )
+ {
+ h += `
`;
+ }
+ // Maximize button
+ if ( options.is_resizable && options.show_maximize_button )
+ {
+ h += `
`;
+ }
+ // Close button
+ h += `
`;
+ h += '
';
+ }
- // Sidebar
- if(options.is_dir && !isMobile.phone){
- h += ``;
+ else if ( item.path === window.videos_path )
+ {
+ icon = window.icons['sidebar-folder-videos.svg'];
+ }
+ else
+ {
+ icon = window.icons['sidebar-folder.svg'];
+ }
+ h += ``;
+ }
}
+ h += '
`;
- h += `
`;
- // Back
- h += `
`;
- // Forward
- h += `
`;
- // Up
- h += `
`;
- h += `
`;
- // Path
- h += `
${window.navbar_path(options.path, window.user.username)}
`;
- // Path editor
- h += `
`;
- // Layout settings
- h += `
`;
- h += `
';
+ h += '
';
+ // Back
+ h += `
`;
+ // Forward
+ h += `
`;
+ // Up
+ h += `
`;
+ h += '
';
+ // Path
+ h += `
${window.navbar_path(options.path, window.user.username)}
`;
+ // Path editor
+ h += `
`;
+ // Layout settings
+ h += `
`;
+ h += '
`;
- // iframe, for apps
- if(options.iframe_url || options.iframe_srcdoc){
- let allow_str = `picture-in-picture; document-picture-in-picture; camera; encrypted-media; gamepad; display-capture; geolocation; gyroscope; microphone; midi; clipboard-read; clipboard-write; fullscreen; web-share; file-system-handle; local-storage; downloads;`;
- if(window.co_isolation_enabled)
- allow_str += ' cross-origin-isolated;';
- //
`;
- }
- // custom body
- else if(options.body_content !== undefined){
- h += options.body_content;
- }
+ }
+ // custom body
+ else if ( options.body_content !== undefined ) {
+ h += options.body_content;
+ }
- // Directory
- if(options.is_dir){
- // Detail layout header
- h += window.explore_table_headers();
-
- // Add 'This folder is empty' message by default
- h += `
${i18n('window_folder_empty')}
`;
+ // Directory
+ if ( options.is_dir ) {
+ // Detail layout header
+ h += window.explore_table_headers();
- h += `
${i18n('error_message_is_missing')}
`;
+ // Add 'This folder is empty' message by default
+ h += `
${i18n('window_folder_empty')}
`;
- // Loading spinner
- h += `
`;
- h +=`
circle anim `;
- h += `
${i18n('loading')}...
`;
- h += `
`;
- }
+ h += `
${i18n('error_message_is_missing')}
`;
- h += `
';
+ h += '
circle anim ';
+ h += `
${i18n('loading')}...
`;
+ h += '
';
- // is_saveFileDialog
- if(options.is_saveFileDialog){
- h += `
`;
- h += `
`;
- h += `${i18n('cancel')} `;
- h += `${i18n('save')} `;
- h += `
`;
- h += `
`;
+ // Explorer footer
+ if ( options.is_dir && !options.is_saveFileDialog && !options.is_openFileDialog && !options.is_directoryPicker ) {
+ h += '';
+ }
+
+ // is_saveFileDialog
+ if ( options.is_saveFileDialog ) {
+ h += '
';
+ h += '
';
+ h += `${i18n('cancel')} `;
+ h += '${i18n('save')} `;
+ h += '
';
+ h += '
';
+ }
- // is_openFileDialog
- else if(options.is_openFileDialog){
- h += `
`;
- // 'upload here'
- h += `
+ // is_openFileDialog
+ else if ( options.is_openFileDialog ) {
+ h += '';
+ // 'upload here'
+ h += `
`;
- h += `
`;
- h += `${i18n('cancel')} `;
- h += `${i18n('open')} `;
- h += `
`;
- h += `
';
+ h += `${i18n('cancel')} `;
+ h += `${i18n('open')} `;
+ h += '
';
+ h += ' ';
+ }
- // is_directoryPicker
- else if(options.is_directoryPicker){
- h += `
`;
- h += `
`;
- h += `${i18n('cancel')} `;
- h += `${i18n('select')} `;
- h += `
`;
- h += `
`;
- }
- h += `
`;
+ // is_directoryPicker
+ else if ( options.is_directoryPicker ) {
+ h += '
';
+ h += '
';
+ h += `${i18n('cancel')} `;
+ h += `${i18n('select')} `;
+ h += '
';
+ h += '
';
+ }
+ h += '
` + h + `
`;
+ }
+
+ h = `${ h }
`;
}
// Append
$(el_body).append(h);
-
// disable_parent_window
- if(options.disable_parent_window && options.parent_uuid !== null){
+ if ( options.disable_parent_window && options.parent_uuid !== null ) {
const $el_parent_window = $(`.window[data-element_uuid="${options.parent_uuid}"]`);
const $el_parent_disable_mask = $el_parent_window.find('.window-disable-mask');
//disable parent window
- $el_parent_window.addClass('window-disabled')
+ $el_parent_window.addClass('window-disabled');
$el_parent_disable_mask.show();
$el_parent_disable_mask.css('z-index', parseInt($el_parent_window.css('z-index')) + 1);
$el_parent_window.find('iframe').blur();
}
-
+
// Add Taskbar Item
- if(!options.is_openFileDialog && !options.is_saveFileDialog && !options.is_directoryPicker && options.show_in_taskbar){
+ if ( !options.is_openFileDialog && !options.is_saveFileDialog && !options.is_directoryPicker && options.show_in_taskbar ) {
// add icon if there is no similar app already open
- if($(`.taskbar-item[data-app="${options.app}"]`).length === 0){
+ if ( $(`.taskbar-item[data-app="${options.app}"]`).length === 0 ) {
UITaskbarItem({
icon: options.icon,
name: options.title,
app: options.app,
open_windows_count: 1,
before_trash: true,
- onClick: function(){
+ onClick: function () {
let open_window_count = parseInt($(`.taskbar-item[data-app="${options.app}"]`).attr('data-open-windows'));
- if(open_window_count === 0){
+ if ( open_window_count === 0 ) {
launch_app({
name: options.app,
- })
- }else{
+ });
+ } else {
return false;
}
- }
+ },
});
- if(options.app)
+ if ( options.app )
+ {
$(`.taskbar-item[data-app="${options.app}"] .active-taskbar-indicator`).show();
- }else{
- if(options.app){
+ }
+ } else {
+ if ( options.app ) {
$(`.taskbar-item[data-app="${options.app}"]`).attr('data-open-windows', parseInt($(`.taskbar-item[data-app="${options.app}"]`).attr('data-open-windows')) + 1);
$(`.taskbar-item[data-app="${options.app}"] .active-taskbar-indicator`).show();
}
}
}
-
+
// if directory, set window_nav_history and window_nav_history_current_position
- if(options.is_dir){
+ if ( options.is_dir ) {
window.window_nav_history[win_id] = [options.path];
window.window_nav_history_current_position[win_id] = 0;
}
@@ -563,9 +601,9 @@ async function UIWindow(options) {
const el_directorypicker_select_btn = document.querySelector(`#window-${win_id} .directorypicker-select-btn`);
const el_window_filedialog_upload_here = document.querySelector(`#window-${win_id} .window-filedialog-upload-here`);
- if(el_window_filedialog_upload_here){
- el_window_filedialog_upload_here.addEventListener('click', function(){
- window.init_upload_using_dialog(el_window_body, $(el_window).attr('data-path') + '/');
+ if ( el_window_filedialog_upload_here ) {
+ el_window_filedialog_upload_here.addEventListener('click', function () {
+ window.init_upload_using_dialog(el_window_body, `${$(el_window).attr('data-path') }/`);
});
}
// attach optional event listeners
@@ -574,10 +612,10 @@ async function UIWindow(options) {
// disable menubar by default
$(el_window).find('.window-menubar').hide();
- if(options.is_maximized){
+ if ( options.is_maximized ) {
// save original size and position
$(el_window).attr({
- 'data-left-before-maxim': ((window.innerWidth/2 - 680/2) +(window.window_counter-1) % 10 * 30) + 'px',
+ 'data-left-before-maxim': `${(window.innerWidth / 2 - 680 / 2) + (window.window_counter - 1) % 10 * 30 }px`,
'data-top-before-maxim': default_window_top,
'data-width-before-maxim': '680px',
'data-height-before-maxim': '350px',
@@ -591,27 +629,29 @@ async function UIWindow(options) {
window.update_maximized_window_for_taskbar(el_window);
}
- // when a window is created, focus is brought to it and
+ // when a window is created, focus is brought to it and
// therefore it is the current active element
- window.active_element = el_window;
+ window.active_element = el_window;
// set name
$(el_window_head_title).html(html_encode(options.title));
// set icon
- if(options.icon)
+ if ( options.icon )
+ {
$(el_window_head_icon).attr('src', options.icon.image ?? options.icon);
-
+ }
+
// root folder of a shared user?
- if(options.is_dir && (options.path.split('/').length - 1) === 1 && options.path !== '/'+window.user.username){
+ if ( options.is_dir && (options.path.split('/').length - 1) === 1 && options.path !== `/${window.user.username}` ) {
$(el_window_head_icon).attr('src', window.icons['shared.svg']);
}
// focus on this window and deactivate other windows
if ( options.is_visible ) {
- $(el_window).focusWindow()
+ $(el_window).focusWindow();
}
- if (window.animate_window_opening) {
+ if ( window.animate_window_opening ) {
// animate window opening
$(el_window).css({
'opacity': '0',
@@ -623,14 +663,14 @@ async function UIWindow(options) {
// Change the window's opacity to 1 and scale to 1 to create an opening effect
$(el_window).css({
'opacity': '1',
- })
+ });
- // Set a timeout to run after the transition duration (100ms)
+ // Set a timeout to run after the transition duration (100ms)
setTimeout(function () {
// Remove the transition property, so future CSS changes won't be animated
$(el_window).css({
'transition': 'none',
- })
+ });
}, 70);
});
}
@@ -638,7 +678,7 @@ async function UIWindow(options) {
// =====================================
// Center relative to parent window
// =====================================
- if(options.parent_center && options.parent_uuid){
+ if ( options.parent_center && options.parent_uuid ) {
const $parent_window = $(`.window[data-element_uuid="${options.parent_uuid}"]`);
const parent_window_width = $parent_window.width();
const parent_window_height = $parent_window.height();
@@ -646,11 +686,11 @@ async function UIWindow(options) {
const parent_window_top = $parent_window.offset().top;
const window_height = $(el_window).height();
const window_width = $(el_window).width();
- options.left = parent_window_left + parent_window_width/2 - window_width/2;
- options.top = parent_window_top + parent_window_height/2 - window_height/2;
+ options.left = parent_window_left + parent_window_width / 2 - window_width / 2;
+ options.top = parent_window_top + parent_window_height / 2 - window_height / 2;
$(el_window).css({
- 'left': options.left + 'px',
- 'top': options.top + 'px',
+ 'left': `${options.left }px`,
+ 'top': `${options.top }px`,
});
}
@@ -659,116 +699,134 @@ async function UIWindow(options) {
// NOTE: there is another is_visible condition below
if ( options.is_visible ) {
- if(options.fadeIn){
+ if ( options.fadeIn ) {
$(el_window).css('opacity', 0);
- $(el_window).animate({ opacity: 1 }, options.fadeIn, function() {
+ $(el_window).animate({ opacity: 1 }, options.fadeIn, function () {
// Move the onAppend callback here to ensure it's called after fade-in
- if (options.is_visible) {
- $(el_window).show(0, function(e) {
+ if ( options.is_visible ) {
+ $(el_window).show(0, function (e) {
// if SaveFileDialog, bring focus to the el_savefiledialog_filename and select all
- if (options.is_saveFileDialog) {
+ if ( options.is_saveFileDialog ) {
let item_name = el_savefiledialog_filename.value;
- const extname = path.extname('/' + item_name);
- if (extname !== '')
+ const extname = path.extname(`/${ item_name}`);
+ if ( extname !== '' )
+ {
el_savefiledialog_filename.setSelectionRange(0, item_name.length - extname.length);
+ }
else
+ {
$(el_savefiledialog_filename).select();
-
- $(el_savefiledialog_filename).get(0).focus({preventScroll:true});
+ }
+
+ $(el_savefiledialog_filename).get(0).focus({ preventScroll: true });
}
//set custom window css
$(el_window).css(options.window_css);
// onAppend()
- if (options.onAppend && typeof options.onAppend === 'function') {
+ if ( options.onAppend && typeof options.onAppend === 'function' ) {
options.onAppend(el_window);
}
});
}
});
- }else{
- $(el_window).show(0, function(e){
+ } else {
+ $(el_window).show(0, function (e) {
// if SaveFileDialog, bring focus to the el_savefiledialog_filename and select all
- if(options.is_saveFileDialog){
+ if ( options.is_saveFileDialog ) {
let item_name = el_savefiledialog_filename.value;
- const extname = path.extname('/' + item_name);
- if(extname !== '')
- el_savefiledialog_filename.setSelectionRange(0, item_name.length - extname.length)
+ const extname = path.extname(`/${ item_name}`);
+ if ( extname !== '' )
+ {
+ el_savefiledialog_filename.setSelectionRange(0, item_name.length - extname.length);
+ }
else
+ {
$(el_savefiledialog_filename).select();
-
- $(el_savefiledialog_filename).get(0).focus({preventScroll:true});
+ }
+
+ $(el_savefiledialog_filename).get(0).focus({ preventScroll: true });
}
//set custom window css
$(el_window).css(options.window_css);
// onAppend()
- if(options.onAppend && typeof options.onAppend === 'function'){
+ if ( options.onAppend && typeof options.onAppend === 'function' ) {
options.onAppend(el_window);
}
});
}
}
- if(options.is_saveFileDialog){
+ if ( options.is_saveFileDialog ) {
//------------------------------------------------
// SaveFileDialog > Save button
//------------------------------------------------
- $(el_savefiledialog_save_btn).on('click', function(e){
+ $(el_savefiledialog_save_btn).on('click', function (e) {
const filename = $(el_savefiledialog_filename).val();
- try{
- window.validate_fsentry_name(filename)
- }catch(err){
- UIAlert(err.message, 'error', 'OK')
+ try {
+ window.validate_fsentry_name(filename);
+ } catch ( err ) {
+ UIAlert(err.message, 'error', 'OK');
return;
}
const target_path = path.join($(el_window).attr('data-path'), filename);
- if(options.onSaveFileDialogSave && typeof options.onSaveFileDialogSave === 'function')
- options.onSaveFileDialogSave(target_path, el_window)
- })
+ if ( options.onSaveFileDialogSave && typeof options.onSaveFileDialogSave === 'function' )
+ {
+ options.onSaveFileDialogSave(target_path, el_window);
+ }
+ });
//------------------------------------------------
// SaveFileDialog > Enter
//------------------------------------------------
- $(el_savefiledialog_filename).on('keypress', function(event) {
- if(event.which === 13){
+ $(el_savefiledialog_filename).on('keypress', function (event) {
+ if ( event.which === 13 ) {
$(el_savefiledialog_save_btn).trigger('click');
}
- })
+ });
//------------------------------------------------
// Enable/disable Save button based on input
//------------------------------------------------
- $(el_savefiledialog_filename).bind('keydown change input paste', function(){
- if($(this).val() !== '')
+ $(el_savefiledialog_filename).bind('keydown change input paste', function () {
+ if ( $(this).val() !== '' )
+ {
$(el_savefiledialog_save_btn).removeClass('disabled');
+ }
else
+ {
$(el_savefiledialog_save_btn).addClass('disabled');
- })
- $(el_savefiledialog_filename).get(0).focus({preventScroll:true});
+ }
+ });
+ $(el_savefiledialog_filename).get(0).focus({ preventScroll: true });
}
- if(options.is_openFileDialog){
+ if ( options.is_openFileDialog ) {
//------------------------------------------------
// OpenFileDialog > Open button
//------------------------------------------------
- $(el_openfiledialog_open_btn).on('click', async function(e){
+ $(el_openfiledialog_open_btn).on('click', async function (e) {
const selected_els = $(el_window).find('.item-selected[data-is_dir="0"]');
let selected_files;
// No item selected
- if(selected_els.length === 0)
+ if ( selected_els.length === 0 )
+ {
return;
+ }
// ------------------------------------------------
// Item(s) selected
// ------------------------------------------------
- else{
- selected_files = []
+ else {
+ selected_files = [];
// an array that hold the items to sign
const items_to_sign = [];
// prepare items to sign
- for(let i=0; i Select button
//------------------------------------------------
- $(el_directorypicker_select_btn).on('click', async function(e){
+ $(el_directorypicker_select_btn).on('click', async function (e) {
const selected_els = $(el_window).find('.item-selected[data-is_dir="1"]');
let selected_dirs;
// ------------------------------------------------
// No item selected, return current directory
// ------------------------------------------------
- if(selected_els.length === 0){
- selected_dirs = await puter.fs.sign(options.initiating_app_uuid, {uid: $(el_window).attr('data-uid'), action: 'write', path: $(el_window).attr('data-path')})
+ if ( selected_els.length === 0 ) {
+ selected_dirs = await puter.fs.sign(options.initiating_app_uuid, { uid: $(el_window).attr('data-uid'), action: 'write', path: $(el_window).attr('data-path') });
selected_dirs = selected_dirs.items;
- }
+ }
// ------------------------------------------------
// directorie(s) selected
// ------------------------------------------------
- else{
- selected_dirs = []
+ else {
+ selected_dirs = [];
// an array that hold the items to sign
const items_to_sign = [];
// prepare items to sign
- for(let i=0; i Cancel button
//------------------------------------------------
- $(el_filedialog_cancel_btn).on('click', function(e){
- if(options.return_to_parent_window){
+ $(el_filedialog_cancel_btn).on('click', function (e) {
+ if ( options.return_to_parent_window ) {
window.close();
- window.open('','_self').close();
+ window.open('', '_self').close();
}
- $(el_window).hide(0, ()=>{
+ $(el_window).hide(0, () => {
// re-anable parent window
$(`.window[data-element_uuid="${options.parent_uuid}"]`).removeClass('window-disabled');
$(`.window[data-element_uuid="${options.parent_uuid}"]`).find('.window-disable-mask').hide();
$(el_window).close();
- })
+ });
if ( options.onDialogCancel ) options.onDialogCancel.call(el_window);
- })
+ });
}
- if(options.is_dir){
+ if ( options.is_dir ) {
window.navbar_path_droppable(el_window);
window.sidebar_item_droppable(el_window);
// --------------------------------------------------------
// Back button
// --------------------------------------------------------
- $(el_window_navbar_back_btn).on('click', function(e){
+ $(el_window_navbar_back_btn).on('click', function (e) {
// if history menu is open don't continue
- if($(el_window_navbar_back_btn).hasClass('has-open-contextmenu'))
+ if ( $(el_window_navbar_back_btn).hasClass('has-open-contextmenu') )
+ {
return;
+ }
// if ctrl/cmd are pressed, open in new window
- if(e.ctrlKey || e.metaKey){
+ if ( e.ctrlKey || e.metaKey ) {
const dirpath = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id] - 1);
UIWindow({
path: dirpath,
@@ -929,33 +995,33 @@ async function UIWindow(options) {
});
}
// ... otherwise, open in same window
- else{
+ else {
window.window_nav_history_current_position[win_id] > 0 && window.window_nav_history_current_position[win_id]--;
const new_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]);
// update window path
window.update_window_path(el_window, new_path);
}
- })
+ });
// --------------------------------------------------------
// Back button click-hold
// --------------------------------------------------------
- $(el_window_navbar_back_btn).on('taphold', function() {
+ $(el_window_navbar_back_btn).on('taphold', function () {
let items = [];
const pos = el_window_navbar_back_btn.getBoundingClientRect();
- for(let index = window.window_nav_history_current_position[win_id] - 1; index >= 0; index--){
+ for ( let index = window.window_nav_history_current_position[win_id] - 1; index >= 0; index-- ) {
const history_item = window.window_nav_history[win_id].at(index);
// build item for context menu
items.push({
html: `${history_item === window.home_path ? i18n('home') : path.basename(history_item)} `,
val: index,
- onClick: async function(e){
+ onClick: async function (e) {
let history_index = e.value;
window.window_nav_history_current_position[win_id] = history_index;
const new_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]);
// if ctrl/cmd are pressed, open in new window
- if(e.ctrlKey || e.metaKey && (new_path !== undefined && new_path !== null)){
+ if ( e.ctrlKey || e.metaKey && (new_path !== undefined && new_path !== null) ) {
UIWindow({
path: new_path,
title: new_path === '/' ? window.root_dirname : path.basename(new_path),
@@ -964,29 +1030,31 @@ async function UIWindow(options) {
});
}
// update window path
- else{
+ else {
window.update_window_path(el_window, new_path);
}
- }
- })
+ },
+ });
}
// Menu
UIContextMenu({
- position: {top: pos.top + pos.height + 3, left: pos.left},
+ position: { top: pos.top + pos.height + 3, left: pos.left },
parent_element: el_window_navbar_back_btn,
items: items,
- })
- })
+ });
+ });
// --------------------------------------------------------
// Forward button
// --------------------------------------------------------
- $(el_window_navbar_forward_btn).on('click', function(e){
+ $(el_window_navbar_forward_btn).on('click', function (e) {
// if history menu is open don't continue
- if($(el_window_navbar_forward_btn).hasClass('has-open-contextmenu'))
+ if ( $(el_window_navbar_forward_btn).hasClass('has-open-contextmenu') )
+ {
return;
+ }
// if ctrl/cmd are pressed, open in new window
- if(e.ctrlKey || e.metaKey){
+ if ( e.ctrlKey || e.metaKey ) {
const dirpath = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id] + 1);
UIWindow({
path: dirpath,
@@ -997,36 +1065,36 @@ async function UIWindow(options) {
});
}
// ... otherwise, open in same window
- else{
+ else {
window.window_nav_history_current_position[win_id]++;
// get last path in history
const target_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]);
// update window path
- if(target_path !== undefined){
+ if ( target_path !== undefined ) {
window.update_window_path(el_window, target_path);
}
}
- })
+ });
// --------------------------------------------------------
// forward button click-hold
// --------------------------------------------------------
- $(el_window_navbar_forward_btn).on('taphold', function() {
+ $(el_window_navbar_forward_btn).on('taphold', function () {
let items = [];
const pos = el_window_navbar_forward_btn.getBoundingClientRect();
- for(let index = window.window_nav_history_current_position[win_id] + 1; index < window.window_nav_history[win_id].length; index++){
+ for ( let index = window.window_nav_history_current_position[win_id] + 1; index < window.window_nav_history[win_id].length; index++ ) {
const history_item = window.window_nav_history[win_id].at(index);
// build item for context menu
items.push({
html: `${history_item === window.home_path ? 'Home' : path.basename(history_item)} `,
val: index,
- onClick: async function(e){
+ onClick: async function (e) {
let history_index = e.value;
window.window_nav_history_current_position[win_id] = history_index;
const new_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]);
// if ctrl/cmd are pressed, open in new window
- if(e.ctrlKey || e.metaKey && (new_path !== undefined && new_path !== null)){
+ if ( e.ctrlKey || e.metaKey && (new_path !== undefined && new_path !== null) ) {
UIWindow({
path: new_path,
title: new_path === '/' ? window.root_dirname : path.basename(new_path),
@@ -1035,28 +1103,28 @@ async function UIWindow(options) {
});
}
// update window path
- else{
+ else {
window.update_window_path(el_window, new_path);
}
- }
- })
+ },
+ });
}
// Menu
- UIContextMenu({
+ UIContextMenu({
parent_element: el_window_navbar_forward_btn,
- position: {top: pos.top + pos.height + 3, left: pos.left},
+ position: { top: pos.top + pos.height + 3, left: pos.left },
items: items,
- })
- })
+ });
+ });
// --------------------------------------------------------
// Up button
// --------------------------------------------------------
- $(el_window_navbar_up_btn).on('click', function(e){
+ $(el_window_navbar_up_btn).on('click', function (e) {
const target_path = path.resolve(path.join($(el_window).attr('data-path'), '..'));
// if ctrl/cmd are pressed, open in new window
- if(e.ctrlKey || e.metaKey && (target_path !== undefined && target_path !== null)){
+ if ( e.ctrlKey || e.metaKey && (target_path !== undefined && target_path !== null) ) {
UIWindow({
path: target_path,
title: target_path === '/' ? window.root_dirname : path.basename(target_path),
@@ -1066,72 +1134,76 @@ async function UIWindow(options) {
});
}
// ... otherwise, open in same window
- else if(target_path !== undefined && target_path !== null){
+ else if ( target_path !== undefined && target_path !== null ) {
// update history
- window.window_nav_history[win_id] = window.window_nav_history[win_id].slice(0, window.window_nav_history_current_position[win_id]+1);
+ window.window_nav_history[win_id] = window.window_nav_history[win_id].slice(0, window.window_nav_history_current_position[win_id] + 1);
window.window_nav_history[win_id].push(target_path);
window.window_nav_history_current_position[win_id]++;
// update window path
window.update_window_path(el_window, target_path);
}
- })
+ });
const layouts = ['icons', 'list', 'details'];
- $(el_window).find('.window-navbar-layout-settings').on('contextmenu taphold', function() {
+ $(el_window).find('.window-navbar-layout-settings').on('contextmenu taphold', function () {
let cur_layout = $(el_window).attr('data-layout');
let items = [];
- for(let i=0; i${layouts[i]}`,
icon: cur_layout === layouts[i] ? '✓' : '',
- onClick: async function(e){
+ onClick: async function (e) {
window.update_window_layout(el_window, layouts[i]);
window.set_layout($(el_window).attr('data-uid'), layouts[i]);
- }
- })
+ },
+ });
}
UIContextMenu({
parent_element: this,
items: items,
- })
- })
- $(el_window).find('.window-navbar-layout-settings').on('click', function() {
+ });
+ });
+ $(el_window).find('.window-navbar-layout-settings').on('click', function () {
let cur_layout = $(el_window).attr('data-layout');
- for(let i=0; i 0){
- ht += ``;
- for (let index = 0; index < shared_users.length; index++) {
+ if ( shared_users && shared_users.length - 1 > 0 ) {
+ ht += '';
+ for ( let index = 0; index < shared_users.length; index++ ) {
const shared_user = shared_users[index];
// don't show current user's folder!
- if(shared_user.name === window.user.username)
+ if ( shared_user.name === window.user.username )
+ {
continue;
- ht += `';
}
$(el_window).find('.window-body').html(h);
}
// has no sites
- else{
+ else {
$(el_window).find('.window-body').html(`${i18n('no_websites_published')}
`);
}
}, Date.now() - init_ts < 1000 ? 0 : 2000);
- })
+ });
}
-$(document).on('click', '.mywebsites-dir-path', function(e){
+$(document).on('click', '.mywebsites-dir-path', function (e) {
e = e.target;
UIWindow({
path: $(e).attr('data-path'),
@@ -117,77 +117,76 @@ $(document).on('click', '.mywebsites-dir-path', function(e){
is_dir: true,
app: 'explorer',
});
-})
+});
-$(document).on('click', '.mywebsites-site-setting', function(e){
+$(document).on('click', '.mywebsites-site-setting', function (e) {
const pos = e.target.getBoundingClientRect();
UIContextMenu({
parent_element: e.target,
- position: {top: pos.top+25, left: pos.left-193},
+ position: { top: pos.top + 25, left: pos.left - 193 },
items: [
//--------------------------------------------------
// Release Address
//--------------------------------------------------
{
- html: `Release Address`,
- onClick: async function(){
+ html: 'Release Address',
+ onClick: async function () {
const alert_resp = await UIAlert({
message: i18n('release_address_confirmation'),
- buttons:[
+ buttons: [
{
label: i18n('yes_release_it'),
value: 'yes',
type: 'primary',
},
{
- label: i18n('cancel')
+ label: i18n('cancel'),
},
- ]
- })
- if(alert_resp !== 'yes'){
+ ],
+ });
+ if ( alert_resp !== 'yes' ) {
return;
}
-
+
$.ajax({
- url: window.api_origin + "/delete-site",
+ url: `${window.api_origin }/delete-site`,
type: 'POST',
- data: JSON.stringify({
+ data: JSON.stringify({
site_uuid: $(e.target).attr('data-site-uuid'),
}),
async: false,
- contentType: "application/json",
+ contentType: 'application/json',
headers: {
- "Authorization": "Bearer "+window.auth_token
+ 'Authorization': `Bearer ${window.auth_token}`,
},
statusCode: {
401: function () {
window.logout();
},
- },
- success: function (){
+ },
+ success: function () {
$(`.mywebsites-card[data-uuid="${$(e.target).attr('data-site-uuid')}"]`).fadeOut();
- }
- })
- }
- }
- ]
+ },
+ });
+ },
+ },
+ ],
});
-})
+});
-$(document).on('click', '.mywebsites-dis-dir', function(e){
+$(document).on('click', '.mywebsites-dis-dir', function (e) {
puter.hosting.delete(
- // dir
- $(e.target).attr('data-dir-uuid'),
- // hostname
- $(e.target).attr('data-site-subdomain'),
- // success
- function (){
- $(`.mywebsites-no-dir-notice[data-site-uuid="${$(e.target).attr('data-site-uuid')}"]`).show();
- $(`.mywebsites-dir-path[data-uuid="${$(e.target).attr('data-dir-uuid')}"]`).remove();
- // remove the website badge from all instances of the dir
- $(`.item[data-uid="${$(e.target).attr('data-dir-uuid')}"]`).find('.item-has-website-badge').fadeOut(300);
- $(e.target).hide();
- }
- )
-})
-export default UIWindowMyWebsites
\ No newline at end of file
+ // dir
+ $(e.target).attr('data-dir-uuid'),
+ // hostname
+ $(e.target).attr('data-site-subdomain'),
+ // success
+ function () {
+ $(`.mywebsites-no-dir-notice[data-site-uuid="${$(e.target).attr('data-site-uuid')}"]`).show();
+ $(`.mywebsites-dir-path[data-uuid="${$(e.target).attr('data-dir-uuid')}"]`).remove();
+ // remove the website badge from all instances of the dir
+ $(`.item[data-uid="${$(e.target).attr('data-dir-uuid')}"]`).find('.item-has-website-badge').fadeOut(300);
+ $(e.target).hide();
+ });
+});
+export default UIWindowMyWebsites;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowNewPassword.js b/src/gui/src/UI/UIWindowNewPassword.js
index 8ec45ca38a..729c32a97b 100644
--- a/src/gui/src/UI/UIWindowNewPassword.js
+++ b/src/gui/src/UI/UIWindowNewPassword.js
@@ -7,56 +7,56 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- // error msg
- h += `
`;
- // new password
- h += `
`;
- h += `${i18n('new_password')} `;
- h += `
`;
- // confirm new password
- h += `
`;
- h += `${i18n('confirm_new_password')} `;
- h += `
`;
-
- // Change Password
- h += `
${i18n('set_new_password')} `;
- h += `
';
+ // error msg
+ h += '
';
+ // new password
+ h += '
';
+ h += `${i18n('new_password')} `;
+ h += `
';
+ // confirm new password
+ h += '
';
+ h += `${i18n('confirm_new_password')} `;
+ h += `
';
+
+ // Change Password
+ h += `
${i18n('set_new_password')} `;
+ h += '
`;
- h += `
`;
- h += `
`;
- // spinner
- h += `
circle anim `;
- // Progress report
- h += `
+ h += '
';
+ h += '
';
+ // spinner
+ h += '
circle anim ';
+ // Progress report
+ h += `
${i18n('preparing')} `;
- if (show_progress) {
- h += ` (0% )`;
- }
- h += `
`;
- h +=`
`;
- if (show_progress) {
- h += `
`;
- }
- if (on_cancel) {
- h += `
`;
- h += placeholder_cancel_btn.html;
- h += `
`;
- }
- h += `
`;
- h += `
`;
- h += `
`;
- // Alert icon
- h += `
`;
- // Progress report
- h += `
+ if ( show_progress ) {
+ h += ' (0% )';
+ }
+ h += '
';
+ h += '
';
+ if ( show_progress ) {
+ h += '
';
+ }
+ if ( on_cancel ) {
+ h += '
';
+ h += placeholder_cancel_btn.html;
+ h += '
';
+ }
+ h += '
';
+ h += '
';
+ h += '
';
+ // Alert icon
+ h += `
`;
+ // Progress report
+ h += `
`;
- h += `
`;
- h += `
`;
- h += `
`;
- h += placeholder_ok_btn.html;
- h += `
`;
- h += `
`;
- h += `
`;
+ h += '
';
+ h += '
';
+ h += '
';
+ h += '
';
+ h += placeholder_ok_btn.html;
+ h += '
';
+ h += '
`;
- // success
- h += `
`;
- h += `
`;
- h += `
${i18n('dir_published_as_website', `${html_encode(target_dir_name)} `, false)}
`;
- h += `
`;
- h += `
${i18n('ok')} `;
- h+= `
`;
- // form
- h += `
`;
- h += `
';
+ // success
+ h += '
';
+ h += `
`;
+ h += `
${i18n('dir_published_as_website', `${html_encode(target_dir_name)} `, false)}
`;
+ h += `
`;
+ h += `
${i18n('ok')} `;
+ h += '
';
+ // form
+ h += '
';
+ h += '
Upgrade now to use your own domain name.'
- );
- }else{
+ 'Custom domains require a Premium subscription. Upgrade now to use your own domain name.');
+ } else {
$(this_window).find('.publish-website-error-msg').html(
- 'Custom domains are not available on this instance of Puter. Yet!'
- );
+ 'Custom domains are not available on this instance of Puter. Yet!');
}
$(this_window).find('.publish-website-error-msg').fadeIn();
setTimeout(() => {
@@ -164,149 +162,147 @@ async function UIWindowPublishWebsite(target_dir_uid, target_dir_name, target_di
}, 5000);
}
});
-
+
// Style the selected option initially
$(this_window).find('input[value="puter"]').closest('.option-label').css('border-color', '#007bff');
},
window_class: 'window-publishWebsite',
- window_css:{
- height: 'initial'
+ window_css: {
+ height: 'initial',
},
body_css: {
width: 'initial',
height: '100%',
'background-color': 'rgb(245 247 249)',
'backdrop-filter': 'blur(3px)',
- }
- })
+ },
+ });
// Function to load Entri SDK
- async function loadEntriSDK() {
- if (!window.entri) {
+ async function loadEntriSDK () {
+ if ( ! window.entri ) {
await new Promise((resolve, reject) => {
- const script = document.createElement("script");
- script.type = "text/javascript";
- script.src = "https://cdn.goentri.com/entri.js";
- script.addEventListener("load", () => {
+ const script = document.createElement('script');
+ script.type = 'text/javascript';
+ script.src = 'https://cdn.goentri.com/entri.js';
+ script.addEventListener('load', () => {
resolve(window.entri);
});
- script.addEventListener("error", () => {
- reject(new Error("Failed to load the Entri SDK."));
+ script.addEventListener('error', () => {
+ reject(new Error('Failed to load the Entri SDK.'));
});
document.body.appendChild(script);
});
}
}
- $(el_window).find('.publish-btn').on('click', async function(e){
+ $(el_window).find('.publish-btn').on('click', async function (e) {
e.preventDefault();
-
+
// Get the selected publishing type
const publishingType = $(el_window).find('input[name="publishing-type"]:checked').val();
-
+
// disable 'Publish' button
$(el_window).find('.publish-btn').prop('disabled', true);
try {
- if (publishingType === 'puter') {
+ if ( publishingType === 'puter' ) {
// Handle Puter subdomain publishing
let subdomain = $(el_window).find('.publish-website-subdomain').val();
-
- if (!subdomain.trim()) {
+
+ if ( ! subdomain.trim() ) {
throw new Error('Please enter a subdomain name');
}
const res = await puter.hosting.create(subdomain, target_dir_path);
- let url = 'https://' + subdomain + '.' + window.hosting_domain + '/';
-
+ let url = `https://${ subdomain }.${ window.hosting_domain }/`;
+
// Show success
- $(el_window).find('.window-publishWebsite-form').hide(100, function(){
+ $(el_window).find('.window-publishWebsite-form').hide(100, function () {
$(el_window).find('.publishWebsite-published-link').attr('href', url);
$(el_window).find('.publishWebsite-published-link').text(url);
- $(el_window).find('.window-publishWebsite-success').show(100)
+ $(el_window).find('.window-publishWebsite-success').show(100);
$(`.item[data-uid="${target_dir_uid}"] .item-has-website-badge`).show();
});
// find all items whose path starts with target_dir_path
- $(`.item[data-path^="${target_dir_path}/"]`).each(function(){
+ $(`.item[data-path^="${target_dir_path}/"]`).each(function () {
// show the link badge
$(this).find('.item-has-website-url-badge').show();
// update item's website_url attribute
$(this).attr('data-website_url', url + $(this).attr('data-path').substring(target_dir_path.length));
- })
+ });
window.update_sites_cache();
-
- } else if (publishingType === 'custom') {
+
+ } else if ( publishingType === 'custom' ) {
// Handle custom domain publishing with Entri
let customDomain = $(el_window).find('.publish-website-custom-domain').val();
-
- if (!customDomain.trim()) {
+
+ if ( ! customDomain.trim() ) {
throw new Error('Please enter your custom domain');
}
-
+
// Step 1: First create a Puter subdomain to host the content
let subdomain = $(el_window).find('.publish-website-subdomain').val();
- if (!subdomain.trim()) {
+ if ( ! subdomain.trim() ) {
// Generate a subdomain if not provided
subdomain = window.generate_identifier();
}
-
+
const hostingRes = await puter.hosting.create(subdomain, target_dir_path);
- const puterSiteUrl = 'https://' + subdomain + '.' + window.hosting_domain;
-
+ const puterSiteUrl = `https://${ subdomain }.${ window.hosting_domain}`;
+
// Step 2: Load Entri SDK
await loadEntriSDK();
-
+
// Step 3: Get Entri config from the backend using the Puter subdomain as userHostedSite
- const entriConfig = await puter.drivers.call("entri", "entri-service", "getConfig", {
+ const entriConfig = await puter.drivers.call('entri', 'entri-service', 'getConfig', {
domain: customDomain,
- userHostedSite: subdomain + '.' + window.hosting_domain
+ userHostedSite: `${subdomain }.${ window.hosting_domain}`,
});
-
+
// Step 4: Show Entri interface for custom domain setup
await entri.showEntri(entriConfig.result);
-
+
// Step 5: Show success message with custom domain
- let customUrl = 'https://' + customDomain + '/';
+ let customUrl = `https://${ customDomain }/`;
// Update items to show both the Puter subdomain and custom domain
- $(`.item[data-path^="${target_dir_path}/"]`).each(function(){
+ $(`.item[data-path^="${target_dir_path}/"]`).each(function () {
// show the link badge
$(this).find('.item-has-website-url-badge').show();
// update item's website_url attribute to use custom domain
$(this).attr('data-website_url', customUrl + $(this).attr('data-path').substring(target_dir_path.length));
// Also store the puter subdomain URL as backup
$(this).attr('data-puter_website_url', puterSiteUrl + $(this).attr('data-path').substring(target_dir_path.length));
- })
+ });
window.update_sites_cache();
$(el_window).close();
}
-
- } catch (err) {
+
+ } catch ( err ) {
const errorMessage = err.message || (err.error && err.error.message) || 'An error occurred while publishing';
$(el_window).find('.publish-website-error-msg').html(
- errorMessage + (
- err.error && err.error.code === 'subdomain_limit_reached' ?
- ' ' + i18n('manage_your_subdomains') + ' ' : ''
- )
- );
+ errorMessage + (
+ err.error && err.error.code === 'subdomain_limit_reached' ?
+ ` ${ i18n('manage_your_subdomains') } ` : ''
+ ));
$(el_window).find('.publish-website-error-msg').fadeIn();
// re-enable 'Publish' button
$(el_window).find('.publish-btn').prop('disabled', false);
}
- })
+ });
- $(el_window).find('.publish-window-ok-btn').on('click', function(){
+ $(el_window).find('.publish-window-ok-btn').on('click', function () {
$(el_window).close();
- })
+ });
}
-$(document).on('click', '.manage-your-websites-link', async function(e){
+$(document).on('click', '.manage-your-websites-link', async function (e) {
UIWindowMyWebsites();
-})
-
+});
-export default UIWindowPublishWebsite
\ No newline at end of file
+export default UIWindowPublishWebsite;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowPublishWorker.js b/src/gui/src/UI/UIWindowPublishWorker.js
index 708e898b67..2c3404763a 100644
--- a/src/gui/src/UI/UIWindowPublishWorker.js
+++ b/src/gui/src/UI/UIWindowPublishWorker.js
@@ -7,44 +7,44 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- // success
- h += `
`;
- h += `
`;
- h += `
${i18n('dir_published_as_website', `${html_encode(target_dir_name)} `, false)}
`;
- h += `
`;
- h += `
${i18n('ok')} `;
- h+= `
`;
- // form
- h += `
`;
- h += `
';
+ // success
+ h += '
';
+ h += `
`;
+ h += `
${i18n('dir_published_as_website', `${html_encode(target_dir_name)} `, false)}
`;
+ h += `
`;
+ h += `
${i18n('ok')} `;
+ h += '
';
+ // form
+ h += '
';
+ h += '
`);
- puter.workers.create(
- worker_name,
- target_dir_path).then((res)=>{
- let url = 'https://' + worker_name + '.puter.work';
- $(el_window).find('.window-publishWorker-form').hide(100, function(){
- $(el_window).find('.publishWorker-published-link').attr('href', url);
- $(el_window).find('.publishWorker-published-link').text(url);
- $(el_window).find('.window-publishWorker-success').show(100)
- $(`.item[data-uid="${target_dir_uid}"] .item-has-website-badge`).show();
- });
+ puter.workers.create(worker_name,
+ target_dir_path).then((res) => {
+ let url = `https://${ worker_name }.puter.work`;
+ $(el_window).find('.window-publishWorker-form').hide(100, function () {
+ $(el_window).find('.publishWorker-published-link').attr('href', url);
+ $(el_window).find('.publishWorker-published-link').text(url);
+ $(el_window).find('.window-publishWorker-success').show(100);
+ $(`.item[data-uid="${target_dir_uid}"] .item-has-website-badge`).show();
+ });
- // find all items whose path starts with target_dir_path
- $(`.item[data-path^="${target_dir_path}/"]`).each(function(){
- // show the link badge
- $(this).find('.item-has-website-url-badge').show();
- // update item's website_url attribute
- $(this).attr('data-website_url', url + $(this).attr('data-path').substring(target_dir_path.length));
- })
- }).catch((err)=>{
- err = err.error;
- $(el_window).find('.publish-worker-error-msg').html(
- err.message + (
- err.code === 'subdomain_limit_reached' ?
- ' ' + i18n('manage_your_subdomains') + ' ' : ''
- )
- );
- $(el_window).find('.publish-worker-error-msg').fadeIn();
- // re-enable 'Publish' button and restore original text
- $(el_window).find('.publish-btn').prop('disabled', false).text(originalText);
- })
- })
+ // find all items whose path starts with target_dir_path
+ $(`.item[data-path^="${target_dir_path}/"]`).each(function () {
+ // show the link badge
+ $(this).find('.item-has-website-url-badge').show();
+ // update item's website_url attribute
+ $(this).attr('data-website_url', url + $(this).attr('data-path').substring(target_dir_path.length));
+ });
+ }).catch((err) => {
+ err = err.error;
+ $(el_window).find('.publish-worker-error-msg').html(
+ err.message + (
+ err.code === 'subdomain_limit_reached' ?
+ ` ${ i18n('manage_your_subdomains') } ` : ''
+ ));
+ $(el_window).find('.publish-worker-error-msg').fadeIn();
+ // re-enable 'Publish' button and restore original text
+ $(el_window).find('.publish-btn').prop('disabled', false).text(originalText);
+ });
+ });
- $(el_window).find('.publish-window-ok-btn').on('click', function(){
+ $(el_window).find('.publish-window-ok-btn').on('click', function () {
$(el_window).close();
- })
+ });
}
-$(document).on('click', '.manage-your-websites-link', async function(e){
+$(document).on('click', '.manage-your-websites-link', async function (e) {
UIWindowMyWebsites();
-})
-
+});
-export default UIWindowPublishWorker
\ No newline at end of file
+export default UIWindowPublishWorker;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowQR.js b/src/gui/src/UI/UIWindowQR.js
index b3275327f0..73b24a87ce 100644
--- a/src/gui/src/UI/UIWindowQR.js
+++ b/src/gui/src/UI/UIWindowQR.js
@@ -7,12 +7,12 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see ×
`;
- h += ``;
- h += `
${
- i18n(options.message_i18n_key || 'scan_qr_generic')
- } `;
- h += ``;
+ h += ' ×
';
+ h += '';
+ h += `
${
+ i18n(options.message_i18n_key || 'scan_qr_generic')
+ } `;
+ h += '';
h += placeholder_qr.html;
@@ -69,7 +69,7 @@ async function UIWindowQR(options){
'backdrop-filter': 'blur(3px)',
padding: '50px 20px',
},
- })
+ });
const component_qr = new QRCodeView({
value: options.text,
@@ -79,10 +79,10 @@ async function UIWindowQR(options){
const component_flexer = new Flexer({
children: [
component_qr,
- ]
+ ],
});
component_flexer.attach(placeholder_qr);
}
-export default UIWindowQR
\ No newline at end of file
+export default UIWindowQR;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowRecoverPassword.js b/src/gui/src/UI/UIWindowRecoverPassword.js
index 349261b413..fe6f9bf529 100644
--- a/src/gui/src/UI/UIWindowRecoverPassword.js
+++ b/src/gui/src/UI/UIWindowRecoverPassword.js
@@ -7,34 +7,34 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see `;
- h += `
${i18n('recover_password')} `;
- h += `
`;
- h += `
';
+ h += `
${i18n('recover_password')} `;
+ h += '
';
+ h += '
`;
- h += `
×
`;
- h += `
`;
- h += `
${i18n('refer_friends_c2a')}
`;
- h += `
${i18n('invite_link')} `;
- h += `
`;
- h += `
${i18n('copy_link')} `
- h += `
`;
- h += `
';
+ h += '
×
';
+ h += `
`;
+ h += `
${i18n('refer_friends_c2a')}
`;
+ h += `
${i18n('invite_link')} `;
+ h += '
';
+ h += `
${i18n('copy_link')} `;
+ h += `
`;
+ h += '
`;
- social_links_html += `
${i18n('share_to')}
`
- social_links_html += `
`
- social_links_html += `
`
- social_links_html += `
`
- social_links_html += `
`
- social_links_html += `
`
- social_links_html += `
`
+ let social_links_html = '';
+ social_links_html += '
';
+ social_links_html += `
${i18n('share_to')}
`;
+ social_links_html += `
`;
+ social_links_html += `
`;
+ social_links_html += `
`;
+ social_links_html += `
`;
+ social_links_html += `
`;
+ social_links_html += `
`;
social_links_html += '
';
UIPopover({
@@ -90,18 +90,18 @@ async function UIWindowRefer(options){
// width: 300,
height: 100,
position: 'bottom',
- });
- })
+ });
+ });
- $(el_window).find('.window-body .copy-downloadable-link').on('click', async function(e){
+ $(el_window).find('.window-body .copy-downloadable-link').on('click', async function (e) {
var copy_btn = this;
- if (navigator.clipboard) {
+ if ( navigator.clipboard ) {
// Get link text
const selected_text = $(el_window).find('.window-body .downloadable-link').val();
// copy selected text to clipboard
await navigator.clipboard.writeText(selected_text);
}
- else{
+ else {
// Get the text field
$(el_window).find('.window-body .downloadable-link').select();
// Copy the text inside the text field
@@ -109,10 +109,10 @@ async function UIWindowRefer(options){
}
$(this).html(i18n('link_copied'));
- setTimeout(function(){
+ setTimeout(function () {
$(copy_btn).html(i18n('copy_link'));
}, 1000);
});
}
-export default UIWindowRefer
\ No newline at end of file
+export default UIWindowRefer;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowRequestPermission.js b/src/gui/src/UI/UIWindowRequestPermission.js
index f700dc8734..528ada0f2b 100644
--- a/src/gui/src/UI/UIWindowRequestPermission.js
+++ b/src/gui/src/UI/UIWindowRequestPermission.js
@@ -7,25 +7,25 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
import UIWindow from './UIWindow.js';
-async function UIWindowRequestPermission(options) {
+async function UIWindowRequestPermission (options) {
options = options ?? {};
options.reload_on_success = options.reload_on_success ?? false;
-
- return new Promise((resolve) => {
+
+ return new Promise((resolve) => {
get_permission_description(options.permission).then((permission_description) => {
- if (!permission_description) {
+ if ( ! permission_description ) {
resolve(false);
return;
}
@@ -40,7 +40,7 @@ async function UIWindowRequestPermission(options) {
/**
* Creates the permission dialog
*/
-async function create_permission_window(options, permission_description, resolve) {
+async function create_permission_window (options, permission_description, resolve) {
const requestingEntity = options.app_name ?? options.origin;
const h = create_window_content(requestingEntity, permission_description);
@@ -66,7 +66,8 @@ async function create_permission_window(options, permission_description, resolve
width: 350,
dominant: true,
on_close: () => resolve(false),
- onAppend: function(this_window) {},
+ onAppend: function (this_window) {
+ },
window_class: 'window-login',
window_css: {
height: 'initial',
@@ -76,66 +77,66 @@ async function create_permission_window(options, permission_description, resolve
padding: '0',
'background-color': 'rgba(231, 238, 245, .95)',
'backdrop-filter': 'blur(3px)',
- }
+ },
});
}
/**
* Creates HTML content for permission dialog
*/
-function create_window_content(requestingEntity, permission_description) {
- let h = ``;
- h += `
`;
- h += `
`;
- // title
- h += `
${html_encode(requestingEntity)} `;
-
- // show the real description of action
- h += `
${html_encode(requestingEntity)} is requesting for permission to ${html_encode(permission_description)}
`;
-
- // Allow/Don't Allow
- h += `
${i18n('allow')} `;
- h += `
${i18n('dont_allow')} `;
- h += `
`;
- h += `
`;
+function create_window_content (requestingEntity, permission_description) {
+ let h = '';
+ h += '
';
+ h += '
';
+ // title
+ h += `
${html_encode(requestingEntity)} `;
+
+ // show the real description of action
+ h += `
${html_encode(requestingEntity)} is requesting for permission to ${html_encode(permission_description)}
`;
+
+ // Allow/Don't Allow
+ h += `
${i18n('allow')} `;
+ h += `
${i18n('dont_allow')} `;
+ h += '
';
+ h += '
';
return h;
}
/**
* Sets up event handlers for permission dialog
*/
-async function setup_window_events(el_window, options, resolve) {
- $(el_window).find('.app-auth-allow').on('click', async function(e) {
+async function setup_window_events (el_window, options, resolve) {
+ $(el_window).find('.app-auth-allow').on('click', async function (e) {
$(this).addClass('disabled');
try {
// register granted permission to app or website
- const res = await fetch(window.api_origin + "/auth/grant-user-app", {
+ const res = await fetch(`${window.api_origin }/auth/grant-user-app`, {
headers: {
- "Content-Type": "application/json",
- "Authorization": "Bearer " + window.auth_token,
+ 'Content-Type': 'application/json',
+ 'Authorization': `Bearer ${ window.auth_token}`,
},
body: JSON.stringify({
app_uid: options.app_uid,
origin: options.origin,
- permission: options.permission
+ permission: options.permission,
}),
- method: "POST",
+ method: 'POST',
});
- if (!res.ok) {
+ if ( ! res.ok ) {
throw new Error(`HTTP error! Status: ${res.status}`);
}
$(el_window).close();
resolve(true);
- } catch (err) {
+ } catch ( err ) {
console.error(err);
- resolve(err);
+ resolve(err);
}
});
- $(el_window).find('.app-auth-dont-allow').on('click', function(e) {
+ $(el_window).find('.app-auth-dont-allow').on('click', function (e) {
$(this).addClass('disabled');
$(el_window).close();
resolve(false);
@@ -144,34 +145,34 @@ async function setup_window_events(el_window, options, resolve) {
/**
* Generates user-friendly description of permission string. Currently handles:
- * fs:UUID-OF-FILE:read, thread:UUID-OF-THREAD:post, service:name-of-service:ii:name-of-interface, driver:driver-name:action-name
+ * fs:UUID-OF-FILE:read, thread:UUID-OF-THREAD:post, service:name-of-service:ii:name-of-interface, driver:driver-name:action-name
*/
-async function get_permission_description(permission) {
+async function get_permission_description (permission) {
const parts = split_permission(permission);
const [resource_type, resource_id, action, interface_name = null] = parts;
let fsentry;
- if (resource_type === "fs") {
+ if ( resource_type === 'fs' ) {
fsentry = await puter.fs.stat({ uid: resource_id, consistency: 'eventual' });
- }
-
+ }
+
const permission_mappings = {
- "fs": fsentry ? `use ${fsentry.name} located at ${fsentry.dirpath} with ${action} access.` : null,
- "thread": action === "post" ? `post to thread ${resource_id}.` : null,
- "service": action === "ii" ? `use ${resource_id} to invoke ${interface_name}.` : null,
- "driver": `use ${resource_id} to ${action}.`,
+ 'fs': fsentry ? `use ${fsentry.name} located at ${fsentry.dirpath} with ${action} access.` : null,
+ 'thread': action === 'post' ? `post to thread ${resource_id}.` : null,
+ 'service': action === 'ii' ? `use ${resource_id} to invoke ${interface_name}.` : null,
+ 'driver': `use ${resource_id} to ${action}.`,
};
return permission_mappings[resource_type];
}
-function split_permission(permission) {
+function split_permission (permission) {
return permission
.split(':')
.map(unescape_permission_component);
}
-function unescape_permission_component(component) {
+function unescape_permission_component (component) {
let unescaped_str = '';
// Constant for unescaped permission component string
const STATE_NORMAL = {};
@@ -179,15 +180,15 @@ function unescape_permission_component(component) {
const STATE_ESCAPE = {};
let state = STATE_NORMAL;
const const_escapes = { C: ':' };
- for (let i = 0; i < component.length; i++) {
+ for ( let i = 0; i < component.length; i++ ) {
const c = component[i];
- if (state === STATE_NORMAL) {
- if (c === '\\') {
+ if ( state === STATE_NORMAL ) {
+ if ( c === '\\' ) {
state = STATE_ESCAPE;
} else {
unescaped_str += c;
}
- } else if (state === STATE_ESCAPE) {
+ } else if ( state === STATE_ESCAPE ) {
unescaped_str += const_escapes.hasOwnProperty(c) ? const_escapes[c] : c;
state = STATE_NORMAL;
}
diff --git a/src/gui/src/UI/UIWindowSaveAccount.js b/src/gui/src/UI/UIWindowSaveAccount.js
index 340816d3a9..0edf888a1c 100644
--- a/src/gui/src/UI/UIWindowSaveAccount.js
+++ b/src/gui/src/UI/UIWindowSaveAccount.js
@@ -7,20 +7,20 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
-import UIWindow from './UIWindow.js'
-import UIWindowEmailConfirmationRequired from './UIWindowEmailConfirmationRequired.js'
+import UIWindow from './UIWindow.js';
+import UIWindowEmailConfirmationRequired from './UIWindowEmailConfirmationRequired.js';
-async function UIWindowSaveAccount(options){
+async function UIWindowSaveAccount (options) {
const internal_id = window.uuidv4();
options = options ?? {};
options.reload_on_success = options.reload_on_success ?? false;
@@ -28,48 +28,48 @@ async function UIWindowSaveAccount(options){
return new Promise(async (resolve) => {
let h = '';
- h += `
`;
- h += `
×
`;
-
- // success
- h += `
`;
- h += `
`;
- h += `
${i18n('session_saved')}
`;
- h += `
${i18n('ok')} `
- h+= `
`;
-
- // form
- h += `
`;
- h += `
`;
+ h += '
';
+ h += '
×
';
+
+ // success
+ h += '
';
+ h += `
`;
+ h += `
${i18n('session_saved')}
`;
+ h += `
${i18n('ok')} `;
+ h += '
';
+
+ // form
+ h += '
';
+ h += '
';
const el_window = await UIWindow({
title: null,
@@ -93,38 +93,42 @@ async function UIWindowSaveAccount(options){
dominant: true,
show_in_taskbar: false,
...options.window_options,
- onAppend: function(this_window){
- if(options.default_username)
- $(this_window).find('.email').get(0).focus({preventScroll:true});
+ onAppend: function (this_window) {
+ if ( options.default_username )
+ {
+ $(this_window).find('.email').get(0).focus({ preventScroll: true });
+ }
else
- $(this_window).find('.username').get(0).focus({preventScroll:true});
+ {
+ $(this_window).find('.username').get(0).focus({ preventScroll: true });
+ }
},
window_class: 'window-save-account',
- window_css:{
+ window_css: {
height: 'initial',
},
- on_close: ()=>{
- resolve(false)
+ on_close: () => {
+ resolve(false);
},
body_css: {
width: 'initial',
'background-color': 'rgba(231, 238, 245, .95)',
'backdrop-filter': 'blur(3px)',
- }
- })
+ },
+ });
- $(el_window).find('.signup-btn').on('click', function(e){
+ $(el_window).find('.signup-btn').on('click', function (e) {
// todo do some basic validation client-side
//Username
let username = $(el_window).find('.username').val();
-
+
//Email
let email = $(el_window).find('.email').val();
-
+
//Password
let password = $(el_window).find('.password').val();
-
+
// disable 'Create Account' button
$(el_window).find('.signup-btn').prop('disabled', true);
@@ -137,67 +141,67 @@ async function UIWindowSaveAccount(options){
$(el_window).find('input').prop('disabled', true);
$.ajax({
- url: window.api_origin + "/save_account",
+ url: `${window.api_origin }/save_account`,
type: 'POST',
async: true,
- contentType: "application/json",
- data: JSON.stringify({
- username: username,
- email: email,
+ contentType: 'application/json',
+ data: JSON.stringify({
+ username: username,
+ email: email,
password: password,
referrer: options.referrer,
send_confirmation_code: options.send_confirmation_code,
}),
headers: {
- "Authorization": "Bearer "+window.auth_token
- },
- success: async function (data){
- window.dispatchEvent(new CustomEvent('account-saved', { detail: { data: data} }));
+ 'Authorization': `Bearer ${window.auth_token}`,
+ },
+ success: async function (data) {
+ window.dispatchEvent(new CustomEvent('account-saved', { detail: { data: data } }));
- window.update_auth_data(data.token, data.user)
+ window.update_auth_data(data.token, data.user);
//close this window
- if(data.user.email_confirmation_required){
+ if ( data.user.email_confirmation_required ) {
let is_verified = await UIWindowEmailConfirmationRequired({
- stay_on_top: true,
- has_head: true
+ stay_on_top: true,
+ has_head: true,
});
resolve(is_verified);
- }else{
+ } else {
resolve(true);
}
- $(el_window).find('.save-account-form').hide(100, ()=>{
+ $(el_window).find('.save-account-form').hide(100, () => {
$(el_window).find('.save-account-success').show(100);
- })
+ });
$(el_window).find('input').prop('disabled', false);
},
- error: function (err){
+ error: function (err) {
$(el_window).find('.signup-error-msg').html(html_encode(err.responseText));
$(el_window).find('.signup-error-msg').fadeIn();
// re-enable 'Create Account' button
$(el_window).find('.signup-btn').prop('disabled', false);
$(el_window).find('input').prop('disabled', false);
- }
+ },
});
- })
+ });
- $(el_window).find('.signup-form').on('submit', function(e){
+ $(el_window).find('.signup-form').on('submit', function (e) {
e.preventDefault();
e.stopPropagation();
return false;
- })
-
- $(el_window).find('.save-account-success-ok-btn').on('click', ()=>{
+ });
+
+ $(el_window).find('.save-account-success-ok-btn').on('click', () => {
$(el_window).close();
- })
+ });
//remove login window
$(el_window).find('.signup-c2a-clickable').parents('.window').close();
- })
+ });
}
def(UIWindowSaveAccount, 'ui.UISaveAccount');
-export default UIWindowSaveAccount
\ No newline at end of file
+export default UIWindowSaveAccount;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowSearch.js b/src/gui/src/UI/UIWindowSearch.js
index 60504ce156..f94428cdbc 100644
--- a/src/gui/src/UI/UIWindowSearch.js
+++ b/src/gui/src/UI/UIWindowSearch.js
@@ -7,30 +7,30 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
-import UIWindow from './UIWindow.js'
-import path from "../lib/path.js"
-import UIAlert from './UIAlert.js'
-import launch_app from '../helpers/launch_app.js'
-import item_icon from '../helpers/item_icon.js'
-import UIContextMenu from './UIContextMenu.js'
+import UIWindow from './UIWindow.js';
+import path from '../lib/path.js';
+import UIAlert from './UIAlert.js';
+import launch_app from '../helpers/launch_app.js';
+import item_icon from '../helpers/item_icon.js';
+import UIContextMenu from './UIContextMenu.js';
-async function UIWindowSearch(options){
+async function UIWindowSearch (options) {
let h = '';
- h += `
`;
- h += `
`;
- h += `
`;
+ h += '
';
+ h += `
';
+ h += '
';
const el_window = await UIWindow({
icon: null,
@@ -69,13 +69,13 @@ async function UIWindowSearch(options){
'overflow': 'hidden',
'min-height': '65px',
'padding-bottom': '10px',
- }
+ },
});
$(el_window).find('.search-input').focus();
// Debounce function to limit rate of API calls
- function debounce(func, wait) {
+ function debounce (func, wait) {
let timeout;
return function (...args) {
const context = this;
@@ -90,42 +90,46 @@ async function UIWindowSearch(options){
let isSearching = false;
// Debounced search function
- const performSearch = debounce(async function(searchInput, resultsContainer) {
+ const performSearch = debounce(async function (searchInput, resultsContainer) {
// Don't search if input is empty
- if (searchInput.val() === '') {
+ if ( searchInput.val() === '' ) {
resultsContainer.html('');
resultsContainer.hide();
return;
}
// Set loading state
- if (!isSearching) {
+ if ( ! isSearching ) {
isSearching = true;
}
try {
// Perform the search
- let results = await fetch(window.api_origin + '/search', {
+ let results = await fetch(`${window.api_origin }/search`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
- 'Authorization': `Bearer ${puter.authToken}`
+ 'Authorization': `Bearer ${puter.authToken}`,
},
- body: JSON.stringify({ text: searchInput.val() })
+ body: JSON.stringify({ text: searchInput.val() }),
});
results = await results.json();
// Hide results if there are none
- if(results.length === 0)
+ if ( results.length === 0 )
+ {
resultsContainer.hide();
+ }
else
+ {
resultsContainer.show();
+ }
// Build results HTML
let h = '';
- for(let i = 0; i < results.length; i++){
+ for ( let i = 0; i < results.length; i++ ) {
const result = results[i];
h += `
`;
h += html_encode(result.name);
- h += `
`;
+ h += '
';
}
resultsContainer.html(h);
- } catch (error) {
+ } catch ( error ) {
resultsContainer.html('
Search failed. Please try again.
');
console.error('Search error:', error);
} finally {
@@ -148,24 +152,24 @@ async function UIWindowSearch(options){
}, 300); // Wait 300ms after last keystroke before searching
// Event binding
- $(el_window).find('.search-input').on('input', function(e) {
+ $(el_window).find('.search-input').on('input', function (e) {
const searchInput = $(this);
const resultsContainer = $(el_window).find('.search-results');
performSearch(searchInput, resultsContainer);
});
}
-$(document).on('click', '.search-result', async function(e){
+$(document).on('click', '.search-result', async function (e) {
const fspath = $(this).data('path');
const fsuid = $(this).data('uid');
const is_dir = $(this).attr('data-is_dir') === 'true' || $(this).data('is_dir') === '1';
let open_item_meta;
- if(is_dir){
+ if ( is_dir ) {
UIWindow({
path: fspath,
title: path.basename(fspath),
- icon: await item_icon({is_dir: true, path: fspath}),
+ icon: await item_icon({ is_dir: true, path: fspath }),
uid: fsuid,
is_dir: is_dir,
app: 'explorer',
@@ -178,17 +182,17 @@ $(document).on('click', '.search-result', async function(e){
}
// get all info needed to open an item
- try{
+ try {
open_item_meta = await $.ajax({
- url: window.api_origin + "/open_item",
+ url: `${window.api_origin }/open_item`,
type: 'POST',
- contentType: "application/json",
+ contentType: 'application/json',
data: JSON.stringify({
uid: fsuid ?? undefined,
path: fspath ?? undefined,
}),
headers: {
- "Authorization": "Bearer "+window.auth_token
+ 'Authorization': `Bearer ${window.auth_token}`,
},
statusCode: {
401: function () {
@@ -196,39 +200,38 @@ $(document).on('click', '.search-result', async function(e){
},
},
});
- }catch(err){
+ } catch ( err ) {
// Ignored
}
// get a list of suggested apps for this file type.
- let suggested_apps = open_item_meta?.suggested_apps ?? await window.suggest_apps_for_fsentry({uid: fsuid, path: fspath});
-
+ let suggested_apps = open_item_meta?.suggested_apps ?? await window.suggest_apps_for_fsentry({ uid: fsuid, path: fspath });
+
//---------------------------------------------
// No suitable apps, ask if user would like to
// download
//---------------------------------------------
- if(suggested_apps.length === 0){
+ if ( suggested_apps.length === 0 ) {
//---------------------------------------------
// If .zip file, unzip it
//---------------------------------------------
- if(path.extname(fspath) === '.zip'){
+ if ( path.extname(fspath) === '.zip' ) {
window.unzipItem(fspath);
return;
}
- const alert_resp = await UIAlert(
- 'Found no suitable apps to open this file with. Would you like to download it instead?',
- [
- {
- label: i18n('download_file'),
- value: 'download_file',
- type: 'primary',
+ const alert_resp = await UIAlert('Found no suitable apps to open this file with. Would you like to download it instead?',
+ [
+ {
+ label: i18n('download_file'),
+ value: 'download_file',
+ type: 'primary',
- },
- {
- label: i18n('cancel')
- }
- ])
- if(alert_resp === 'download_file'){
+ },
+ {
+ label: i18n('cancel'),
+ },
+ ]);
+ if ( alert_resp === 'download_file' ) {
window.trigger_download([fspath]);
}
return;
@@ -236,9 +239,9 @@ $(document).on('click', '.search-result', async function(e){
//---------------------------------------------
// First suggested app is default app to open this item
//---------------------------------------------
- else{
+ else {
launch_app({
- name: suggested_apps[0].name,
+ name: suggested_apps[0].name,
token: open_item_meta.token,
file_path: fspath,
app_obj: suggested_apps[0],
@@ -249,40 +252,39 @@ $(document).on('click', '.search-result', async function(e){
});
}
-
// close
$(this).closest('.window').close();
-})
+});
// Context menu for search results
-$(document).on('contextmenu', '.search-result', async function(e){
+$(document).on('contextmenu', '.search-result', async function (e) {
e.preventDefault();
e.stopPropagation();
-
+
const fspath = $(this).data('path');
const fsuid = $(this).data('uid');
const is_dir = $(this).attr('data-is_dir') === 'true' || $(this).data('is_dir') === '1';
-
+
// Get the parent directory path
const parent_path = path.dirname(fspath);
-
+
// Build context menu items
const menuItems = [
{
html: i18n('open'),
- onClick: async function() {
+ onClick: async function () {
// Trigger the same logic as clicking on the search result
$(e.target).trigger('click');
- }
- }
+ },
+ },
];
-
+
// Only add "Open enclosing folder" if we're not already at root
- if (parent_path && parent_path !== fspath && parent_path !== '/') {
+ if ( parent_path && parent_path !== fspath && parent_path !== '/' ) {
menuItems.push('-'); // divider
menuItems.push({
html: i18n('open_containing_folder'),
- onClick: async function() {
+ onClick: async function () {
// Open the enclosing folder
UIWindow({
path: parent_path,
@@ -291,16 +293,16 @@ $(document).on('contextmenu', '.search-result', async function(e){
is_dir: true,
app: 'explorer',
});
-
+
// Close search window
$(e.target).closest('.window').close();
- }
+ },
});
}
-
+
UIContextMenu({
- items: menuItems
+ items: menuItems,
});
-})
+});
-export default UIWindowSearch
\ No newline at end of file
+export default UIWindowSearch;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowSessionList.js b/src/gui/src/UI/UIWindowSessionList.js
index 77f6eab9c2..957a67ce5b 100644
--- a/src/gui/src/UI/UIWindowSessionList.js
+++ b/src/gui/src/UI/UIWindowSessionList.js
@@ -7,44 +7,44 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
-import UIWindow from './UIWindow.js'
-import UIWindowLogin from './UIWindowLogin.js'
-import UIWindowSignup from './UIWindowSignup.js'
+import UIWindow from './UIWindow.js';
+import UIWindowLogin from './UIWindowLogin.js';
+import UIWindowSignup from './UIWindowSignup.js';
-async function UIWindowSessionList(options){
+async function UIWindowSessionList (options) {
options = options ?? {};
options.reload_on_success = options.reload_on_success ?? true;
return new Promise(async (resolve) => {
let h = '';
- h += `
`;
- // loading indicator
- h += `
${i18n('signing_in')}
`;
- // session list
- h += `
`;
- // c2a
- h += `
Log Into Another Account • ${i18n('create_account')}
`;
- h += `
`;
+ h += '
';
+ // loading indicator
+ h += `
${i18n('signing_in')}
`;
+ // session list
+ h += '
';
+ // c2a
+ h += `
Log Into Another Account • ${i18n('create_account')}
`;
+ h += '
';
const el_window = await UIWindow({
title: i18n('window_title_session_list'),
@@ -79,10 +79,10 @@ async function UIWindowSessionList(options){
'flex-direction': 'column',
'justify-content': 'center',
},
- })
- $(el_window).find('.login-c2a-session-list').on('click', async function(e){
+ });
+ $(el_window).find('.login-c2a-session-list').on('click', async function (e) {
const login = await UIWindowLogin({
- referrer: options.referrer,
+ referrer: options.referrer,
reload_on_success: options.reload_on_success,
cover_page: options.cover_page ?? false,
has_head: options.has_head,
@@ -90,20 +90,20 @@ async function UIWindowSessionList(options){
window_options: {
has_head: false,
cover_page: options.cover_page ?? false,
- }
+ },
});
- if(login){
- if(options.reload_on_success){
+ if ( login ) {
+ if ( options.reload_on_success ) {
// disable native browser exit confirmation
- window.onbeforeunload = null;
+ window.onbeforeunload = null;
// refresh
location.reload();
- }else{
+ } else {
resolve(login);
}
}
- })
- $(el_window).find('.signup-c2a-session-list').on('click', async function(e){
+ });
+ $(el_window).find('.signup-c2a-session-list').on('click', async function (e) {
$('.signup-c2a-clickable').parents('.window').close();
// create Signup window
const signup = await UIWindowSignup({
@@ -113,47 +113,47 @@ async function UIWindowSessionList(options){
window_options: {
has_head: false,
cover_page: options.cover_page ?? false,
- }
+ },
});
- if(signup){
- if(options.reload_on_success){
+ if ( signup ) {
+ if ( options.reload_on_success ) {
// disable native browser exit confirmation
- window.onbeforeunload = null;
+ window.onbeforeunload = null;
// refresh
location.reload();
- }else{
+ } else {
resolve(signup);
}
}
- })
+ });
- $(el_window).find('.session-entry').on('click', function(e){
- $(el_window).find('.loading').css({display: 'flex'});
+ $(el_window).find('.session-entry').on('click', function (e) {
+ $(el_window).find('.loading').css({ display: 'flex' });
setTimeout(() => {
let selected_uuid = $(this).attr('data-uuid');
let selected_user;
- for (let index = 0; index < window.logged_in_users.length; index++) {
+ for ( let index = 0; index < window.logged_in_users.length; index++ ) {
const l_user = window.logged_in_users[index];
- if(l_user.uuid === selected_uuid){
+ if ( l_user.uuid === selected_uuid ) {
selected_user = l_user;
}
}
// new logged in user
window.update_auth_data(selected_user.auth_token, selected_user);
- if(options.reload_on_success){
+ if ( options.reload_on_success ) {
// disable native browser exit confirmation
- window.onbeforeunload = null;
+ window.onbeforeunload = null;
// refresh
location.reload();
- }else{
+ } else {
resolve(true);
}
}, 500);
- })
- })
+ });
+ });
}
-export default UIWindowSessionList
\ No newline at end of file
+export default UIWindowSessionList;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowShare.js b/src/gui/src/UI/UIWindowShare.js
index dda3305373..a99c02d347 100644
--- a/src/gui/src/UI/UIWindowShare.js
+++ b/src/gui/src/UI/UIWindowShare.js
@@ -18,88 +18,92 @@
*/
import UIWindow from './UIWindow.js';
-async function UIWindowShare(items, recipient){
+async function UIWindowShare (items, recipient) {
return new Promise(async (resolve) => {
let h = '';
- h += `
`;
+ h += '
';
const el_window = await UIWindow({
title: i18n('Share With…'),
@@ -116,8 +120,8 @@ async function UIWindowShare(items, recipient){
init_center: true,
allow_native_ctxmenu: true,
allow_user_select: true,
- onAppend: function(this_window){
- $(this_window).find(`.access-recipient`).get(0).focus({preventScroll:true});
+ onAppend: function (this_window) {
+ $(this_window).find('.access-recipient').get(0).focus({ preventScroll: true });
},
window_class: 'window-give-access',
width: 550,
@@ -129,31 +133,31 @@ async function UIWindowShare(items, recipient){
height: '100%',
'background-color': 'rgb(245 247 249)',
'backdrop-filter': 'blur(3px)',
- }
- })
+ },
+ });
let contacts = [];
// get contacts
puter.kv.get('contacts').then((kv_contacts) => {
- if(kv_contacts){
- try{
+ if ( kv_contacts ) {
+ try {
contacts = JSON.parse(kv_contacts);
$(el_window).find('.access-recipient').autocomplete({
- source: contacts
+ source: contacts,
});
- }catch(e){
+ } catch (e) {
puter.kv.del('contacts');
}
}
- })
+ });
// /stat
let perms = [];
let printed_users = [];
- for(let i=0; i
`
- perm_list += `${i18n('Owner')}
`;
- if(fsentry.owner.username === window.user.username)
- perm_list += `You (${fsentry.owner.email ?? fsentry.owner.username})`;
- else
- perm_list += fsentry.owner.email ?? fsentry.owner.username;
- perm_list += ` `;
+ if ( ! printed_users.includes(fsentry.owner.username) ) {
+ perm_list += '
';
+ perm_list += `
${i18n('Owner')}
`;
+ if ( fsentry.owner.username === window.user.username )
+ {
+ perm_list += `You (${fsentry.owner.email ?? fsentry.owner.username})`;
+ }
+ else
+ {
+ perm_list += fsentry.owner.email ?? fsentry.owner.username;
+ }
+ perm_list += '
';
// add this user to the list of printed users
printed_users.push(fsentry.owner.username);
}
- if(recipients.length > 0){
+ if ( recipients.length > 0 ) {
recipients.forEach((recipient) => {
// others with access
- if(recipients.length > 0){
+ if ( recipients.length > 0 ) {
recipients.forEach(perm => {
//check if this user has been printed here before, important for multiple items
- if(!printed_users.includes(perm.user.username)){
- perm_list += `
`
- // viewer/editor
- perm_list += `
`;
- if(perm.access === 'read')
- perm_list += `${i18n('Viewer')} `;
- else if(perm.access === 'write')
- perm_list += `${i18n('Editor')} `;
- else if(perm.access === 'manager')
- perm_list += `${i18n('Manager')} `;
- perm_list += `
`;
- // username
- perm_list += `${perm.user.email ?? perm.user.username}`;
- perm_list += `
✕
`;
-
- perm_list += `
`;
+ if ( ! printed_users.includes(perm.user.username) ) {
+ perm_list += `
`;
+ // viewer/editor
+ perm_list += '
';
+ if ( perm.access === 'read' )
+ {
+ perm_list += `${i18n('Viewer')} `;
+ }
+ else if ( perm.access === 'write' )
+ {
+ perm_list += `${i18n('Editor')} `;
+ }
+ else if ( perm.access === 'manager' )
+ {
+ perm_list += `${i18n('Manager')} `;
+ }
+ perm_list += '
';
+ // username
+ perm_list += `${perm.user.email ?? perm.user.username}`;
+ perm_list += `
✕
`;
+
+ perm_list += '
';
// add this user to the list of printed users
printed_users.push(perm.user.username);
@@ -206,14 +220,14 @@ async function UIWindowShare(items, recipient){
}
});
}
- $(el_window).find('.share-recipients').append(`${perm_list}`);
- }).
- catch((err) => {
- // console.error(err);
+ $(el_window).find('.share-recipients').append(`${perm_list}`);
})
+ .catch((err) => {
+ // console.error(err);
+ });
}
- $(el_window).find('.give-access-btn').on('click', async function(e){
+ $(el_window).find('.give-access-btn').on('click', async function (e) {
e.preventDefault();
e.stopPropagation();
@@ -223,36 +237,42 @@ async function UIWindowShare(items, recipient){
let recipient_id = $(el_window).find('.access-recipient').val();
// todo do some basic validation client-side
- if(!recipient_id)
+ if ( ! recipient_id )
+ {
return;
+ }
- if(is_email(recipient_id))
+ if ( is_email(recipient_id) )
+ {
recipient_email = recipient_id;
+ }
else
+ {
recipient_username = recipient_id;
+ }
// see if the recipient is already in the list
let recipient_already_in_list = false;
- $(el_window).find('.item-perm-recipient-card').each(function(){
- if((recipient_username && $(this).data('recipient-username') === recipient_username) ||(recipient_email && $(this).data('recipient-email') === recipient_email)){
+ $(el_window).find('.item-perm-recipient-card').each(function () {
+ if ( (recipient_username && $(this).data('recipient-username') === recipient_username) || (recipient_email && $(this).data('recipient-email') === recipient_email) ) {
recipient_already_in_list = true;
return false;
}
- })
+ });
- if(recipient_already_in_list){
+ if ( recipient_already_in_list ) {
$(el_window).find('.error').html(i18n('This user already has access to this item'));
$(el_window).find('.error').fadeIn();
return;
}
// can't share with self
- if(recipient_username === window.user.username){
+ if ( recipient_username === window.user.username ) {
$(el_window).find('.error').html(i18n("You can't share with yourself."));
$(el_window).find('.error').fadeIn();
return;
}
- else if(recipient_email && recipient_email === window.user.email){
+ else if ( recipient_email && recipient_email === window.user.email ) {
$(el_window).find('.error').html(i18n("You can't share with yourself."));
$(el_window).find('.error').fadeIn();
return;
@@ -264,35 +284,39 @@ async function UIWindowShare(items, recipient){
let cancelled_due_to_error = false;
let share_result;
let access_level = 'write';
-
- if($(el_window).find('.access-type').val() === 'Viewer')
+
+ if ( $(el_window).find('.access-type').val() === 'Viewer' )
+ {
access_level = 'read';
- else if($(el_window).find('.access-type').val() === 'Manager')
+ }
+ else if ( $(el_window).find('.access-type').val() === 'Manager' )
+ {
access_level = 'manage';
+ }
$.ajax({
- url: puter.APIOrigin + "/share",
- type: "POST",
+ url: `${puter.APIOrigin }/share`,
+ type: 'POST',
headers: {
- "Content-Type": "application/json",
- "Authorization": "Bearer " + puter.authToken
+ 'Content-Type': 'application/json',
+ 'Authorization': `Bearer ${ puter.authToken}`,
},
data: JSON.stringify({
- recipients:[
- recipient_username || recipient_email
+ recipients: [
+ recipient_username || recipient_email,
],
shares: [
{
$: 'fs-share',
path: items[0].path,
access: access_level,
- }
- ]
+ },
+ ],
}),
- success: function(response) {
- if (response.status === "mixed") {
+ success: function (response) {
+ if ( response.status === 'mixed' ) {
response.recipients.forEach(recipient => {
- if (recipient.code === "user_does_not_exist") {
+ if ( recipient.code === 'user_does_not_exist' ) {
$(el_window).find('.error').html(recipient.message);
$(el_window).find('.error').fadeIn();
cancelled_due_to_error = true;
@@ -303,103 +327,109 @@ async function UIWindowShare(items, recipient){
$(el_window).find('.access-recipient-print').html(recipient_id);
let perm_id;
- if(access_level === 'manage'){
+ if ( access_level === 'manage' ) {
perm_id = `manage:fs:${items[0].uid}`;
}
- else{
+ else {
perm_id = `fs:${items[0].uid}:${access_level}`;
}
-
+
// append recipient to list
let perm_list = '';
- perm_list += `
`
- // viewer/editor
- perm_list += `
`;
- if(access_level === 'read')
- perm_list += `${i18n('Viewer')} `;
- else if(access_level === 'write')
- perm_list += `${i18n('Editor')} `;
- else if(access_level === 'manage')
- perm_list += `${i18n('Manager')} `;
- perm_list += `
`;
- // recipient username
- perm_list += `${recipient_username}`;
- perm_list += `
✕
`;
- perm_list += `
`;
-
+ perm_list += `
`;
+ // viewer/editor
+ perm_list += '
';
+ if ( access_level === 'read' )
+ {
+ perm_list += `${i18n('Viewer')} `;
+ }
+ else if ( access_level === 'write' )
+ {
+ perm_list += `${i18n('Editor')} `;
+ }
+ else if ( access_level === 'manage' )
+ {
+ perm_list += `${i18n('Manager')} `;
+ }
+ perm_list += '
';
+ // recipient username
+ perm_list += `${recipient_username}`;
+ perm_list += `
✕
`;
+ perm_list += '
';
+
// reset input
$(el_window).find('.error').hide();
$(el_window).find('.access-recipient').val('');
-
+
// disable 'Give Access' button
$(el_window).find('.give-access-btn').prop('disabled', true);
-
+
// append recipient to list
$(el_window).find('.share-recipients').append(`${perm_list}`);
-
+
// add to contacts
- if(!contacts.includes(recipient_username)){
+ if ( ! contacts.includes(recipient_username) ) {
contacts.push(recipient_username);
puter.kv.set('contacts', JSON.stringify(contacts));
}
}
},
- error: function(err) {
- // at this point 'username_not_found' and 'shared_with_self' are the only
+ error: function (err) {
+ // at this point 'username_not_found' and 'shared_with_self' are the only
// errors that need to stop the loop
- if(err.responseJSON.code === "user_does_not_exist" || err.responseJSON.code === 'shared_with_self'){
+ if ( err.responseJSON.code === 'user_does_not_exist' || err.responseJSON.code === 'shared_with_self' ) {
$(el_window).find('.error').html(err.responseJSON.message);
$(el_window).find('.error').fadeIn();
cancelled_due_to_error = true;
}
// re-enable share button
$(el_window).find('.give-access-btn').prop('disabled', false);
-
- }
+
+ },
});
// finished
- if(!cancelled_due_to_error){
- $(el_window).find(`.access-recipient`).val('');
+ if ( ! cancelled_due_to_error ) {
+ $(el_window).find('.access-recipient').val('');
}
// re-enable share button
- $(el_window).find('.give-access-btn').prop('disabled', false);
+ $(el_window).find('.give-access-btn').prop('disabled', false);
return false;
- })
+ });
- $(el_window).find('.access-recipient').on('input keypress keyup keydown paste', function(){
- if($(this).val() === ''){
+ $(el_window).find('.access-recipient').on('input keypress keyup keydown paste', function () {
+ if ( $(this).val() === '' ) {
$(el_window).find('.give-access-btn').prop('disabled', true);
}
- else{
+ else {
$(el_window).find('.give-access-btn').prop('disabled', false);
}
- })
+ });
- })
+ });
}
-$(document).on('click', '.remove-permission-link', async function(){
+$(document).on('click', '.remove-permission-link', async function () {
let recipient_username = $(this).attr('data-recipient-username');
let permission = $(this).attr('data-permission');
// remove from list. do this first so the user doesn't have to wait for the server
- $('.item-perm-recipient-card[data-recipient-username="'+recipient_username+'"][data-permission="'+permission+'"]').remove();
+ $(`.item-perm-recipient-card[data-recipient-username="${recipient_username}"][data-permission="${permission}"]`).remove();
- fetch(puter.APIOrigin + "/auth/revoke-user-user", {
- "headers": {
- "Content-Type": "application/json",
- "Authorization": `Bearer ${puter.authToken}`,
+ fetch(`${puter.APIOrigin }/auth/revoke-user-user`, {
+ 'headers': {
+ 'Content-Type': 'application/json',
+ 'Authorization': `Bearer ${puter.authToken}`,
},
- "body": JSON.stringify({
+ 'body': JSON.stringify({
permission: permission,
- target_username: recipient_username
+ target_username: recipient_username,
}),
- "method": "POST"
+ 'method': 'POST',
}).then((response) => {
}).catch((err) => {
console.error(err);
- })
-})
-export default UIWindowShare
\ No newline at end of file
+ });
+});
+export default UIWindowShare;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowSignup.js b/src/gui/src/UI/UIWindowSignup.js
index 2faef3f686..46ca9a0381 100644
--- a/src/gui/src/UI/UIWindowSignup.js
+++ b/src/gui/src/UI/UIWindowSignup.js
@@ -7,99 +7,101 @@
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
-import UIWindow from './UIWindow.js'
-import UIWindowLogin from './UIWindowLogin.js'
-import UIWindowEmailConfirmationRequired from './UIWindowEmailConfirmationRequired.js'
-import check_password_strength from '../helpers/check_password_strength.js'
+import UIWindow from './UIWindow.js';
+import UIWindowLogin from './UIWindowLogin.js';
+import UIWindowEmailConfirmationRequired from './UIWindowEmailConfirmationRequired.js';
+import check_password_strength from '../helpers/check_password_strength.js';
-function UIWindowSignup(options){
+function UIWindowSignup (options) {
options = options ?? {};
options.reload_on_success = options.reload_on_success ?? true;
options.has_head = options.has_head ?? true;
- options.send_confirmation_code = options.send_confirmation_code ?? false;
+ options.send_confirmation_code = options.send_confirmation_code ?? false;
options.show_close_button = options.show_close_button ?? true;
return new Promise(async (resolve) => {
const internal_id = window.uuidv4();
-
+
let h = '';
- h += `
`;
- // logo
- h += `
`;
- // close button
- if(!options.has_head && options.show_close_button !== false)
- h += `
×
`;
-
- // Form
- h += `
`;
- // title
- h += `
`;
- // signup form
- h += `
';
+ h += '
';
+ // login link
+ // create account link
+ h += '
';
+ h += `${i18n('log_in')} `;
+ h += '
';
+ h += '
';
const el_window = await UIWindow({
title: null,
@@ -122,15 +124,15 @@ function UIWindowSignup(options){
...options.window_options,
dominant: false,
center: true,
- onAppend: function(el_window){
- $(el_window).find(`.username`).get(0).focus({preventScroll:true});
-
+ onAppend: function (el_window) {
+ $(el_window).find('.username').get(0).focus({ preventScroll: true });
+
// Initialize Turnstile widget with callback to capture token
const initTurnstile = () => {
- if (window.turnstile && window.gui_params?.turnstileSiteKey) {
+ if ( window.turnstile && window.gui_params?.turnstileSiteKey ) {
window.turnstile.render('.cf-turnstile', {
sitekey: window.gui_params.turnstileSiteKey,
- callback: function(token) {
+ callback: function (token) {
// Store the token for the signup request
$(el_window).find('.cf-turnstile').attr('data-token', token);
// Enable the signup button once CAPTCHA is completed
@@ -138,25 +140,25 @@ function UIWindowSignup(options){
// Add visual feedback
$(el_window).find('.cf-turnstile').addClass('captcha-completed');
},
- 'expired-callback': function() {
+ 'expired-callback': function () {
// Reset when token expires
$(el_window).find('.cf-turnstile').removeAttr('data-token');
$(el_window).find('.cf-turnstile').removeClass('captcha-completed');
$(el_window).find('.signup-btn').prop('disabled', true);
- }
+ },
});
} else {
// If Turnstile isn't loaded yet, wait for it
setTimeout(initTurnstile, 100);
}
};
-
+
initTurnstile();
},
window_class: 'window-signup',
- window_css:{
+ window_css: {
height: 'initial',
- },
+ },
body_css: {
width: 'initial',
'background-color': 'white',
@@ -178,47 +180,49 @@ function UIWindowSignup(options){
opacity: 0.6;
cursor: not-allowed;
}
- `
- })
+ `,
+ });
- $(el_window).find('.login-c2a-clickable').on('click', async function(e){
+ $(el_window).find('.login-c2a-clickable').on('click', async function (e) {
$('.login-c2a-clickable').parents('.window').close();
const login = await UIWindowLogin({
- referrer: options.referrer,
+ referrer: options.referrer,
reload_on_success: options.reload_on_success,
window_options: options.window_options,
show_close_button: options.show_close_button,
send_confirmation_code: options.send_confirmation_code,
show_password: false,
});
- if(login)
+ if ( login )
+ {
resolve(true);
- })
+ }
+ });
- $(el_window).find('.signup-btn').on('click', function(e){
+ $(el_window).find('.signup-btn').on('click', function (e) {
// Clear previous error states
$(el_window).find('.signup-error-msg').hide();
//Username
let username = $(el_window).find('.username').val();
- if(!username){
+ if ( ! username ) {
$(el_window).find('.signup-error-msg').html(i18n('username_required'));
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
-
+
//Email
let email = $(el_window).find('.email').val();
// must have an email
- if(!email){
+ if ( ! email ) {
$(el_window).find('.signup-error-msg').html(i18n('email_required'));
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
// must be a valid email
- else if(!window.is_email(email)){
+ else if ( ! window.is_email(email) ) {
$(el_window).find('.signup-error-msg').html(i18n('email_invalid'));
$(el_window).find('.signup-error-msg').fadeIn();
return;
@@ -228,43 +232,43 @@ function UIWindowSignup(options){
let password = $(el_window).find('.password').val();
// must have a password
- if(!password){
+ if ( ! password ) {
$(el_window).find('.signup-error-msg').html(i18n('password_required'));
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
// check password strength
const pass_strength = check_password_strength(password);
- if(!pass_strength.overallPass){
+ if ( ! pass_strength.overallPass ) {
$(el_window).find('.signup-error-msg').html(i18n('password_strength_error'));
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
- // get confirm password value
+ // get confirm password value
const confirmPassword = $(el_window).find('.confirm-password').val();
- if (!confirmPassword) {
+ if ( ! confirmPassword ) {
$(el_window).find('.signup-error-msg').html(i18n('confirm_password_required'));
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
- // check if passwords match
- if (password !== confirmPassword) {
+ // check if passwords match
+ if ( password !== confirmPassword ) {
$(el_window).find('.signup-error-msg').html(i18n('passwords_do_not_match'));
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
-
+
// Check if Cloudflare Turnstile CAPTCHA was completed
let turnstileToken = null;
- if (window.turnstile && window.gui_params?.turnstileSiteKey) {
+ if ( window.turnstile && window.gui_params?.turnstileSiteKey ) {
turnstileToken = $(el_window).find('.cf-turnstile').attr('data-token');
- if (!turnstileToken) {
+ if ( ! turnstileToken ) {
$(el_window).find('.signup-error-msg').html(i18n('captcha_required') || 'Please complete the CAPTCHA verification');
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
}
-
+
//xyzname
let p102xyzname = $(el_window).find('.p102xyzname').val();
@@ -272,8 +276,10 @@ function UIWindowSignup(options){
$(el_window).find('.signup-btn').prop('disabled', true);
let headers = {};
- if(window.custom_headers)
+ if ( window.custom_headers )
+ {
headers = window.custom_headers;
+ }
// Include captcha in request only if required
const requestData = {
@@ -284,65 +290,65 @@ function UIWindowSignup(options){
referrer: options.referrer ?? window.referrerStr,
send_confirmation_code: options.send_confirmation_code,
p102xyzname: p102xyzname,
- 'cf-turnstile-response': turnstileToken
+ 'cf-turnstile-response': turnstileToken,
};
$.ajax({
- url: window.gui_origin + "/signup",
+ url: `${window.gui_origin }/signup`,
type: 'POST',
async: true,
headers: headers,
- contentType: "application/json",
+ contentType: 'application/json',
data: JSON.stringify(requestData),
- success: async function (data){
- window.update_auth_data(data.token, data.user)
-
+ success: async function (data) {
+ window.update_auth_data(data.token, data.user);
+
//send out the login event
- if(options.reload_on_success){
+ if ( options.reload_on_success ) {
window.onbeforeunload = null;
// Replace with a clean URL to prevent sensitive data leakage
const cleanUrl = window.location.origin + window.location.pathname;
window.location.replace(cleanUrl);
- }else if(options.send_confirmation_code){
+ } else if ( options.send_confirmation_code ) {
$(el_window).close();
- let is_verified = await UIWindowEmailConfirmationRequired({stay_on_top: true, has_head: true});
+ let is_verified = await UIWindowEmailConfirmationRequired({ stay_on_top: true, has_head: true });
resolve(is_verified);
- }else{
+ } else {
resolve(true);
}
},
- error: function (err){
+ error: function (err) {
// re-enable 'Create Account' button so user can try again
$(el_window).find('.signup-btn').prop('disabled', false);
// Reset Turnstile widget for retry
- try{
- if (window.turnstile) {
+ try {
+ if ( window.turnstile ) {
window.turnstile?.reset('.cf-turnstile');
$(el_window).find('.cf-turnstile').removeAttr('data-token');
$(el_window).find('.cf-turnstile').removeClass('captcha-completed');
}
- }catch(e){
+ } catch (e) {
console.log(e);
}
// Process error response
const errorText = err.responseText || '';
-
+
// Handle JSON error response
try {
// Try to parse error as JSON
const errorJson = JSON.parse(errorText);
-
+
// Handle timeout specifically
- if (errorJson?.code === 'response_timeout' || errorText.includes('timeout')) {
+ if ( errorJson?.code === 'response_timeout' || errorText.includes('timeout') ) {
$(el_window).find('.signup-error-msg').html(i18n('server_timeout') || 'The server took too long to respond. Please try again.');
$(el_window).find('.signup-error-msg').fadeIn();
return;
}
-
+
// If it's a message in the JSON, use that
- if (errorJson.message) {
+ if ( errorJson.message ) {
$(el_window).find('.signup-error-msg').html(errorJson.message);
$(el_window).find('.signup-error-msg').fadeIn();
return;
@@ -356,30 +362,29 @@ function UIWindowSignup(options){
$(el_window).find('.signup-error-msg').html(errorText || i18n('signup_error') || 'An error occurred during signup. Please try again.');
$(el_window).find('.signup-error-msg').fadeIn();
},
- timeout: 30000 // Add a reasonable timeout
+ timeout: 30000, // Add a reasonable timeout
});
- })
+ });
- $(el_window).find('.signup-form').on('submit', function(e){
+ $(el_window).find('.signup-form').on('submit', function (e) {
e.preventDefault();
e.stopPropagation();
return false;
- })
+ });
- $(el_window).find(`#toggle-show-password-${internal_id}, #toggle-show-password-${internal_id}-confirm`).on("click", function (e) {
+ $(el_window).find(`#toggle-show-password-${internal_id}, #toggle-show-password-${internal_id}-confirm`).on('click', function (e) {
// hide/show password/confirm password and update icon
- let inputField = $(this).siblings("input");
- let isPasswordVisible = inputField.attr("type") === "text";
- inputField.attr("type", isPasswordVisible ? "password" : "text");
- $(this).find(".toggle-show-password-icon").attr(
- "src",
- isPasswordVisible ? window.icons["eye-open.svg"] : window.icons["eye-closed.svg"]
- );
+ let inputField = $(this).siblings('input');
+ let isPasswordVisible = inputField.attr('type') === 'text';
+ inputField.attr('type', isPasswordVisible ? 'password' : 'text');
+ $(this).find('.toggle-show-password-icon').attr(
+ 'src',
+ isPasswordVisible ? window.icons['eye-open.svg'] : window.icons['eye-closed.svg']);
});
-
+
//remove login window
$('.signup-c2a-clickable').parents('.window').close();
- })
+ });
}
-export default UIWindowSignup
\ No newline at end of file
+export default UIWindowSignup;
\ No newline at end of file
diff --git a/src/gui/src/UI/UIWindowTaskManager.js b/src/gui/src/UI/UIWindowTaskManager.js
index d7c6ab4d78..62851e7d62 100644
--- a/src/gui/src/UI/UIWindowTaskManager.js
+++ b/src/gui/src/UI/UIWindowTaskManager.js
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see
.
*/
-import { END_HARD, END_SOFT } from "../definitions.js";
-import UIAlert from "./UIAlert.js";
-import UIContextMenu from "./UIContextMenu.js";
+import { END_HARD, END_SOFT } from '../definitions.js';
+import UIAlert from './UIAlert.js';
+import UIContextMenu from './UIContextMenu.js';
import UIWindow from './UIWindow.js';
const end_process = async (uuid, force) => {
const svc_process = globalThis.services.get('process');
const process = svc_process.get_by_uuid(uuid);
- if (!process) {
+ if ( ! process ) {
console.warn(`Can't end process with uuid='${uuid}': does not exist`);
return;
}
@@ -43,7 +43,7 @@ const end_process = async (uuid, force) => {
if ( confirmation ) {
const alert_resp = await UIAlert({
message: confirmation,
- buttons:[
+ buttons: [
{
label: i18n('yes'),
value: true,
@@ -53,8 +53,8 @@ const end_process = async (uuid, force) => {
label: i18n('no'),
value: false,
},
- ]
- })
+ ],
+ });
if ( ! alert_resp ) return;
}
@@ -65,17 +65,17 @@ const calculate_indent_string = (indent_level, is_last_item_stack, is_last_item)
// Returns a string of '| ├└'
let result = '';
- for ( let i=0; i < indent_level; i++ ) {
+ for ( let i = 0; i < indent_level; i++ ) {
const last_cell = i === indent_level - 1;
- const has_trunk = (last_cell && ( ! is_last_item )) ||
- (!last_cell && !is_last_item_stack[i+1]);
+ const has_trunk = (last_cell && ( !is_last_item )) ||
+ (!last_cell && !is_last_item_stack[i + 1]);
const has_branch = last_cell;
- if (has_trunk && has_branch) {
+ if ( has_trunk && has_branch ) {
result += '├';
- } else if (has_trunk) {
+ } else if ( has_trunk ) {
result += '|';
- } else if (has_branch) {
+ } else if ( has_branch ) {
result += '└';
} else {
result += ' ';
@@ -88,31 +88,31 @@ const calculate_indent_string = (indent_level, is_last_item_stack, is_last_item)
const generate_task_rows = (items, { indent_level, is_last_item_stack }) => {
const svc_process = globalThis.services.get('process');
let rows_html = '';
-
- for (let i = 0; i < items.length; i++) {
+
+ for ( let i = 0; i < items.length; i++ ) {
const item = items[i];
const is_last_item = i === items.length - 1;
const indentation = calculate_indent_string(indent_level, is_last_item_stack, is_last_item);
-
+
// Generate indentation HTML
let indentation_html = '';
- for (const c of indentation) {
- indentation_html += `
`;
+ for ( const c of indentation ) {
+ indentation_html += '
';
switch (c) {
- case ' ':
- break;
- case '|':
- indentation_html += `
`;
- break;
- case '└':
- indentation_html += `
`;
- break;
- case '├':
- indentation_html += `
`;
- indentation_html += `
`;
- break;
+ case ' ':
+ break;
+ case '|':
+ indentation_html += '
';
+ break;
+ case '└':
+ indentation_html += '
';
+ break;
+ case '├':
+ indentation_html += '
';
+ indentation_html += '
';
+ break;
}
- indentation_html += `
`;
+ indentation_html += '
';
}
rows_html += `
@@ -123,20 +123,20 @@ const generate_task_rows = (items, { indent_level, is_last_item_stack }) => {
${item.name}
- ${i18n('process_type_' + item.type)} ${i18n('process_status_' + item.status.i18n_key)} ${i18n(`process_type_${ item.type}`)} ${i18n(`process_status_${ item.status.i18n_key}`)}
`;
const children = svc_process.get_children_of(item.uuid);
- if (children) {
+ if ( children ) {
rows_html += generate_task_rows(children, {
indent_level: indent_level + 1,
is_last_item_stack: [ ...is_last_item_stack, is_last_item ],
});
}
}
-
+
return rows_html;
};
@@ -145,19 +145,19 @@ const UIWindowTaskManager = async function UIWindowTaskManager () {
let h = '';
- h += `Don't forget to save your session! You are in a temporary session. Save session to avoid accidentally losing your work.
`,
+ message: message ?? 'Don\'t forget to save your session! You are in a temporary session. Save session to avoid accidentally losing your work.
',
body_icon: window.icons['reminder.svg'],
- buttons:[
+ buttons: [
{
label: i18n('save_session'),
value: 'save-session',
@@ -696,81 +732,99 @@ window.show_save_account_notice_if_needed = function(message){
// value: 'login',
// },
{
- label: `I'll do it later`,
+ label: 'I\'ll do it later',
value: 'remind-later',
},
],
window_options: {
backdrop: true,
close_on_backdrop_click: false,
- }
-
- })
-
- if(alert_resp === 'remind-later'){
+ },
+
+ });
+
+ if ( alert_resp === 'remind-later' ) {
// TODO
}
- if(alert_resp === 'save-session'){
+ if ( alert_resp === 'save-session' ) {
let saved = await UIWindowSaveAccount({
send_confirmation_code: false,
});
- }else if (alert_resp === 'login'){
+ } else if ( alert_resp === 'login' ) {
let login_result = await UIWindowLogin({
- show_signup_button: false,
+ show_signup_button: false,
reload_on_success: true,
send_confirmation_code: false,
window_options: {
show_in_taskbar: false,
backdrop: true,
close_on_backdrop_click: false,
- }
+ },
});
// FIXME: Report login error.
}
}, window.desktop_loading_fade_delay + 1000);
}
});
-}
+};
window.onpopstate = (event) => {
- if(event.state !== null && event.state.window_id !== null){
+ if ( event.state !== null && event.state.window_id !== null ) {
$(`.window[data-id="${event.state.window_id}"]`).focusWindow();
}
-}
+};
-window.sort_items = (item_container, sort_by, sort_order)=>{
- if(sort_order !== 'asc' && sort_order !== 'desc')
+window.sort_items = (item_container, sort_by, sort_order) => {
+ if ( sort_order !== 'asc' && sort_order !== 'desc' )
+ {
sort_order = 'asc';
+ }
- $(item_container).find(`.item[data-sortable="true"]`).detach().sort(function(a,b) {
+ $(item_container).find('.item[data-sortable="true"]').detach().sort(function (a, b) {
// Name
- if(!sort_by || sort_by === 'name'){
- if(a.dataset.name.toLowerCase() < b.dataset.name.toLowerCase()) { return (sort_order === 'asc' ? -1 : 1); }
- if(a.dataset.name.toLowerCase() > b.dataset.name.toLowerCase()) { return (sort_order === 'asc' ? 1 : -1); }
+ if ( !sort_by || sort_by === 'name' ) {
+ if ( a.dataset.name.toLowerCase() < b.dataset.name.toLowerCase() ) {
+ return (sort_order === 'asc' ? -1 : 1);
+ }
+ if ( a.dataset.name.toLowerCase() > b.dataset.name.toLowerCase() ) {
+ return (sort_order === 'asc' ? 1 : -1);
+ }
return 0;
}
// Size
- else if(sort_by === 'size'){
- if( parseInt(a.dataset.size) < parseInt(b.dataset.size)) { return (sort_order === 'asc' ? -1 : 1); }
- if( parseInt(a.dataset.size) > parseInt(b.dataset.size)) { return (sort_order === 'asc' ? 1 : -1); }
+ else if ( sort_by === 'size' ) {
+ if ( parseInt(a.dataset.size) < parseInt(b.dataset.size) ) {
+ return (sort_order === 'asc' ? -1 : 1);
+ }
+ if ( parseInt(a.dataset.size) > parseInt(b.dataset.size) ) {
+ return (sort_order === 'asc' ? 1 : -1);
+ }
return 0;
}
// Modified
- else if(sort_by === 'modified'){
- if( parseInt(a.dataset.modified) < parseInt(b.dataset.modified)) { return (sort_order === 'asc' ? -1 : 1); }
- if( parseInt(a.dataset.modified) > parseInt(b.dataset.modified)) { return (sort_order === 'asc' ? 1 : -1); }
+ else if ( sort_by === 'modified' ) {
+ if ( parseInt(a.dataset.modified) < parseInt(b.dataset.modified) ) {
+ return (sort_order === 'asc' ? -1 : 1);
+ }
+ if ( parseInt(a.dataset.modified) > parseInt(b.dataset.modified) ) {
+ return (sort_order === 'asc' ? 1 : -1);
+ }
return 0;
}
// Type
- else if(sort_by === 'type'){
- if(path.extname(a.dataset.name.toLowerCase()) < path.extname(b.dataset.name.toLowerCase())) { return (sort_order === 'asc' ? -1 : 1); }
- if(path.extname(a.dataset.name.toLowerCase()) > path.extname(b.dataset.name.toLowerCase())) { return (sort_order === 'asc' ? 1 : -1); }
+ else if ( sort_by === 'type' ) {
+ if ( path.extname(a.dataset.name.toLowerCase()) < path.extname(b.dataset.name.toLowerCase()) ) {
+ return (sort_order === 'asc' ? -1 : 1);
+ }
+ if ( path.extname(a.dataset.name.toLowerCase()) > path.extname(b.dataset.name.toLowerCase()) ) {
+ return (sort_order === 'asc' ? 1 : -1);
+ }
return 0;
}
}).appendTo(item_container);
-}
+};
window.show_or_hide_files = (item_containers) => {
const show_hidden_files = window.user_preferences.show_hidden_files;
@@ -780,40 +834,40 @@ window.show_or_hide_files = (item_containers) => {
.find('.item')
.filter((_, item) => item.dataset.name.startsWith('.'))
.removeClass(class_to_remove).addClass(class_to_add);
-}
+};
-window.create_folder = async(basedir, appendto_element)=>{
- let dirname = basedir;
+window.create_folder = async (basedir, appendto_element) => {
+ let dirname = basedir;
let folder_name = 'New Folder';
let newfolder_op_id = window.operation_id++;
window.operation_cancelled[newfolder_op_id] = false;
// create folder
- try{
+ try {
await puter.fs.mkdir({
- path: dirname + '/'+folder_name,
+ path: `${dirname }/${folder_name}`,
rename: true,
overwrite: false,
- success: function (data){
- const el_created_dir = $(appendto_element).find('.item[data-path="'+html_encode(dirname)+'/'+html_encode(data.name)+'"]');
- if(el_created_dir.length > 0){
+ success: function (data) {
+ const el_created_dir = $(appendto_element).find(`.item[data-path="${html_encode(dirname)}/${html_encode(data.name)}"]`);
+ if ( el_created_dir.length > 0 ) {
window.activate_item_name_editor(el_created_dir);
// Add action to actions_history for undo ability
window.actions_history.push({
operation: 'create_folder',
- data: el_created_dir
-
+ data: el_created_dir,
+
});
}
- }
+ },
});
- }catch(err){
+ } catch ( err ) {
}
-}
+};
-window.create_file = async(options)=>{
+window.create_file = async (options) => {
// args
let dirname = options.dirname;
let appendto_element = options.append_to_element;
@@ -821,44 +875,43 @@ window.create_file = async(options)=>{
let content = options.content ? [options.content] : [];
// create file
- try{
- puter.fs.upload(new File(content, filename), dirname,
- {
- success: async function (data){
- const created_file = $(appendto_element).find('.item[data-path="'+html_encode(dirname)+'/'+html_encode(data.name)+'"]');
- if(created_file.length > 0){
+ try {
+ puter.fs.upload(new File(content, filename), dirname, {
+ success: async function (data) {
+ const created_file = $(appendto_element).find(`.item[data-path="${html_encode(dirname)}/${html_encode(data.name)}"]`);
+ if ( created_file.length > 0 ) {
window.activate_item_name_editor(created_file);
// Add action to actions_history for undo ability
window.actions_history.push({
operation: 'create_file',
- data: created_file
+ data: created_file,
});
}
- }
+ },
});
- }catch(err){
+ } catch ( err ) {
console.log(err);
}
-}
+};
window.available_templates = () => {
- const templatesPath = `/${window.user.username}/templates`
+ const templatesPath = `/${window.user.username}/templates`;
// Initialize with empty array immediately
- window.file_templates = []
+ window.file_templates = [];
const loadTemplates = async () => {
- try{
+ try {
// Directly check the templates directory
- const hasTemplateFiles = await puter.fs.readdir(templatesPath, {consistency: 'eventual'})
+ const hasTemplateFiles = await puter.fs.readdir(templatesPath, { consistency: 'eventual' });
- if(hasTemplateFiles.length == 0) {
- window.file_templates = []
- return []
+ if ( hasTemplateFiles.length == 0 ) {
+ window.file_templates = [];
+ return [];
}
- let result = []
+ let result = [];
hasTemplateFiles.forEach(element => {
const extIndex = element.name.lastIndexOf('.');
@@ -869,54 +922,54 @@ window.available_templates = () => {
? ''
: element.name.slice(extIndex + 1);
- if(extension == "txt") extension = "text"
-
+ if ( extension == 'txt' ) extension = 'text';
+
const _path = path.join(templatesPath, element.name);
const itemStructure = {
path: _path,
html: `${extension.toUpperCase()} ${name}`,
- extension:extension,
- name: element.name
- }
- result.push(itemStructure)
+ extension: extension,
+ name: element.name,
+ };
+ result.push(itemStructure);
});
-
+
// Assign to window.file_templates when ready
- window.file_templates = result
- return result
-
- } catch (err) {
- console.log(err)
- window.file_templates = []
+ window.file_templates = result;
+ return result;
+
+ } catch ( err ) {
+ console.log(err);
+ window.file_templates = [];
}
- }
+ };
// Start the async operation but don't wait for it
- loadTemplates()
+ loadTemplates();
// Return the current (initially empty) templates immediately
- return window.file_templates
-}
+ return window.file_templates;
+};
-window.create_shortcut = async(filename, is_dir, basedir, appendto_element, shortcut_to, shortcut_to_path)=>{
+window.create_shortcut = async (filename, is_dir, basedir, appendto_element, shortcut_to, shortcut_to_path) => {
const extname = path.extname(filename);
- const basename = path.basename(filename, extname) + ' - Shortcut';
+ const basename = `${path.basename(filename, extname) } - Shortcut`;
filename = basename + extname;
// create file shortcut
- try{
+ try {
await puter.fs.upload(new File([], filename), basedir, {
overwrite: false,
shortcutTo: shortcut_to_path ?? shortcut_to,
dedupeName: true,
});
- }catch(err){
- console.log(err)
+ } catch ( err ) {
+ console.log(err);
}
-}
+};
-window.copy_clipboard_items = async function(dest_path, dest_container_element){
+window.copy_clipboard_items = async function (dest_path, dest_container_element) {
let copy_op_id = window.operation_id++;
window.operation_cancelled[copy_op_id] = false;
// unselect previously selected items in the target container
@@ -924,7 +977,7 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
window.update_explorer_footer_selected_items_count($(dest_container_element).closest('.window'));
let overwrite_all = false;
- (async()=>{
+ (async () => {
let copy_progress_window_init_ts = Date.now();
// only show progress window if it takes longer than 2s to copy
@@ -938,34 +991,38 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
});
}, 0);
- const copied_item_paths = []
+ const copied_item_paths = [];
- for(let i=0; i
`;
- html += ``;
- html +=`