${i18n('account')}
`; // change password button - if(!user.is_temp){ + if(!window.user.is_temp){ h += ``;
h += `${i18n('password')}`;
h += `
`;
@@ -44,7 +44,7 @@ export default {
h += `
`;
h += `
`;
h += `${i18n('username')}`;
- h += `${html_encode(user.username)}`;
+ h += `${html_encode(window.user.username)}`;
h += `
`;
h += ``;
h += ``;
@@ -52,11 +52,11 @@ export default {
h += `
`;
// change email button
- if(user.email){
+ if(window.user.email){
h += ``;
h += `
`;
h += `${i18n('email')}`;
- h += `${html_encode(user.email)}`;
+ h += `${html_encode(window.user.email)}`;
h += `
`;
h += ``;
h += ``;
diff --git a/src/UI/Settings/UITabLanguage.js b/src/UI/Settings/UITabLanguage.js
index 5bb09a68b..c65f611be 100644
--- a/src/UI/Settings/UITabLanguage.js
+++ b/src/UI/Settings/UITabLanguage.js
@@ -32,7 +32,7 @@ export default {
`;
// list of languages
- const available_languages = listSupportedLanguages();
+ const available_languages = window.listSupportedLanguages();
h += ``;
for (let lang of available_languages) {
h += `
`;
@@ -168,14 +168,14 @@ function UIItem(options){
// updte item_container
const item_container = $(options.appendTo).closest('.item-container');
- show_or_hide_empty_folder_message(item_container);
+ window.show_or_hide_empty_folder_message(item_container);
// get all the elements needed
const el_item = document.getElementById(`item-${item_id}`);
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(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){
@@ -183,11 +183,11 @@ function UIItem(options){
if(!$(el_window).hasClass('.window'))
el_window = $(el_window).closest('.window');
- update_explorer_footer_item_count(el_window);
+ window.update_explorer_footer_item_count(el_window);
}
// manual positioning
- if( !is_auto_arrange_enabled &&
+ 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
@@ -214,7 +214,7 @@ function UIItem(options){
$(el_item).removeClass('item-selected');
// if files were dropped...
if(e.dataTransfer?.items?.length > 0){
- upload_items( e.dataTransfer.items, $(el_item).attr('data-path'))
+ window.upload_items( e.dataTransfer.items, $(el_item).attr('data-path'))
}
e.stopPropagation();
@@ -333,13 +333,13 @@ function UIItem(options){
}
// send drag event to iframe if mouse is inside iframe
- if(mouseover_window){
- const $app_iframe = $(mouseover_window).find('.window-app-iframe');
- if(!$(mouseover_window).hasClass('window-disabled') && $app_iframe.length > 0){
+ 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){
var rect = $app_iframe.get(0).getBoundingClientRect();
// if mouse is inside iframe, send drag message to iframe
- if(mouseX > rect.left && mouseX < rect.right && mouseY > rect.top && mouseY < rect.bottom){
- $app_iframe.get(0).contentWindow.postMessage({msg: "drag", x: (mouseX - rect.left), y: (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)}, '*');
}
}
}
@@ -347,16 +347,16 @@ function UIItem(options){
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 &&
- !is_auto_arrange_enabled && $(el_item).attr('data-path') !== trash_path && !ui.helper.data('dropped') &&
+ !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
- 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';
$('.ui-draggable-dragging').remove();
- desktop_item_positions[$(el_item).attr('data-uid')] = ui.position;
- save_desktop_item_positions()
+ window.desktop_item_positions[$(el_item).attr('data-uid')] = ui.position;
+ window.save_desktop_item_positions()
}
$('.item-selected-clone').remove();
@@ -380,7 +380,7 @@ function UIItem(options){
tolerance: 'pointer',
drop: async function( event, ui ) {
// Check if hovering over an item that is VISIBILE
- if($(event.target).closest('.window').attr('data-id') !== $(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
@@ -424,7 +424,7 @@ function UIItem(options){
// open each item
for (let i = 0; i < items_to_open.length; i++) {
const item = items_to_open[i];
- launch_app({
+ window.launch_app({
name: options.associated_app_name,
file_path: item.path,
// app_obj: open_item_meta.suggested_apps[0],
@@ -445,14 +445,14 @@ function UIItem(options){
// If ctrl key is down, copy items. Except if target or source is Trash
if(event.ctrlKey){
if(options.is_dir && $(el_item).attr('data-path') !== window.trash_path )
- copy_items(items_to_move, $(el_item).attr('data-path'))
+ window.copy_items(items_to_move, $(el_item).attr('data-path'))
else if(!options.is_dir)
- copy_items(items_to_move, path.dirname($(el_item).attr('data-path')));
+ window.copy_items(items_to_move, path.dirname($(el_item).attr('data-path')));
}
// If alt key is down, create shortcut items
else if(event.altKey && window.feature_flags.create_shortcut){
items_to_move.forEach((item_to_move) => {
- create_shortcut(
+ 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')),
@@ -465,10 +465,10 @@ function UIItem(options){
// Otherwise, move items
else if(options.is_dir){
if($(el_item).closest('.item-container').attr('data-path') === window.desktop_path){
- delete desktop_item_positions[$(el_item).attr('data-uid')];
- save_desktop_item_positions()
+ delete window.desktop_item_positions[$(el_item).attr('data-uid')];
+ window.save_desktop_item_positions()
}
- move_items(items_to_move, $(el_item).attr('data-shortcut_to_path') !== '' ? $(el_item).attr('data-shortcut_to_path') : $(el_item).attr('data-path'));
+ 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'));
}
}
@@ -480,7 +480,7 @@ function UIItem(options){
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') !== $(mouseover_window).attr('data-id'))
+ 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'))
@@ -522,7 +522,7 @@ function UIItem(options){
if($(e.target).hasClass('item-name-editor'))
return false;
- open_item({
+ window.open_item({
item: el_item,
maximized: true,
});
@@ -537,7 +537,7 @@ function UIItem(options){
if($(e.target).hasClass('item-name-editor'))
return false;
- open_item({
+ window.open_item({
item: el_item,
new_window: e.metaKey || e.ctrlKey,
});
@@ -576,7 +576,7 @@ function UIItem(options){
else{
$(this).addClass('item-selected')
}
- update_explorer_footer_selected_items_count($el_parent_window)
+ window.update_explorer_footer_selected_items_count($el_parent_window)
});
// --------------------------------------------------------
// Click
@@ -593,7 +593,7 @@ function UIItem(options){
// CTRL/Command key is pressed or clicking an item that is already selected
if(!e.ctrlKey && !e.metaKey){
$(this).closest('.item-container').find('.item-selected').not(this).removeClass('item-selected');
- update_explorer_footer_selected_items_count($el_parent_window)
+ window.update_explorer_footer_selected_items_count($el_parent_window)
}
//----------------------------------------------------------------
// On an OpenFileDialog?
@@ -648,7 +648,7 @@ function UIItem(options){
UIAlert(`The name ".." is not allowed, because it is a reserved name. Please choose another name.`)
}
- $(el_item_name).html(truncate_filename(options.name, TRUNCATE_LENGTH).replaceAll(' ', ' '));
+ $(el_item_name).html(window.truncate_filename(options.name, window.TRUNCATE_LENGTH).replaceAll(' ', ' '));
$(el_item_name).show();
$(el_item_name_editor).val($(el_item).attr('data-name'));
$(el_item_name_editor).hide();
@@ -658,7 +658,7 @@ function UIItem(options){
$(el_item_name_editor).removeClass('item-name-editor-active');
// Perform rename request
- rename_file(options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url);
+ window.rename_file(options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url);
}
// --------------------------------------------------------
@@ -675,8 +675,8 @@ function UIItem(options){
e.preventDefault();
$(el_item_name_editor).blur();
$(el_item).addClass('item-selected');
- last_enter_pressed_to_rename_ts = Date.now();
- update_explorer_footer_selected_items_count($(el_item).closest('.item-container'));
+ window.last_enter_pressed_to_rename_ts = Date.now();
+ window.update_explorer_footer_selected_items_count($(el_item).closest('.item-container'));
return false;
}
})
@@ -715,7 +715,7 @@ function UIItem(options){
setTimeout(() => {
if(!skip_a_rename_click && (Date.now() - last_mousedown_ts) > 400){
if (!e.ctrlKey && !e.metaKey)
- activate_item_name_editor(el_item)
+ window.activate_item_name_editor(el_item)
last_mousedown_ts = 0
}else{
last_mousedown_ts = Date.now() + 500;
@@ -760,7 +760,7 @@ function UIItem(options){
// Multiple items selected
// -------------------------------------------------------
if($selected_items.length > 1){
- const are_trashed = $selected_items.attr('data-path').startsWith(trash_path + '/');
+ const are_trashed = $selected_items.attr('data-path').startsWith(window.trash_path + '/');
menu_items = []
// -------------------------------------------
// Restore
@@ -772,7 +772,7 @@ function UIItem(options){
$selected_items.each(function() {
const ell = this;
let metadata = $(ell).attr('data-metadata') === '' ? {} : JSON.parse($(ell).attr('data-metadata'))
- move_items([ell], path.dirname(metadata.original_path));
+ window.move_items([ell], path.dirname(metadata.original_path));
})
}
});
@@ -793,7 +793,7 @@ function UIItem(options){
items.push($selected_items[index]);
}
- zipItems(items, path.dirname($(el_item).attr('data-path')), true);
+ window.zipItems(items, path.dirname($(el_item).attr('data-path')), true);
}
});
// -------------------------------------------
@@ -807,7 +807,7 @@ function UIItem(options){
items.push($selected_items[index]);
}
- zipItems(items, path.dirname($(el_item).attr('data-path')), false);
+ window.zipItems(items, path.dirname($(el_item).attr('data-path')), false);
}
});
// -------------------------------------------
@@ -872,9 +872,9 @@ function UIItem(options){
if((alert_resp) === 'Delete'){
for (let index = 0; index < $selected_items.length; index++) {
const element = $selected_items[index];
- await delete_item(element);
+ await window.delete_item(element);
}
- const trash = await puter.fs.stat(trash_path);
+ const trash = await puter.fs.stat(window.trash_path);
// update other clients
if(window.socket){
@@ -882,8 +882,8 @@ function UIItem(options){
}
if(trash.is_empty){
- $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${trash_path}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
- $(`.window[data-path="${html_encode(trash_path)}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
+ $(`.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']);
}
}
}
@@ -903,7 +903,7 @@ function UIItem(options){
base_dir = window.desktop_path;
}
// create shortcut
- create_shortcut(
+ window.create_shortcut(
path.basename($(this).attr('data-path')),
$(this).attr('data-is_dir') === '1',
base_dir,
@@ -922,7 +922,7 @@ function UIItem(options){
menu_items.push({
html: i18n('delete'),
onClick: async function(){
- move_items($selected_items, trash_path);
+ window.move_items($selected_items, window.trash_path);
}
});
}
@@ -933,7 +933,7 @@ function UIItem(options){
// One item selected
// -------------------------------------------------------
else{
- const is_trash = $(el_item).attr('data-path') === trash_path || $(el_item).attr('data-shortcut_to_path') === trash_path;
+ const is_trash = $(el_item).attr('data-path') === window.trash_path || $(el_item).attr('data-shortcut_to_path') === window.trash_path;
menu_items = [];
// -------------------------------------------
// Open
@@ -942,7 +942,7 @@ function UIItem(options){
menu_items.push({
html: i18n('open'),
onClick: function(){
- open_item({item: el_item});
+ window.open_item({item: el_item});
}
});
@@ -959,7 +959,7 @@ function UIItem(options){
let items = [];
if(!options.suggested_apps || options.suggested_apps.length === 0){
// try to find suitable apps
- const suitable_apps = await suggest_apps_for_fsentry({
+ const suitable_apps = await window.suggest_apps_for_fsentry({
uid: options.uid,
path: options.path,
});
@@ -981,12 +981,12 @@ function UIItem(options){
onClick: async function(){
var extension = path.extname($(el_item).attr('data-path')).toLowerCase();
if(
- user_preferences[`default_apps${extension}`] !== suggested_app.name
+ window.user_preferences[`default_apps${extension}`] !== suggested_app.name
&&
(
- (!user_preferences[`default_apps${extension}`] && index > 0)
+ (!window.user_preferences[`default_apps${extension}`] && index > 0)
||
- (user_preferences[`default_apps${extension}`])
+ (window.user_preferences[`default_apps${extension}`])
)
){
const alert_resp = await UIAlert({
@@ -1004,11 +1004,11 @@ function UIItem(options){
]
})
if((alert_resp) === 'yes'){
- user_preferences['default_apps' + extension] = suggested_app.name;
- window.mutate_user_preferences(user_preferences);
+ window.user_preferences['default_apps' + extension] = suggested_app.name;
+ window.mutate_user_preferences(window.user_preferences);
}
}
- launch_app({
+ window.launch_app({
name: suggested_app.name,
file_path: $(el_item).attr('data-path'),
window_title: $(el_item).attr('data-name'),
@@ -1044,7 +1044,7 @@ function UIItem(options){
html: i18n('open_in_new_window'),
onClick: function(){
if(options.is_dir){
- open_item({item: el_item, new_window: true})
+ window.open_item({item: el_item, new_window: true})
}
}
});
@@ -1090,7 +1090,7 @@ function UIItem(options){
html: i18n('deploy_as_app'),
disabled: !options.is_dir,
onClick: async function () {
- launch_app({
+ window.launch_app({
name: 'dev-center',
file_path: $(el_item).attr('data-path'),
file_uid: $(el_item).attr('data-uid'),
@@ -1111,7 +1111,7 @@ function UIItem(options){
menu_items.push({
html: i18n('empty_trash'),
onClick: async function(){
- empty_trash();
+ window.empty_trash();
}
});
}
@@ -1124,9 +1124,9 @@ function UIItem(options){
disabled: options.is_dir && !window.feature_flags.download_directory,
onClick: async function(){
if(options.is_dir)
- zipItems(el_item, path.dirname($(el_item).attr('data-path')), true);
+ window.zipItems(el_item, path.dirname($(el_item).attr('data-path')), true);
else
- trigger_download([options.path]);
+ window.trigger_download([options.path]);
}
});
}
@@ -1137,7 +1137,7 @@ function UIItem(options){
menu_items.push({
html: i18n('zip'),
onClick: function(){
- zipItems(el_item, path.dirname($(el_item).attr('data-path')), false);
+ window.zipItems(el_item, path.dirname($(el_item).attr('data-path')), false);
}
})
}
@@ -1177,7 +1177,7 @@ function UIItem(options){
html: i18n('restore'),
onClick: async function(){
let metadata = $(el_item).attr('data-metadata') === '' ? {} : JSON.parse($(el_item).attr('data-metadata'))
- move_items([el_item], path.dirname(metadata.original_path));
+ window.move_items([el_item], path.dirname(metadata.original_path));
}
});
}
@@ -1216,12 +1216,12 @@ function UIItem(options){
if($(el_item).attr('data-is_dir') === '1' && !is_trashed && !is_trash){
menu_items.push({
html: i18n('paste_into_folder'),
- disabled: clipboard.length > 0 ? false : true,
+ disabled: window.clipboard.length > 0 ? false : true,
onClick: function(){
- if(clipboard_op === 'copy')
- copy_clipboard_items($(el_item).attr('data-path'), null);
- else if(clipboard_op === 'move')
- move_clipboard_items(null, $(el_item).attr('data-path'))
+ if(window.clipboard_op === 'copy')
+ window.copy_clipboard_items($(el_item).attr('data-path'), null);
+ else if(window.clipboard_op === 'move')
+ window.move_clipboard_items(null, $(el_item).attr('data-path'))
}
})
}
@@ -1244,7 +1244,7 @@ function UIItem(options){
base_dir = window.desktop_path;
}
- create_shortcut(
+ window.create_shortcut(
path.basename($(el_item).attr('data-path')),
options.is_dir,
base_dir,
@@ -1262,7 +1262,7 @@ function UIItem(options){
menu_items.push({
html: i18n('delete'),
onClick: async function(){
- move_items([el_item], trash_path);
+ window.move_items([el_item], window.trash_path);
}
});
}
@@ -1287,17 +1287,17 @@ function UIItem(options){
})
if((alert_resp) === 'Delete'){
- await delete_item(el_item);
+ await window.delete_item(el_item);
// check if trash is empty
- const trash = await puter.fs.stat(trash_path);
+ const trash = await puter.fs.stat(window.trash_path);
// update other clients
if(window.socket){
window.socket.emit('trash.is_empty', {is_empty: trash.is_empty});
}
// update this client
if(trash.is_empty){
- $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
- $(`.window[data-path="${trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
+ $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
+ $(`.window[data-path="${window.trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
}
}
}
@@ -1310,7 +1310,7 @@ function UIItem(options){
menu_items.push({
html: i18n('rename'),
onClick: function(){
- activate_item_name_editor(el_item)
+ window.activate_item_name_editor(el_item)
}
});
}
@@ -1370,10 +1370,10 @@ function UIItem(options){
})
if(options.sort_container_after_append){
- sort_items(options.appendTo, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order'));
+ window.sort_items(options.appendTo, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order'));
}
if(options.editable){
- activate_item_name_editor(el_item)
+ window.activate_item_name_editor(el_item)
}
}
@@ -1430,7 +1430,7 @@ $(document).on('contextmenu', '.item-has-website-url-badge', async function(e){
onClick: async function(){
const website_url = $(e.target).closest('.item').attr('data-website_url');
if(website_url){
- await copy_to_clipboard(website_url);
+ await window.copy_to_clipboard(website_url);
}
}
},
@@ -1514,7 +1514,7 @@ $.fn.removeItems = async function(options) {
$(this).each(async function() {
const parent_container = $(this).closest('.item-container');
$(this).remove();
- show_or_hide_empty_folder_message(parent_container);
+ window.show_or_hide_empty_folder_message(parent_container);
});
return this;
diff --git a/src/UI/UINotification.js b/src/UI/UINotification.js
index 697d23e39..e110ea232 100644
--- a/src/UI/UINotification.js
+++ b/src/UI/UINotification.js
@@ -18,12 +18,12 @@
*/
function UINotification(options){
- global_element_id++;
+ window.global_element_id++;
options.content = options.content ?? '';
let h = '';
- h += `${html_encode(lang.name)}
`;
diff --git a/src/UI/Settings/UITabUsage.js b/src/UI/Settings/UITabUsage.js
index 976475cfb..ba72bd618 100644
--- a/src/UI/Settings/UITabUsage.js
+++ b/src/UI/Settings/UITabUsage.js
@@ -42,16 +42,16 @@ export default {
},
init: ($el_window) => {
$.ajax({
- url: api_origin + "/drivers/usage",
+ url: window.api_origin + "/drivers/usage",
type: 'GET',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer " + auth_token
+ "Authorization": "Bearer " + window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (res) {
@@ -93,16 +93,16 @@ export default {
// df
$.ajax({
- url: api_origin + "/df",
+ url: window.api_origin + "/df",
type: 'GET',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer " + auth_token
+ "Authorization": "Bearer " + window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (res) {
@@ -113,15 +113,15 @@ export default {
let host_usage_percentage = 0;
if ( res.host_used ) {
- $('#storage-puter-used').html(byte_format(res.used));
+ $('#storage-puter-used').html(window.byte_format(res.used));
$('#storage-puter-used-w').show();
general_used = res.host_used;
host_usage_percentage = ((res.host_used - res.used) / res.capacity * 100).toFixed(0);
}
- $('#storage-used').html(byte_format(general_used));
- $('#storage-capacity').html(byte_format(res.capacity));
+ $('#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
diff --git a/src/UI/Settings/UIWindowChangeEmail.js b/src/UI/Settings/UIWindowChangeEmail.js
index 61f6a2882..1b28c0aee 100644
--- a/src/UI/Settings/UIWindowChangeEmail.js
+++ b/src/UI/Settings/UIWindowChangeEmail.js
@@ -93,11 +93,11 @@ async function UIWindowChangeEmail(options){
$(el_window).find('.new-email').attr('disabled', true);
$.ajax({
- url: api_origin + "/change_email/start",
+ url: window.api_origin + "/change_email/start",
type: 'POST',
async: true,
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
contentType: "application/json",
data: JSON.stringify({
diff --git a/src/UI/Settings/UIWindowFinalizeUserDeletion.js b/src/UI/Settings/UIWindowFinalizeUserDeletion.js
index 505a6270f..e4511f4e5 100644
--- a/src/UI/Settings/UIWindowFinalizeUserDeletion.js
+++ b/src/UI/Settings/UIWindowFinalizeUserDeletion.js
@@ -26,7 +26,7 @@ async function UIWindowFinalizeUserDeletion(options){
let h = '';
// if user is temporary, ask them to type in 'confirm' to delete their account
- if(user.is_temp){
+ if(window.user.is_temp){
h += ``;
h += ``;
h += `
`;
@@ -94,7 +94,7 @@ async function UIWindowFinalizeUserDeletion(options){
$(el_window).find('.proceed-with-user-deletion').on('click', function(){
$(el_window).find('.error-message').hide();
// if user is temporary, check if they typed 'confirm'
- if(user.is_temp){
+ if(window.user.is_temp){
if($(el_window).find('.confirm-temporary-user-deletion').val() !== 'confirm'){
$(el_window).find('.error-message').html(i18n('type_confirm_to_delete_account'), false);
$(el_window).find('.error-message').show();
@@ -112,19 +112,19 @@ async function UIWindowFinalizeUserDeletion(options){
// delete user
$.ajax({
- url: api_origin + "/delete-own-user",
+ url: window.api_origin + "/delete-own-user",
type: 'POST',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer " + auth_token
+ "Authorization": "Bearer " + window.auth_token
},
data: JSON.stringify({
password: $(el_window).find('.confirm-user-deletion-password').val(),
}),
statusCode: {
401: function () {
- logout();
+ window.logout();
},
400: function(){
$(el_window).find('.error-message').html(i18n('incorrect_password'));
@@ -136,7 +136,7 @@ async function UIWindowFinalizeUserDeletion(options){
// mark user as deleted
window.user.deleted = true;
// log user out
- logout();
+ window.logout();
}
else{
$(el_window).find('.error-message').html(html_encode(data.error));
diff --git a/src/UI/Settings/UIWindowSettings.js b/src/UI/Settings/UIWindowSettings.js
index 2a720372e..28300f231 100644
--- a/src/UI/Settings/UIWindowSettings.js
+++ b/src/UI/Settings/UIWindowSettings.js
@@ -45,7 +45,7 @@ async function UIWindowSettings(options){
// side bar
h += ``;
@@ -82,7 +82,6 @@ async function UIWindowSettings(options){
allow_user_select: true,
backdrop: false,
width: 800,
- height: 500,
height: 'auto',
dominant: true,
show_in_taskbar: false,
diff --git a/src/UI/UIAlert.js b/src/UI/UIAlert.js
index c5763ea0b..dcf46cdda 100644
--- a/src/UI/UIAlert.js
+++ b/src/UI/UIAlert.js
@@ -23,7 +23,7 @@ function UIAlert(options){
// set sensible defaults
if(arguments.length > 0){
// if first argument is a string, then assume it is the message
- if(isString(arguments[0])){
+ if(window.isString(arguments[0])){
options = {};
options.message = arguments[0];
}
diff --git a/src/UI/UIContextMenu.js b/src/UI/UIContextMenu.js
index 9f5f65d3c..367bc33cd 100644
--- a/src/UI/UIContextMenu.js
+++ b/src/UI/UIContextMenu.js
@@ -20,7 +20,7 @@
function UIContextMenu(options){
$('.window-active .window-app-iframe').css('pointer-events', 'none');
- const menu_id = global_element_id++;
+ const menu_id = window.global_element_id++;
let h = '';
h += `
`;
// size
h += ``;
@@ -94,7 +94,7 @@ async function UIWindowFinalizeUserDeletion(options){
$(el_window).find('.proceed-with-user-deletion').on('click', function(){
$(el_window).find('.error-message').hide();
// if user is temporary, check if they typed 'confirm'
- if(user.is_temp){
+ if(window.user.is_temp){
if($(el_window).find('.confirm-temporary-user-deletion').val() !== 'confirm'){
$(el_window).find('.error-message').html(i18n('type_confirm_to_delete_account'), false);
$(el_window).find('.error-message').show();
@@ -112,19 +112,19 @@ async function UIWindowFinalizeUserDeletion(options){
// delete user
$.ajax({
- url: api_origin + "/delete-own-user",
+ url: window.api_origin + "/delete-own-user",
type: 'POST',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer " + auth_token
+ "Authorization": "Bearer " + window.auth_token
},
data: JSON.stringify({
password: $(el_window).find('.confirm-user-deletion-password').val(),
}),
statusCode: {
401: function () {
- logout();
+ window.logout();
},
400: function(){
$(el_window).find('.error-message').html(i18n('incorrect_password'));
@@ -136,7 +136,7 @@ async function UIWindowFinalizeUserDeletion(options){
// mark user as deleted
window.user.deleted = true;
// log user out
- logout();
+ window.logout();
}
else{
$(el_window).find('.error-message').html(html_encode(data.error));
diff --git a/src/UI/Settings/UIWindowSettings.js b/src/UI/Settings/UIWindowSettings.js
index 2a720372e..28300f231 100644
--- a/src/UI/Settings/UIWindowSettings.js
+++ b/src/UI/Settings/UIWindowSettings.js
@@ -45,7 +45,7 @@ async function UIWindowSettings(options){
// side bar
h += ``;
@@ -82,7 +82,6 @@ async function UIWindowSettings(options){
allow_user_select: true,
backdrop: false,
width: 800,
- height: 500,
height: 'auto',
dominant: true,
show_in_taskbar: false,
diff --git a/src/UI/UIAlert.js b/src/UI/UIAlert.js
index c5763ea0b..dcf46cdda 100644
--- a/src/UI/UIAlert.js
+++ b/src/UI/UIAlert.js
@@ -23,7 +23,7 @@ function UIAlert(options){
// set sensible defaults
if(arguments.length > 0){
// if first argument is a string, then assume it is the message
- if(isString(arguments[0])){
+ if(window.isString(arguments[0])){
options = {};
options.message = arguments[0];
}
diff --git a/src/UI/UIContextMenu.js b/src/UI/UIContextMenu.js
index 9f5f65d3c..367bc33cd 100644
--- a/src/UI/UIContextMenu.js
+++ b/src/UI/UIContextMenu.js
@@ -20,7 +20,7 @@
function UIContextMenu(options){
$('.window-active .window-app-iframe').css('pointer-events', 'none');
- const menu_id = global_element_id++;
+ const menu_id = window.global_element_id++;
let h = '';
h += ` (window.innerHeight - taskbar_height - 10))
- y_pos = window.innerHeight - menu_height - 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;
@@ -257,7 +257,7 @@ function UIContextMenu(options){
$(options.parent_element).css('overflow', 'scroll');
$(options.parent_element).removeClass('has-open-contextmenu');
if($(options.parent_element).hasClass('taskbar-item')){
- make_taskbar_sortable()
+ window.make_taskbar_sortable()
}
}
})
diff --git a/src/UI/UIDesktop.js b/src/UI/UIDesktop.js
index be26556e2..92d3bf822 100644
--- a/src/UI/UIDesktop.js
+++ b/src/UI/UIDesktop.js
@@ -41,9 +41,9 @@ async function UIDesktop(options){
let h = '';
// connect socket.
- window.socket = io(gui_origin + '/', {
+ window.socket = io(window.gui_origin + '/', {
query: {
- auth_token: auth_token
+ auth_token: window.auth_token
}
});
@@ -83,7 +83,7 @@ async function UIDesktop(options){
console.error('GUI Socket Error:', error);
});
- socket.on('upload.progress', (msg) => {
+ window.socket.on('upload.progress', (msg) => {
if(window.progress_tracker[msg.operation_id]){
window.progress_tracker[msg.operation_id].cloud_uploaded += msg.loaded_diff
if(window.progress_tracker[msg.operation_id][msg.item_upload_id]){
@@ -92,7 +92,7 @@ async function UIDesktop(options){
}
});
- socket.on('download.progress', (msg) => {
+ window.socket.on('download.progress', (msg) => {
if(window.progress_tracker[msg.operation_id]){
if(window.progress_tracker[msg.operation_id][msg.item_upload_id]){
window.progress_tracker[msg.operation_id][msg.item_upload_id].downloaded = msg.loaded;
@@ -101,30 +101,30 @@ async function UIDesktop(options){
}
});
- socket.on('trash.is_empty', async (msg) => {
- $(`.item[data-path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']);
- $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.window-head-icon').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']);
+ window.socket.on('trash.is_empty', async (msg) => {
+ $(`.item[data-path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']);
+ $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.window-head-icon').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']);
// empty trash windows if needed
if(msg.is_empty)
- $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.item-container').empty();
+ $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.item-container').empty();
})
- socket.on('app.opened', async (app) => {
+ window.socket.on('app.opened', async (app) => {
// don't update if this is the original client that initiated the action
if(app.original_client_socket_id === window.socket.id)
return;
// add the app to the beginning of the array
- launch_apps.recent.unshift(app);
+ window.launch_apps.recent.unshift(app);
// dedupe the array by uuid, uid, and id
- launch_apps.recent = _.uniqBy(launch_apps.recent, 'name');
+ window.launch_apps.recent = _.uniqBy(window.launch_apps.recent, 'name');
// limit to 5
- launch_apps.recent = launch_apps.recent.slice(0, window.launch_recent_apps_count);
+ window.launch_apps.recent = window.launch_apps.recent.slice(0, window.launch_recent_apps_count);
})
- socket.on('item.removed', async (item) => {
+ window.socket.on('item.removed', async (item) => {
// don't update if this is the original client that initiated the action
if(item.original_client_socket_id === window.socket.id)
return;
@@ -143,17 +143,17 @@ async function UIDesktop(options){
});
})
- socket.on('item.updated', async (item) => {
+ window.socket.on('item.updated', async (item) => {
// Don't update if this is the original client that initiated the action
if(item.original_client_socket_id === window.socket.id)
return;
// Update matching items
// set new item name
- $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(truncate_filename(item.name, TRUNCATE_LENGTH)).replaceAll(' ', ' '));
+ $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(window.truncate_filename(item.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' '));
// Set new icon
- const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await item_icon(item)).image);
+ const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await window.item_icon(item)).image);
$(`.item[data-uid='${item.uid}']`).find('.item-icon-thumb').attr('src', new_icon);
$(`.item[data-uid='${item.uid}']`).find('.item-icon-icon').attr('src', new_icon);
@@ -189,21 +189,21 @@ async function UIDesktop(options){
// Update all exact-matching windows
$(`.window-${item.uid}`).each(function(){
- update_window_path(this, new_path);
+ window.update_window_path(this, new_path);
})
// Set new name for matching open windows
$(`.window-${item.uid} .window-head-title`).text(item.name);
// Re-sort all matching item containers
$(`.item[data-uid='${item.uid}']`).parent('.item-container').each(function(){
- sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order'));
+ window.sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order'));
})
})
- socket.on('item.moved', async (resp) => {
+ window.socket.on('item.moved', async (resp) => {
let fsentry = resp;
// Notify all apps that are watching this item
- sendItemChangeEventToWatchingApps(fsentry.uid, {
+ window.sendItemChangeEventToWatchingApps(fsentry.uid, {
event: 'moved',
uid: fsentry.uid,
name: fsentry.name,
@@ -216,9 +216,6 @@ async function UIDesktop(options){
let dest_path = path.dirname(fsentry.path);
let metadata = fsentry.metadata;
- // path must use the real name from DB
- fsentry.path = fsentry.path;
-
// update all shortcut_to_path
$(`.item[data-shortcut_to_path="${html_encode(resp.old_path)}" i]`).attr(`data-shortcut_to_path`, html_encode(fsentry.path));
@@ -230,13 +227,13 @@ async function UIDesktop(options){
$(this).removeItems();
// update parent windows' item counts
$(parent_windows).each(function(index){
- update_explorer_footer_item_count(this);
- update_explorer_footer_selected_items_count(this)
+ window.update_explorer_footer_item_count(this);
+ window.update_explorer_footer_selected_items_count(this)
});
})
// if trashing, close windows of trashed items and its descendants
- if(dest_path === trash_path){
+ if(dest_path === window.trash_path){
$(`.window[data-path="${html_encode(resp.old_path)}" i]`).close();
// todo this has to be case-insensitive but the `i` selector doesn't work on ^=
$(`.window[data-path^="${html_encode(resp.old_path)}/"]`).close();
@@ -246,11 +243,11 @@ async function UIDesktop(options){
else{
// todo this has to be case-insensitive but the `i` selector doesn't work on ^=
$(`.window[data-path^="${html_encode(resp.old_path)}/"], .window[data-path="${html_encode(resp.old_path)}" i]`).each(function(){
- update_window_path(this, $(this).attr('data-path').replace(resp.old_path, fsentry.path));
+ window.update_window_path(this, $(this).attr('data-path').replace(resp.old_path, fsentry.path));
})
}
- if(dest_path === trash_path){
+ if(dest_path === window.trash_path){
$(`.item[data-uid="${fsentry.uid}"]`).find('.item-is-shared').fadeOut(300);
// if trashing dir...
@@ -277,14 +274,14 @@ async function UIDesktop(options){
immutable: fsentry.immutable,
uid: fsentry.uid,
path: fsentry.path,
- icon: await item_icon(fsentry),
- name: (dest_path === trash_path) ? metadata.original_name : fsentry.name,
+ icon: await window.item_icon(fsentry),
+ name: (dest_path === window.trash_path) ? metadata.original_name : fsentry.name,
is_dir: fsentry.is_dir,
size: fsentry.size,
type: fsentry.type,
modified: fsentry.modified,
is_selected: false,
- is_shared: (dest_path === trash_path) ? false : fsentry.is_shared,
+ is_shared: (dest_path === window.trash_path) ? false : fsentry.is_shared,
is_shortcut: fsentry.is_shortcut,
shortcut_to: fsentry.shortcut_to,
shortcut_to_path: fsentry.shortcut_to_path,
@@ -305,7 +302,7 @@ async function UIDesktop(options){
immutable: false,
uid: dir.uid,
path: dir.path,
- icon: await item_icon(dir),
+ icon: await window.item_icon(dir),
name: dir.name,
size: dir.size,
type: dir.type,
@@ -316,34 +313,34 @@ async function UIDesktop(options){
has_website: false,
});
}
- sort_items(item_container, $(item_container).attr('data-sort_by'), $(item_container).attr('data-sort_order'));
+ window.sort_items(item_container, $(item_container).attr('data-sort_by'), $(item_container).attr('data-sort_order'));
});
}
//sort each container
$(`.item-container[data-path='${html_encode(dest_path)}' i]`).each(function(){
- sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
+ window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
})
});
- socket.on('user.email_confirmed', (msg) => {
+ window.socket.on('user.email_confirmed', (msg) => {
// don't update if this is the original client that initiated the action
if(msg.original_client_socket_id === window.socket.id)
return;
- refresh_user_data(window.auth_token);
+ window.refresh_user_data(window.auth_token);
});
- socket.on('user.email_changed', (msg) => {
+ window.socket.on('user.email_changed', (msg) => {
// don't update if this is the original client that initiated the action
if(msg.original_client_socket_id === window.socket.id)
return;
- refresh_user_data(window.auth_token);
+ window.refresh_user_data(window.auth_token);
});
- socket.on('item.renamed', async (item) => {
+ window.socket.on('item.renamed', async (item) => {
// Notify all apps that are watching this item
- sendItemChangeEventToWatchingApps(item.uid, {
+ window.sendItemChangeEventToWatchingApps(item.uid, {
event: 'rename',
uid: item.uid,
// path: item.path,
@@ -357,10 +354,10 @@ async function UIDesktop(options){
// Update matching items
// Set new item name
- $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(truncate_filename(item.name, TRUNCATE_LENGTH)).replaceAll(' ', ' '));
+ $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(window.truncate_filename(item.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' '));
// Set new icon
- const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await item_icon(item)).image);
+ const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await window.item_icon(item)).image);
$(`.item[data-uid='${item.uid}']`).find('.item-icon-icon').attr('src', new_icon);
// Set new data-name
@@ -395,24 +392,24 @@ async function UIDesktop(options){
// Update all exact-matching windows
$(`.window-${item.uid}`).each(function(){
- update_window_path(this, new_path);
+ window.update_window_path(this, new_path);
})
// Set new name for matching open windows
$(`.window-${item.uid} .window-head-title`).text(item.name);
// Re-sort all matching item containers
$(`.item[data-uid='${item.uid}']`).parent('.item-container').each(function(){
- sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order'));
+ window.sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order'));
})
});
- socket.on('item.added', async (item) => {
+ window.socket.on('item.added', async (item) => {
// if item is empty, don't proceed
if(_.isEmpty(item))
return;
// Notify all apps that are watching this item
- sendItemChangeEventToWatchingApps(item.uid, {
+ window.sendItemChangeEventToWatchingApps(item.uid, {
event: 'write',
uid: item.uid,
// path: item.path,
@@ -437,12 +434,12 @@ async function UIDesktop(options){
'data-type': item.type,
})
// set new icon
- const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await item_icon(item)).image);
+ const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await window.item_icon(item)).image);
$(`.item[data-uid="${item.overwritten_uid}"]`).find('.item-icon > img').attr('src', new_icon);
//sort each window
$(`.item-container[data-path='${html_encode(item.dirpath)}' i]`).each(function(){
- sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
+ window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
})
}
else{
@@ -452,7 +449,7 @@ async function UIDesktop(options){
immutable: item.immutable,
associated_app_name: item.associated_app?.name,
path: item.path,
- icon: await item_icon(item),
+ icon: await window.item_icon(item),
name: item.name,
size: item.size,
type: item.type,
@@ -460,14 +457,13 @@ async function UIDesktop(options){
is_dir: item.is_dir,
is_shared: item.is_shared,
is_shortcut: item.is_shortcut,
- associated_app_name: item.associated_app?.name,
shortcut_to: item.shortcut_to,
shortcut_to_path: item.shortcut_to_path,
});
//sort each window
$(`.item-container[data-path='${html_encode(item.dirpath)}' i]`).each(function(){
- sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
+ window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
})
}
});
@@ -488,12 +484,12 @@ async function UIDesktop(options){
data-uid="${options.desktop_fsentry.uid}"
data-sort_by="${!options.desktop_fsentry.sort_by ? 'name' : options.desktop_fsentry.sort_by}"
data-sort_order="${!options.desktop_fsentry.sort_order ? 'asc' : options.desktop_fsentry.sort_order}"
- data-path="${html_encode(desktop_path)}"
+ data-path="${html_encode(window.desktop_path)}"
>`;
h += `
`;
// Get window sidebar width
- getItem({
+ window.getItem({
key: "window_sidebar_width",
success: async function(res){
let value = parseInt(res.value);
@@ -505,7 +501,7 @@ async function UIDesktop(options){
})
// Remove `?ref=...` from navbar URL
- if(url_query_params.has('ref')){
+ if(window.url_query_params.has('ref')){
window.history.pushState(null, document.title, '/');
}
@@ -522,7 +518,7 @@ async function UIDesktop(options){
user_preferences[default_app_keys[key].substring(17)] = await puter.kv.get(default_app_keys[key]);
}
- update_user_preferences(user_preferences);
+ window.update_user_preferences(user_preferences);
});
// Append to
@@ -557,7 +553,7 @@ async function UIDesktop(options){
return false;
// recursively create directories and upload files
if(e.dataTransfer?.items?.length>0){
- upload_items(e.dataTransfer.items, desktop_path);
+ window.upload_items(e.dataTransfer.items, window.desktop_path);
}
e.stopPropagation();
@@ -574,7 +570,7 @@ async function UIDesktop(options){
tolerance: "intersect",
drop: function( event, ui ) {
// Check if item was actually dropped on desktop and not a window
- if(mouseover_window !== undefined)
+ if(window.mouseover_window !== undefined)
return;
// Can't drop anything but UIItems on desktop
@@ -582,7 +578,7 @@ async function UIDesktop(options){
return;
// Don't move an item to its current directory
- if( path.dirname($(ui.draggable).attr('data-path')) === 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
@@ -610,11 +606,11 @@ async function UIDesktop(options){
if(path.dirname($(ui.draggable).attr('data-path')) === window.trash_path)
return;
- copy_items(items_to_move, desktop_path)
+ window.copy_items(items_to_move, window.desktop_path)
}
// otherwise, move items
else{
- move_items(items_to_move, desktop_path);
+ window.move_items(items_to_move, window.desktop_path);
}
}
});
@@ -646,16 +642,16 @@ async function UIDesktop(options){
items: [
{
html: i18n('auto_arrange'),
- icon: is_auto_arrange_enabled ? '✓' : '',
+ icon: window.is_auto_arrange_enabled ? '✓' : '',
onClick: async function(){
- is_auto_arrange_enabled = !is_auto_arrange_enabled;
- store_auto_arrange_preference(is_auto_arrange_enabled);
- if(is_auto_arrange_enabled){
- sort_items(el_desktop, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order'));
- set_sort_by(options.desktop_fsentry.uid, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order'))
- clear_desktop_item_positions(el_desktop);
+ 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){
+ 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.clear_desktop_item_positions(el_desktop);
}else{
- set_desktop_item_positions(el_desktop)
+ window.set_desktop_item_positions(el_desktop)
}
}
},
@@ -665,38 +661,38 @@ async function UIDesktop(options){
'-',
{
html: i18n('name'),
- disabled: !is_auto_arrange_enabled,
+ disabled: !window.is_auto_arrange_enabled,
icon: $(el_desktop).attr('data-sort_by') === 'name' ? '✓' : '',
onClick: async function(){
- sort_items(el_desktop, 'name', $(el_desktop).attr('data-sort_order'));
- set_sort_by(options.desktop_fsentry.uid, 'name', $(el_desktop).attr('data-sort_order'))
+ 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'))
}
},
{
html: i18n('date_modified'),
- disabled: !is_auto_arrange_enabled,
+ disabled: !window.is_auto_arrange_enabled,
icon: $(el_desktop).attr('data-sort_by') === 'modified' ? '✓' : '',
onClick: async function(){
- sort_items(el_desktop, 'modified', $(el_desktop).attr('data-sort_order'));
- set_sort_by(options.desktop_fsentry.uid, 'modified', $(el_desktop).attr('data-sort_order'))
+ 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'))
}
},
{
html: i18n('type'),
- disabled: !is_auto_arrange_enabled,
+ disabled: !window.is_auto_arrange_enabled,
icon: $(el_desktop).attr('data-sort_by') === 'type' ? '✓' : '',
onClick: async function(){
- sort_items(el_desktop, 'type', $(el_desktop).attr('data-sort_order'));
- set_sort_by(options.desktop_fsentry.uid, 'type', $(el_desktop).attr('data-sort_order'))
+ 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'))
}
},
{
html: i18n('size'),
- disabled: !is_auto_arrange_enabled,
+ disabled: !window.is_auto_arrange_enabled,
icon: $(el_desktop).attr('data-sort_by') === 'size' ? '✓' : '',
onClick: async function(){
- sort_items(el_desktop, 'size', $(el_desktop).attr('data-sort_order'));
- set_sort_by(options.desktop_fsentry.uid, 'size', $(el_desktop).attr('data-sort_order'))
+ 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'))
}
},
// -------------------------------------------
@@ -705,22 +701,22 @@ async function UIDesktop(options){
'-',
{
html: i18n('ascending'),
- disabled: !is_auto_arrange_enabled,
+ 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')
- sort_items(el_desktop, sort_by, 'asc');
- set_sort_by(options.desktop_fsentry.uid, sort_by, 'asc')
+ window.sort_items(el_desktop, sort_by, 'asc');
+ window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'asc')
}
},
{
html: i18n('descending'),
- disabled: !is_auto_arrange_enabled,
+ 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')
- sort_items(el_desktop, sort_by, 'desc');
- set_sort_by(options.desktop_fsentry.uid, sort_by, 'desc')
+ window.sort_items(el_desktop, sort_by, 'desc');
+ window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'desc')
}
},
]
@@ -754,7 +750,7 @@ async function UIDesktop(options){
// -------------------------------------------
// New File
// -------------------------------------------
- new_context_menu_item(desktop_path, el_desktop),
+ new_context_menu_item(window.desktop_path, el_desktop),
// -------------------------------------------
// -
// -------------------------------------------
@@ -764,12 +760,12 @@ async function UIDesktop(options){
// -------------------------------------------
{
html: i18n('paste'),
- disabled: clipboard.length > 0 ? false : true,
+ disabled: window.clipboard.length > 0 ? false : true,
onClick: function(){
- if(clipboard_op === 'copy')
- copy_clipboard_items(desktop_path, el_desktop);
- else if(clipboard_op === 'move')
- move_clipboard_items(el_desktop)
+ 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)
}
},
// -------------------------------------------
@@ -777,9 +773,9 @@ async function UIDesktop(options){
// -------------------------------------------
{
html: i18n('undo'),
- disabled: actions_history.length > 0 ? false : true,
+ disabled: window.actions_history.length > 0 ? false : true,
onClick: function(){
- undo_last_action();
+ window.undo_last_action();
}
},
// -------------------------------------------
@@ -788,7 +784,7 @@ async function UIDesktop(options){
{
html: i18n('upload_here'),
onClick: function(){
- init_upload_using_dialog(el_desktop);
+ window.init_upload_using_dialog(el_desktop);
}
},
// -------------------------------------------
@@ -815,7 +811,7 @@ 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(!is_embedded && !window.is_fullpage_mode){
+ if(!window.is_embedded && !window.is_fullpage_mode){
refresh_item_container(el_desktop, {fadeInItems: true})
}
@@ -908,7 +904,7 @@ async function UIDesktop(options){
}
// refer
- if(user.referral_code){
+ if(window.user.referral_code){
ht += ``;
}
@@ -919,7 +915,7 @@ async function UIDesktop(options){
}
// qr code button -- only show if not embedded
- if(!is_embedded)
+ if(!window.is_embedded)
ht += ``;
// user options menu
@@ -937,17 +933,17 @@ async function UIDesktop(options){
// ---------------------------------------------
// Run apps from insta-login URL
// ---------------------------------------------
- if(url_query_params.has('app')){
- let url_app_name = url_query_params.get('app');
+ if(window.url_query_params.has('app')){
+ let url_app_name = window.url_query_params.get('app');
if(url_app_name === 'explorer'){
- let predefined_path = home_path;
- if(url_query_params.has('path'))
- predefined_path =url_query_params.get('path')
+ let predefined_path = window.home_path;
+ if(window.url_query_params.has('path'))
+ predefined_path =window.url_query_params.get('path')
// launch explorer
UIWindow({
path: predefined_path,
title: path.basename(predefined_path),
- icon: await item_icon({is_dir: true, path: predefined_path}),
+ icon: await window.item_icon({is_dir: true, path: predefined_path}),
// todo
// uid: $(el_item).attr('data-uid'),
is_dir: true,
@@ -963,11 +959,11 @@ async function UIDesktop(options){
else if(window.app_launched_from_url){
let qparams = new URLSearchParams(window.location.search);
if(!qparams.has('c')){
- launch_app({
- name: app_launched_from_url,
+ window.launch_app({
+ name: window.app_launched_from_url,
readURL: qparams.get('readURL'),
maximized: qparams.get('maximized'),
- params: app_query_params ?? [],
+ params: window.app_query_params ?? [],
is_fullpage: window.is_fullpage_mode,
window_options: {
stay_on_top: false,
@@ -1014,21 +1010,21 @@ async function UIDesktop(options){
var x1=month + "/" + dt + "/" + x.getFullYear();
x1 = x1 + " - " + hours + ":" + minutes + ":" + seconds + " " + ampm;
$('#clock').html(x1);
- $('#clock').css('line-height', taskbar_height + 'px');
+ $('#clock').css('line-height', window.taskbar_height + 'px');
}
setInterval(display_ct, 1000);
// show referral notice window
- if(window.show_referral_notice && !user.email_confirmed){
- getItem({
+ if(window.show_referral_notice && !window.user.email_confirmed){
+ window.getItem({
key: "shown_referral_notice",
success: async function(res){
if(!res){
setTimeout(() => {
UIWindowClaimReferral();
}, 1000);
- setItem({
+ window.setItem({
key: "shown_referral_notice",
value: true,
})
@@ -1122,13 +1118,13 @@ $(document).on('click', '.user-options-menu-btn', async function(e){
items.push(
{
html: l_user.username,
- icon: l_user.username === user.username ? '✓' : '',
+ icon: l_user.username === window.user.username ? '✓' : '',
onClick: async function(val){
// don't reload everything if clicked on already-logged-in user
- if(l_user.username === user.username)
+ if(l_user.username === window.user.username)
return;
// update auth data
- update_auth_data(l_user.auth_token, l_user);
+ window.update_auth_data(l_user.auth_token, l_user);
// refresh
location.reload();
}
@@ -1167,7 +1163,7 @@ $(document).on('click', '.user-options-menu-btn', async function(e){
// -------------------------------------------
// Load available languages
// -------------------------------------------
- const supportedLanguagesItems = listSupportedLanguages().map(lang => {
+ const supportedLanguagesItems = window.listSupportedLanguages().map(lang => {
return {
html: lang.name,
icon: window.locale === lang.code ? '✓' : '',
@@ -1246,11 +1242,11 @@ $(document).on('click', '.user-options-menu-btn', async function(e){
]
})
if(alert_resp === 'close_and_log_out')
- logout();
+ window.logout();
}
// no open windows
else
- logout();
+ window.logout();
}
},
]
@@ -1258,7 +1254,7 @@ $(document).on('click', '.user-options-menu-btn', async function(e){
})
$(document).on('click', '.fullscreen-btn', async function (e) {
- if(!is_fullscreen()) {
+ if(!window.is_fullscreen()) {
var elem = document.documentElement;
if (elem.requestFullscreen) {
elem.requestFullscreen();
@@ -1305,7 +1301,7 @@ $(document).on('click', '.refer-btn', async function(e){
})
$(document).on('click', '.start-app', async function(e){
- launch_app({
+ window.launch_app({
name: $(this).attr('data-app-name')
})
// close popovers
@@ -1367,7 +1363,7 @@ $(document).on('focus', '.launch-search', function(e){
})
$(document).on('change keyup keypress keydown paste', '.launch-search', function(e){
- // search launch_apps.recommended for query
+ // search window.launch_apps.recommended for query
const query = $(this).val().toLowerCase();
if(query === ''){
$('.launch-search-clear').hide();
@@ -1378,7 +1374,7 @@ $(document).on('change keyup keypress keydown paste', '.launch-search', function
$('.launch-apps-recent').hide();
$('.start-section-heading').hide();
$('.launch-search-clear').show();
- launch_apps.recommended.forEach((app)=>{
+ window.launch_apps.recommended.forEach((app)=>{
if(app.title.toLowerCase().includes(query.toLowerCase())){
$(`.start-app-card[data-name="${app.name}"]`).show();
}else{
@@ -1457,7 +1453,7 @@ window.update_taskbar = function(){
// update taskbar in the server-side
$.ajax({
- url: api_origin + "/update-taskbar-items",
+ url: window.api_origin + "/update-taskbar-items",
type: 'POST',
data: JSON.stringify({
items: items,
@@ -1465,7 +1461,7 @@ window.update_taskbar = function(){
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
})
}
@@ -1485,7 +1481,7 @@ window.enter_fullpage_mode = (el_window)=>{
$(el_window).css({
width: '100%',
height: '100%',
- top: toolbar_height + 'px',
+ top: window.toolbar_height + 'px',
left: 0,
'border-radius': 0,
});
@@ -1499,7 +1495,7 @@ window.exit_fullpage_mode = (el_window)=>{
refresh_item_container($('.desktop.item-container'), {fadeInItems: true});
$(el_window).removeAttr('data-is_fullpage');
if(el_window){
- reset_window_size_and_position(el_window)
+ window.reset_window_size_and_position(el_window)
$(el_window).find('.window-head').show();
}
@@ -1510,14 +1506,14 @@ window.exit_fullpage_mode = (el_window)=>{
$('.show-desktop-btn').hide();
// refresh desktop background
- refresh_desktop_background();
+ window.refresh_desktop_background();
}
window.reset_window_size_and_position = (el_window)=>{
$(el_window).css({
width: 680,
height: 380,
- 'border-radius': window_border_radius,
+ 'border-radius': window.window_border_radius,
top: 'calc(50% - 190px)',
left: 'calc(50% - 340px)',
});
diff --git a/src/UI/UIItem.js b/src/UI/UIItem.js
index f2c2c49a4..b601df1c8 100644
--- a/src/UI/UIItem.js
+++ b/src/UI/UIItem.js
@@ -39,7 +39,7 @@ function UIItem(options){
return;
}
- const item_id = global_element_id++;
+ const item_id = window.global_element_id++;
let last_mousedown_ts = 999999999999999;
let rename_cancelled = false;
@@ -59,7 +59,7 @@ function UIItem(options){
options.sort_container_after_append = (options.sort_container_after_append !== undefined ? options.sort_container_after_append : false);
const is_shared_with_me = (options.path !== '/'+window.user.username && !options.path.startsWith('/'+window.user.username+'/'));
- let website_url = determine_website_url(options.path);
+ let website_url = window.determine_website_url(options.path);
// do a quick check to see if the target parent has any file type restrictions
const appendto_allowed_file_types = $(options.appendTo).attr('data-allowed_file_types')
@@ -101,7 +101,7 @@ function UIItem(options){
h += ``;
- h += `${options.size ? byte_format(options.size) : '-'}`;
+ h += `${options.size ? window.byte_format(options.size) : '-'}`;
h += `
`;
// type
h += ``;
@@ -158,7 +158,7 @@ function UIItem(options){
h += `
`;
// name
- h += `${options.is_trash ? i18n('trash') : html_encode(truncate_filename(options.name, TRUNCATE_LENGTH)).replaceAll(' ', ' ')}`
+ h += `${options.is_trash ? i18n('trash') : html_encode(window.truncate_filename(options.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' ')}`
// name editor
h += ``
h += ``;
+ h += `
`;
h += `})
`;
h += html_encode(options.content);
h += `
`;
@@ -31,7 +31,7 @@ function UINotification(options){
$('body').append(h);
- const el_notification = document.getElementById(`ui-notification__${global_element_id}`);
+ const el_notification = document.getElementById(`ui-notification__${window.global_element_id}`);
$(el_notification).show(0, function(e){
// options.onAppend()
@@ -44,7 +44,7 @@ function UINotification(options){
$(el_notification).delay(100).show(0).
// In the right position (the mouse)
css({
- top: toolbar_height + 15,
+ top: window.toolbar_height + 15,
});
return el_notification;
@@ -52,9 +52,10 @@ function UINotification(options){
$(document).on('click', '.notification', function(e){
if($(e.target).hasClass('notification')){
- if(options.click && typeof options.click === 'function'){
- options.click(e);
- }
+ // TODO: options isn't available here
+ // if(options.click && typeof options.click === 'function'){
+ // options.click(e);
+ // }
window.close_notification(e.target);
}else{
window.close_notification($(e.target).closest('.notification'));
diff --git a/src/UI/UIPopover.js b/src/UI/UIPopover.js
index 69f7ddaaf..23f6f21bb 100644
--- a/src/UI/UIPopover.js
+++ b/src/UI/UIPopover.js
@@ -25,19 +25,19 @@ function UIPopover(options){
$('.window-active .window-app-iframe').css('pointer-events', 'none');
- global_element_id++;
+ window.global_element_id++;
options.content = options.content ?? '';
let h = '';
- h += ``;
h += html_encode(options.content);
h += ``;
+ h += `
`;
h += options.content;
h += `
`;
$('body').append(h);
- const el_popover = document.getElementById(`popover-${global_element_id}`);
+ const el_popover = document.getElementById(`popover-${window.global_element_id}`);
$(el_popover).show(0, function(e){
// options.onAppend()
@@ -73,7 +73,7 @@ function UIPopover(options){
// Y position
const popover_height = options.height ?? $(el_popover).height();
if(options.center_horizontally){
- y_pos = options.top ?? (window.innerHeight - (taskbar_height + popover_height + 10));
+ y_pos = options.top ?? (window.innerHeight - (window.taskbar_height + popover_height + 10));
}else{
y_pos = options.top ?? ($(options.snapToElement).offset().top + $(options.snapToElement).height() + 5);
}
diff --git a/src/UI/UIPrompt.js b/src/UI/UIPrompt.js
index 7d48f72c0..56b8f4ea4 100644
--- a/src/UI/UIPrompt.js
+++ b/src/UI/UIPrompt.js
@@ -23,7 +23,7 @@ function UIPrompt(options){
// set sensible defaults
if(arguments.length > 0){
// if first argument is a string, then assume it is the message
- if(isString(arguments[0])){
+ if(window.isString(arguments[0])){
options = {};
options.message = arguments[0];
}
diff --git a/src/UI/UITaskbar.js b/src/UI/UITaskbar.js
index 43b7a603e..2184f4c46 100644
--- a/src/UI/UITaskbar.js
+++ b/src/UI/UITaskbar.js
@@ -21,19 +21,19 @@ import UITaskbarItem from './UITaskbarItem.js'
import UIPopover from './UIPopover.js'
async function UITaskbar(options){
- global_element_id++;
+ window.global_element_id++;
options = options ?? {};
options.content = options.content ?? '';
// get launch apps
$.ajax({
- url: api_origin + "/get-launch-apps",
+ url: window.api_origin + "/get-launch-apps",
type: 'GET',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
success: function (apps){
window.launch_apps = apps;
@@ -41,7 +41,7 @@ async function UITaskbar(options){
});
let h = '';
- h += ``;
+ h += ``;
$('.desktop').append(h);
@@ -74,15 +74,15 @@ 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(!launch_apps || !launch_apps.recent || launch_apps.recent.length === 0){
+ if(!window.launch_apps || !window.launch_apps.recent || window.launch_apps.recent.length === 0){
// get launch apps
- launch_apps = await $.ajax({
- url: api_origin + "/get-launch-apps",
+ window.launch_apps = await $.ajax({
+ url: window.api_origin + "/get-launch-apps",
type: 'GET',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
});
}
@@ -96,14 +96,14 @@ async function UITaskbar(options){
// -------------------------------------------
// Recent apps
// -------------------------------------------
- if(launch_apps.recent.length > 0){
+ if(window.launch_apps.recent.length > 0){
// heading
apps_str += `${i18n('recent')}
`; // apps apps_str += ``;
- for (let index = 0; index < window.launch_recent_apps_count && index < launch_apps.recent.length; index++) {
- const app_info = launch_apps.recent[index];
+ 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 += `})
`;
@@ -116,14 +116,14 @@ async function UITaskbar(options){
// -------------------------------------------
// Reccomended apps
// -------------------------------------------
- if(launch_apps.recommended.length > 0){
+ if(window.launch_apps.recommended.length > 0){
// heading
- apps_str += `
`;
@@ -116,14 +116,14 @@ async function UITaskbar(options){
// -------------------------------------------
// Reccomended apps
// -------------------------------------------
- if(launch_apps.recommended.length > 0){
+ if(window.launch_apps.recommended.length > 0){
// heading
- apps_str += `Recommended
`; + apps_str += `Recommended
`; // apps apps_str += ``;
- for (let index = 0; index < launch_apps.recommended.length; index++) {
- const app_info = launch_apps.recommended[index];
+ for (let index = 0; index < window.launch_apps.recommended.length; index++) {
+ const app_info = window.launch_apps.recommended[index];
apps_str += `
`;
apps_str += ` {
- create_shortcut(
+ window.create_shortcut(
path.basename($(item_to_move).attr('data-path')),
$(item_to_move).attr('data-is_dir') === '1',
- $(mouseover_window).attr('data-path'),
+ $(window.mouseover_window).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'),
@@ -1261,7 +1263,7 @@ async function UIWindow(options) {
}
// otherwise, move items
else{
- move_items(items_to_move, $(mouseover_window).attr('data-path'));
+ window.move_items(items_to_move, $(window.mouseover_window).attr('data-path'));
}
},
over: function(event, ui){
@@ -1283,7 +1285,7 @@ async function UIWindow(options) {
// --------------------------------------------------------
if(options.is_resizable){
$(el_window_head).dblclick(function () {
- scale_window(el_window);
+ window.scale_window(el_window);
})
}
@@ -1299,7 +1301,7 @@ async function UIWindow(options) {
// --------------------------------------------------------
if(options.is_resizable){
$(el_window_head_scale_btn).click(function () {
- scale_window(el_window);
+ window.scale_window(el_window);
})
}
@@ -1356,7 +1358,7 @@ async function UIWindow(options) {
if(options.is_dir){
// if files were dropped...
if(e.dataTransfer?.items?.length>0){
- upload_items(e.dataTransfer.items, $(el_window).attr('data-path'))
+ window.upload_items(e.dataTransfer.items, $(el_window).attr('data-path'))
}
// de-highlight all windows
$('.item-container').removeClass('item-container-active');
@@ -1410,14 +1412,14 @@ async function UIWindow(options) {
});
// if at any point the window's width is "too small", hide the sidebar
- if($(el_window).width() < window_width_threshold_for_sidebar){
- if(width_before_snap >= window_width_threshold_for_sidebar && !sidebar_hidden){
+ if($(el_window).width() < window.window_width_threshold_for_sidebar){
+ if(width_before_snap >= window.window_width_threshold_for_sidebar && !sidebar_hidden){
$(el_window_sidebar).hide();
}
sidebar_hidden = true;
}
// if at any point the window's width is "big enough", show the sidebar
- else if($(el_window).width() >= window_width_threshold_for_sidebar){
+ else if($(el_window).width() >= window.window_width_threshold_for_sidebar){
if(sidebar_hidden){
$(el_window_sidebar).show();
}
@@ -1432,7 +1434,7 @@ async function UIWindow(options) {
// since jquery draggable sets the z-index automatically we need this to
// bring windows to the front when they are clicked.
- last_window_zindex = parseInt($(el_window).css('z-index'));
+ window.last_window_zindex = parseInt($(el_window).css('z-index'));
//transform causes draggable to start inaccurately
$(el_window).css('transform', 'none');
@@ -1457,7 +1459,7 @@ async function UIWindow(options) {
// if window is not snapped, check if it should be snapped
snap_trigger_timeout = setTimeout(function(){
// if cursor is not in a snap zone, don't snap
- if(!current_active_snap_zone){
+ if(!window.current_active_snap_zone){
return;
}
// if dragging has stopped by now, don't snap
@@ -1466,81 +1468,81 @@ async function UIWindow(options) {
}
// W
- if(!window_is_snapped && current_active_snap_zone === 'w'){
+ if(!window_is_snapped && window.current_active_snap_zone === 'w'){
window_snap_placeholder.css({
'display': 'block',
'width': '50%',
- 'height': desktop_height,
- 'top': toolbar_height,
+ 'height': window.desktop_height,
+ 'top': window.toolbar_height,
'left': 0,
- 'z-index': last_window_zindex - 1,
+ 'z-index': window.last_window_zindex - 1,
})
}
// NW
- else if(!window_is_snapped && current_active_snap_zone === 'nw'){
+ else if(!window_is_snapped && window.current_active_snap_zone === 'nw'){
window_snap_placeholder.css({
'display': 'block',
'width': '50%',
- 'height': desktop_height/2,
- 'top': toolbar_height,
+ 'height': window.desktop_height/2,
+ 'top': window.toolbar_height,
'left': 0,
- 'z-index': last_window_zindex - 1,
+ 'z-index': window.last_window_zindex - 1,
})
}
// NE
- else if(!window_is_snapped && current_active_snap_zone ==='ne'){
+ else if(!window_is_snapped && window.current_active_snap_zone ==='ne'){
window_snap_placeholder.css({
'display': 'block',
'width': '50%',
- 'height': desktop_height/2,
- 'top': toolbar_height,
- 'left': desktop_width/2,
- 'z-index': last_window_zindex - 1,
+ 'height': window.desktop_height/2,
+ 'top': window.toolbar_height,
+ 'left': window.desktop_width/2,
+ 'z-index': window.last_window_zindex - 1,
})
}
// E
- else if(!window_is_snapped && current_active_snap_zone ==='e'){
+ else if(!window_is_snapped && window.current_active_snap_zone ==='e'){
window_snap_placeholder.css({
'display': 'block',
'width': '50%',
- 'height': desktop_height,
- 'top': toolbar_height,
+ 'height': window.desktop_height,
+ 'top': window.toolbar_height,
'left': 'initial',
'right': 0,
- 'z-index': last_window_zindex - 1,
+ 'z-index': window.last_window_zindex - 1,
})
}
// N
- else if(!window_is_snapped && current_active_snap_zone ==='n'){
+ else if(!window_is_snapped && window.current_active_snap_zone ==='n'){
window_snap_placeholder.css({
'display': 'block',
- 'width': desktop_width,
- 'height': desktop_height,
- 'top': toolbar_height,
+ 'width': window.desktop_width,
+ 'height': window.desktop_height,
+ 'top': window.toolbar_height,
'left': 0,
- 'z-index': last_window_zindex - 1,
+ 'z-index': window.last_window_zindex - 1,
})
}
// SW
- else if(!window_is_snapped && current_active_snap_zone ==='sw'){
+ else if(!window_is_snapped && window.current_active_snap_zone ==='sw'){
window_snap_placeholder.css({
'display': 'block',
- 'top': toolbar_height + desktop_height/2,
+ 'top': window.toolbar_height + window.desktop_height/2,
'left': 0,
'width': '50%',
- 'height': desktop_height/2,
- 'z-index': last_window_zindex - 1,
+ 'height': window.desktop_height/2,
+ 'z-index': window.last_window_zindex - 1,
})
}
// SE
- else if(!window_is_snapped && current_active_snap_zone ==='se'){
+ else if(!window_is_snapped && window.current_active_snap_zone ==='se'){
window_snap_placeholder.css({
'display': 'block',
- 'top': toolbar_height + desktop_height/2,
- 'left': desktop_width/2,
+ 'top': window.toolbar_height + window.desktop_height/2,
+ 'left': window.desktop_width/2,
'width': '50%',
- 'height': desktop_height/2,
- 'z-index': last_window_zindex - 1,
+ 'height': window.desktop_height/2,
+ 'z-index': window.last_window_zindex - 1,
})
}
@@ -1556,7 +1558,7 @@ async function UIWindow(options) {
}, 500);
// if mouse is not in a snap zone, hide snap placeholder
- if(snap_placeholder_active && !current_active_snap_zone){
+ if(snap_placeholder_active && !window.current_active_snap_zone){
snap_placeholder_active = false;
window_snap_placeholder.fadeOut(80);
}
@@ -1587,62 +1589,62 @@ async function UIWindow(options) {
setTimeout(function(){
// snap to w
- if(current_active_snap_zone === 'w'){
+ if(window.current_active_snap_zone === 'w'){
$(el_window).css({
- 'top': toolbar_height,
+ 'top': window.toolbar_height,
'left': 0,
'width': '50%',
- 'height': desktop_height,
+ 'height': window.desktop_height,
})
}
// snap to nw
- else if(current_active_snap_zone === 'nw'){
+ else if(window.current_active_snap_zone === 'nw'){
$(el_window).css({
- 'top': toolbar_height,
+ 'top': window.toolbar_height,
'left': 0,
'width': '50%',
- 'height': desktop_height/2,
+ 'height': window.desktop_height/2,
})
}
// snap to ne
- else if(current_active_snap_zone === 'ne'){
+ else if(window.current_active_snap_zone === 'ne'){
$(el_window).css({
- 'top': toolbar_height,
+ 'top': window.toolbar_height,
'left': '50%',
'width': '50%',
- 'height': desktop_height/2,
+ 'height': window.desktop_height/2,
})
}
// snap to sw
- else if(current_active_snap_zone === 'sw'){
+ else if(window.current_active_snap_zone === 'sw'){
$(el_window).css({
- 'top': toolbar_height + desktop_height/2,
+ 'top': window.toolbar_height + window.desktop_height/2,
'left': 0,
'width': '50%',
- 'height': desktop_height/2,
+ 'height': window.desktop_height/2,
})
}
// snap to se
- else if(current_active_snap_zone === 'se'){
+ else if(window.current_active_snap_zone === 'se'){
$(el_window).css({
- 'top': toolbar_height + desktop_height/2,
- 'left': desktop_width/2,
+ 'top': window.toolbar_height + window.desktop_height/2,
+ 'left': window.desktop_width/2,
'width': '50%',
- 'height': desktop_height/2,
+ 'height': window.desktop_height/2,
})
}
// snap to e
- else if(current_active_snap_zone === 'e'){
+ else if(window.current_active_snap_zone === 'e'){
$(el_window).css({
- 'top': toolbar_height,
+ 'top': window.toolbar_height,
'left': '50%',
'width': '50%',
- 'height': desktop_height,
+ 'height': window.desktop_height,
})
}
// snap to n
- else if(current_active_snap_zone === 'n'){
- scale_window(el_window);
+ else if(window.current_active_snap_zone === 'n'){
+ window.scale_window(el_window);
}
// snap placeholder is no longer active
snap_placeholder_active = false;
@@ -1653,14 +1655,14 @@ async function UIWindow(options) {
window_is_snapped = true;
// if at any point the window's width is "too small", hide the sidebar
- if($(el_window).width() < window_width_threshold_for_sidebar){
- if(width_before_snap >= window_width_threshold_for_sidebar && !sidebar_hidden){
+ if($(el_window).width() < window.window_width_threshold_for_sidebar){
+ if(width_before_snap >= window.window_width_threshold_for_sidebar && !sidebar_hidden){
$(el_window_sidebar).hide();
}
sidebar_hidden = true;
}
// if at any point the window's width is "big enough", show the sidebar
- else if($(el_window).width() >= window_width_threshold_for_sidebar){
+ else if($(el_window).width() >= window.window_width_threshold_for_sidebar){
if(sidebar_hidden){
$(el_window_sidebar).show();
}
@@ -1671,9 +1673,9 @@ async function UIWindow(options) {
// if window is dropped below the taskbar, move it up
// the lst '- 30' is to account for the window head
- if($(el_window).position().top > window.innerHeight - taskbar_height - 30 && !window_will_snap){
+ if($(el_window).position().top > window.innerHeight - window.taskbar_height - 30 && !window_will_snap){
$(el_window).animate({
- top: window.innerHeight - taskbar_height - 60,
+ top: window.innerHeight - window.taskbar_height - 60,
}, 100);
}
// if window is dropped too far to the right, move it left
@@ -1700,7 +1702,7 @@ async function UIWindow(options) {
// Resizable
// --------------------------------------------------------
if(options.is_resizable){
- if($(el_window).width() < window_width_threshold_for_sidebar){
+ if($(el_window).width() < window.window_width_threshold_for_sidebar){
$(el_window_sidebar).hide();
sidebar_hidden = true;
}
@@ -1715,14 +1717,14 @@ async function UIWindow(options) {
},
resize: function (e, ui) {
// if at any point the window's width is "too small", hide the sidebar
- if(ui.size.width < window_width_threshold_for_sidebar){
- if(ui.originalSize.width >= window_width_threshold_for_sidebar && !sidebar_hidden){
+ if(ui.size.width < window.window_width_threshold_for_sidebar){
+ if(ui.originalSize.width >= window.window_width_threshold_for_sidebar && !sidebar_hidden){
$(el_window_sidebar).hide();
}
sidebar_hidden = true;
}
// if at any point the window's width is "big enough", show the sidebar
- else if(ui.size.width >= window_width_threshold_for_sidebar){
+ else if(ui.size.width >= window.window_width_threshold_for_sidebar){
if(sidebar_hidden){
$(el_window_sidebar).show();
}
@@ -1730,10 +1732,10 @@ async function UIWindow(options) {
}
// when resizing the top of the window, make sure the window head is not hidden behind the toolbar
- if($(el_window).position().top < toolbar_height){
- var difference = toolbar_height - $(el_window).position().top;
+ if($(el_window).position().top < window.toolbar_height){
+ var difference = window.toolbar_height - $(el_window).position().top;
$(el_window).css({
- 'top': toolbar_height,
+ 'top': window.toolbar_height,
'height': ui.size.height - difference // Reduce the height by the difference
});
// don't resize
@@ -1770,7 +1772,7 @@ async function UIWindow(options) {
$('.window').css('pointer-events', 'initial');
const new_width = $(el_window_sidebar).width();
// save new width in the cloud, to user's settings
- setItem({key: "window_sidebar_width", value: new_width});
+ window.setItem({key: "window_sidebar_width", value: new_width});
// save new width locally, to window object
window.window_sidebar_width = new_width;
}
@@ -1817,7 +1819,7 @@ async function UIWindow(options) {
html: $(el_window).attr('data-is_maximized') === '0' ? 'Maximize' : 'Restore',
onClick: function(){
// maximize window
- scale_window(el_window);
+ window.scale_window(el_window);
}
});
menu_items.push({
@@ -1864,7 +1866,7 @@ async function UIWindow(options) {
event.preventDefault();
if(options.allow_context_menu && event.target === el_window_body){
// Regular directories
- if($(el_window).attr('data-path') !== trash_path){
+ if($(el_window).attr('data-path') !== window.trash_path){
UIContextMenu({
parent_element: el_window_body,
items: [
@@ -1878,32 +1880,32 @@ async function UIWindow(options) {
html: i18n('name'),
icon: $(el_window).attr('data-sort_by') === 'name' ? '✓' : '',
onClick: async function(){
- sort_items(el_window_body, 'name', $(el_window).attr('data-sort_order'));
- set_sort_by($(el_window).attr('data-uid'), 'name', $(el_window).attr('data-sort_order'))
+ window.sort_items(el_window_body, 'name', $(el_window).attr('data-sort_order'));
+ window.set_sort_by($(el_window).attr('data-uid'), 'name', $(el_window).attr('data-sort_order'))
}
},
{
html: i18n('date_modified'),
icon: $(el_window).attr('data-sort_by') === 'modified' ? '✓' : '',
onClick: async function(){
- sort_items(el_window_body, 'modified', $(el_window).attr('data-sort_order'));
- set_sort_by($(el_window).attr('data-uid'), 'modified', $(el_window).attr('data-sort_order'))
+ window.sort_items(el_window_body, 'modified', $(el_window).attr('data-sort_order'));
+ window.set_sort_by($(el_window).attr('data-uid'), 'modified', $(el_window).attr('data-sort_order'))
}
},
{
html: i18n('type'),
icon: $(el_window).attr('data-sort_by') === 'type' ? '✓' : '',
onClick: async function(){
- sort_items(el_window_body, 'type', $(el_window).attr('data-sort_order'));
- set_sort_by($(el_window).attr('data-uid'), 'type', $(el_window).attr('data-sort_order'))
+ window.sort_items(el_window_body, 'type', $(el_window).attr('data-sort_order'));
+ window.set_sort_by($(el_window).attr('data-uid'), 'type', $(el_window).attr('data-sort_order'))
}
},
{
html: i18n('size'),
icon: $(el_window).attr('data-sort_by') === 'size' ? '✓' : '',
onClick: async function(){
- sort_items(el_window_body, 'size', $(el_window).attr('data-sort_order'));
- set_sort_by($(el_window).attr('data-uid'), 'size', $(el_window).attr('data-sort_order'))
+ window.sort_items(el_window_body, 'size', $(el_window).attr('data-sort_order'));
+ window.set_sort_by($(el_window).attr('data-uid'), 'size', $(el_window).attr('data-sort_order'))
}
},
// -------------------------------------------
@@ -1915,8 +1917,8 @@ async function UIWindow(options) {
icon: $(el_window).attr('data-sort_order') === 'asc' ? '✓' : '',
onClick: async function(){
const sort_by = $(el_window).attr('data-sort_by')
- sort_items(el_window_body, sort_by, 'asc');
- set_sort_by($(el_window).attr('data-uid'), sort_by, 'asc')
+ window.sort_items(el_window_body, sort_by, 'asc');
+ window.set_sort_by($(el_window).attr('data-uid'), sort_by, 'asc')
}
},
{
@@ -1924,8 +1926,8 @@ async function UIWindow(options) {
icon: $(el_window).attr('data-sort_order') === 'desc' ? '✓' : '',
onClick: async function(){
const sort_by = $(el_window).attr('data-sort_by')
- sort_items(el_window_body, sort_by, 'desc');
- set_sort_by($(el_window).attr('data-uid'), sort_by, 'desc')
+ window.sort_items(el_window_body, sort_by, 'desc');
+ window.set_sort_by($(el_window).attr('data-uid'), sort_by, 'desc')
}
},
@@ -1970,12 +1972,12 @@ async function UIWindow(options) {
// -------------------------------------------
{
html: i18n('paste'),
- disabled: (clipboard.length === 0 || $(el_window).attr('data-path') === '/') ? true : false,
+ disabled: (window.clipboard.length === 0 || $(el_window).attr('data-path') === '/') ? true : false,
onClick: function(){
- if(clipboard_op === 'copy')
- copy_clipboard_items($(el_window).attr('data-path'), el_window_body);
- else if(clipboard_op === 'move')
- move_clipboard_items(el_window_body)
+ if(window.clipboard_op === 'copy')
+ window.copy_clipboard_items($(el_window).attr('data-path'), el_window_body);
+ else if(window.clipboard_op === 'move')
+ window.move_clipboard_items(el_window_body)
}
},
// -------------------------------------------
@@ -1983,9 +1985,9 @@ async function UIWindow(options) {
// -------------------------------------------
{
html: i18n('undo'),
- disabled: actions_history.length > 0 ? false : true,
+ disabled: window.actions_history.length > 0 ? false : true,
onClick: function(){
- undo_last_action();
+ window.undo_last_action();
}
},
// -------------------------------------------
@@ -1995,7 +1997,7 @@ async function UIWindow(options) {
html: i18n('upload_here'),
disabled: $(el_window).attr('data-path') === '/' ? true : false,
onClick: function(){
- init_upload_using_dialog(el_window_body, $(el_window).attr('data-path') + '/');
+ window.init_upload_using_dialog(el_window_body, $(el_window).attr('data-path') + '/');
}
},
// -------------------------------------------
@@ -2033,7 +2035,7 @@ async function UIWindow(options) {
html: i18n('deploy_as_app'),
disabled: !options.is_dir,
onClick: async function () {
- launch_app({
+ window.launch_app({
name: 'dev-center',
file_path: $(el_window).attr('data-path'),
file_uid: $(el_window).attr('data-uid'),
@@ -2056,11 +2058,11 @@ async function UIWindow(options) {
let window_height = 500;
let window_width = 450;
- let left = mouseX;
+ let left = window.mouseX;
left -= 200;
left = left > (window.innerWidth - window_width)? (window.innerWidth - window_width) : left;
- let top = mouseY;
+ let top = window.mouseY;
top = top > (window.innerHeight - (window_height + window.taskbar_height + window.toolbar_height))? (window.innerHeight - (window_height + window.taskbar_height + window.toolbar_height)) : top;
UIWindowItemProperties(options.title, options.path, options.uid, left, top, window_width, window_height);
@@ -2099,15 +2101,15 @@ async function UIWindow(options) {
return;
// todo this has to be case-insensitive but the `i` selector doesn't work on ^=
- $(`.item[data-path^="${html_encode(trash_path)}/"]`).each(function(){
- delete_item(this);
+ $(`.item[data-path^="${html_encode(window.trash_path)}/"]`).each(function(){
+ window.delete_item(this);
})
// update other clients
if(window.socket){
window.socket.emit('trash.is_empty', {is_empty: true});
}
// use the 'empty trash' icon
- $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
+ $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
}
},
]
@@ -2143,7 +2145,7 @@ async function UIWindow(options) {
$(el_item).removeClass('item-selected');
// if files were dropped...
if(e.dataTransfer?.items?.length > 0){
- upload_items(e.dataTransfer.items, $(el_item).attr('data-path'))
+ window.upload_items(e.dataTransfer.items, $(el_item).attr('data-path'))
}
e.stopPropagation();
@@ -2160,7 +2162,7 @@ async function UIWindow(options) {
if(options.is_fullpage){
$(el_window).hide()
setTimeout(function(){
- enter_fullpage_mode(el_window);
+ window.enter_fullpage_mode(el_window);
$(el_window).show()
}, 5);
}
@@ -2170,8 +2172,8 @@ async function UIWindow(options) {
function delete_window_element (el_window){
// if this is the active element, set it to null
- if(active_element === el_window){
- active_element = null;
+ if(window.active_element === el_window){
+ window.active_element = null;
}
// remove DOM element
$(el_window).remove();
@@ -2192,7 +2194,7 @@ $(document).on('click', '.window-sidebar-item', async function(e){
UIWindow({
path: item_path,
title: path.basename(item_path),
- icon: await item_icon({is_dir: true, path: item_path}),
+ icon: await window.item_icon({is_dir: true, path: item_path}),
// todo
// uid: $(el_item).attr('data-uid'),
is_dir: true,
@@ -2207,11 +2209,11 @@ $(document).on('click', '.window-sidebar-item', async function(e){
}
// update window path only if it's a new path AND no ctrl/cmd key pressed
else if(item_path !== $(el_window).attr('data-path')){
- window_nav_history[parent_win_id] = window_nav_history[parent_win_id].slice(0, window_nav_history_current_position[parent_win_id] + 1);
- window_nav_history[parent_win_id].push(item_path);
- window_nav_history_current_position[parent_win_id]++;
+ window.window_nav_history[parent_win_id] = window.window_nav_history[parent_win_id].slice(0, window.window_nav_history_current_position[parent_win_id] + 1);
+ window.window_nav_history[parent_win_id].push(item_path);
+ window.window_nav_history_current_position[parent_win_id]++;
- update_window_path(el_window, item_path);
+ window.update_window_path(el_window, item_path);
}
})
@@ -2254,7 +2256,7 @@ $(document).on('contextmenu taphold', '.window-sidebar-item', function(event){
UIWindow({
path: item_path,
title: path.basename(item_path),
- icon: await item_icon({is_dir: true, path: item_path}),
+ icon: await window.item_icon({is_dir: true, path: item_path}),
// todo
// uid: $(el_item).attr('data-uid'),
is_dir: true,
@@ -2361,7 +2363,7 @@ $(document).on('blur', '.window-navbar-path-input', function(e){
$(document).on('keyup', '.window-navbar-path-input', function(e){
if (e.key === 'Enter' || e.keyCode === 13) {
- update_window_path($(e.target).closest('.window'), $(e.target).val());
+ window.update_window_path($(e.target).closest('.window'), $(e.target).val());
$(e.target).hide();
$(e.target).siblings('.window-navbar-path').show().select();
}
@@ -2377,7 +2379,7 @@ $(document).on('click', '.window-navbar-path-dirname', function(e){
const dirpath = $(this).attr('data-path');
UIWindow({
path: dirpath,
- title: dirpath === '/' ? root_dirname : path.basename(dirpath),
+ title: dirpath === '/' ? window.root_dirname : path.basename(dirpath),
icon: window.icons['folder.svg'],
// uid: $(el_item).attr('data-uid'),
is_dir: true,
@@ -2386,10 +2388,10 @@ $(document).on('click', '.window-navbar-path-dirname', function(e){
}
// only change dir if target is not the same as current path
else if($el_parent_window.attr('data-path') !== $(this).attr('data-path')){
- window_nav_history[parent_win_id] = window_nav_history[parent_win_id].slice(0, window_nav_history_current_position[parent_win_id]+1);
- window_nav_history[parent_win_id].push($(this).attr('data-path'));
- window_nav_history_current_position[parent_win_id] = window_nav_history[parent_win_id].length - 1;
- update_window_path($el_parent_window, $(this).attr('data-path'));
+ window.window_nav_history[parent_win_id] = window.window_nav_history[parent_win_id].slice(0, window.window_nav_history_current_position[parent_win_id]+1);
+ window.window_nav_history[parent_win_id].push($(this).attr('data-path'));
+ window.window_nav_history_current_position[parent_win_id] = window.window_nav_history[parent_win_id].length - 1;
+ window.update_window_path($el_parent_window, $(this).attr('data-path'));
}
})
@@ -2433,7 +2435,7 @@ $(document).on('contextmenu taphold', '.window-navbar-path-dirname', function(ev
onClick: function(){
UIWindow({
path: $(el).attr('data-path'),
- title: $(el).attr('data-path') === '/' ? root_dirname : path.basename($(el).attr('data-path')),
+ title: $(el).attr('data-path') === '/' ? window.root_dirname : path.basename($(el).attr('data-path')),
icon: window.icons['folder.svg'],
uid: $(el).attr('data-uid'),
is_dir: true,
@@ -2450,12 +2452,12 @@ $(document).on('contextmenu taphold', '.window-navbar-path-dirname', function(ev
// -------------------------------------------
menu_items.push({
html: "Paste",
- disabled: clipboard.length > 0 ? false : true,
+ disabled: window.clipboard.length > 0 ? false : true,
onClick: function(){
- if(clipboard_op === 'copy')
- copy_clipboard_items($(el).attr('data-path'), null);
- else if(clipboard_op === 'move')
- move_clipboard_items(null, $(el).attr('data-path'))
+ if(window.clipboard_op === 'copy')
+ window.copy_clipboard_items($(el).attr('data-path'), null);
+ else if(window.clipboard_op === 'move')
+ window.move_clipboard_items(null, $(el).attr('data-path'))
}
})
@@ -2481,7 +2483,7 @@ window.navbar_path_droppable = (el_window)=>{
tolerance: 'pointer',
drop: function( event, ui ) {
// check if item was actually dropped on this navbar path
- if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){
+ if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){
return;
}
const items_to_move = []
@@ -2500,7 +2502,7 @@ window.navbar_path_droppable = (el_window)=>{
// if alt key is down, create shortcut items
if(event.altKey){
items_to_move.forEach((item_to_move) => {
- create_shortcut(
+ window.create_shortcut(
path.basename($(item_to_move).attr('data-path')),
$(item_to_move).attr('data-is_dir') === '1',
$(this).attr('data-path'),
@@ -2512,7 +2514,7 @@ window.navbar_path_droppable = (el_window)=>{
}
// move items
else{
- move_items(items_to_move, $(this).attr('data-path'));
+ window.move_items(items_to_move, $(this).attr('data-path'));
}
$('.item-container').droppable('enable')
@@ -2522,7 +2524,7 @@ window.navbar_path_droppable = (el_window)=>{
},
over: function(event, ui){
// check if item was actually hovered over this window
- if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id'))
+ if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id'))
return;
// Don't do anything if the dragged item is NOT a UIItem
@@ -2602,14 +2604,14 @@ window.update_window_path = async function(el_window, target_path){
if(is_dir){
// if nav history for this window is empty, disable forward btn
- if(window_nav_history[win_id] && window_nav_history[win_id].length - 1 === window_nav_history_current_position[win_id])
+ if(window.window_nav_history[win_id] && window.window_nav_history[win_id].length - 1 === window.window_nav_history_current_position[win_id])
$(el_window_navbar_forward_btn).addClass('window-navbar-btn-disabled');
// ... else, enable forawrd btn
else
$(el_window_navbar_forward_btn).removeClass('window-navbar-btn-disabled');
// disable back button if path is root
- if(window_nav_history_current_position[win_id] === 0)
+ if(window.window_nav_history_current_position[win_id] === 0)
$(el_window_navbar_back_btn).addClass('window-navbar-btn-disabled');
// ... enable back btn in all other cases
else
@@ -2623,7 +2625,7 @@ window.update_window_path = async function(el_window, target_path){
$(el_window_navbar_up_btn).removeClass('window-navbar-btn-disabled');
$(el_window_item_container).attr('data-path', target_path);
- $(el_window).find('.window-navbar-path').html(navbar_path(target_path, window.user.username));
+ $(el_window).find('.window-navbar-path').html(window.navbar_path(target_path, window.user.username));
// empty body to be filled with the results of /readdir
$(el_window_body).find('.item').removeItems()
@@ -2684,10 +2686,10 @@ window.update_window_path = async function(el_window, target_path){
$(el_window_navbar_path_input).val(target_path);
$(el_window_navbar_path_input).attr('data-path', target_path);
// update layout
- update_window_layout(el_window, fsentry.layout);
+ window.update_window_layout(el_window, fsentry.layout);
// update explore header if in details view
if(fsentry.layout === 'details'){
- update_details_layout_sort_visuals(el_window, fsentry.sort_by, fsentry.sort_order);
+ window.update_details_layout_sort_visuals(el_window, fsentry.sort_by, fsentry.sort_order);
}
});
}catch(err){
@@ -2695,7 +2697,7 @@ window.update_window_path = async function(el_window, target_path){
// todo optim: this is dumb because updating the window should only happen if this /readdir request is successful,
// in that case there is no need for using update_window_path on error!!
- update_window_path(el_window, old_path);
+ window.update_window_path(el_window, old_path);
}
}
// path is '/' (global root)
@@ -2704,15 +2706,15 @@ window.update_window_path = async function(el_window, target_path){
$(el_window).addClass('window-null');
$(el_window).attr('data-uid', 'null');
$(el_window).attr('data-name', '');
- $(el_window).find('.window-head-title').text(root_dirname);
+ $(el_window).find('.window-head-title').text(window.root_dirname);
}
if(is_dir){
refresh_item_container(el_window_body);
- navbar_path_droppable(el_window)
+ window.navbar_path_droppable(el_window)
}
- update_explorer_footer_selected_items_count(el_window);
+ window.update_explorer_footer_selected_items_count(el_window);
}
// --------------------------------------------------------
@@ -2724,7 +2726,7 @@ window.sidebar_item_droppable = (el_window)=>{
tolerance: 'pointer',
drop: function( event, ui ) {
// check if item was actually dropped on this navbar path
- if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){
+ if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){
return;
}
const items_to_move = []
@@ -2743,7 +2745,7 @@ window.sidebar_item_droppable = (el_window)=>{
// if alt key is down, create shortcut items
if(event.altKey){
items_to_move.forEach((item_to_move) => {
- create_shortcut(
+ window.create_shortcut(
path.basename($(item_to_move).attr('data-path')),
$(item_to_move).attr('data-is_dir') === '1',
$(this).attr('data-path'),
@@ -2755,7 +2757,7 @@ window.sidebar_item_droppable = (el_window)=>{
}
// move items
else{
- move_items(items_to_move, $(this).attr('data-path'));
+ window.move_items(items_to_move, $(this).attr('data-path'));
}
$('.item-container').droppable('enable')
@@ -2765,7 +2767,7 @@ window.sidebar_item_droppable = (el_window)=>{
},
over: function(event, ui){
// check if item was actually hovered over this window
- if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id'))
+ if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id'))
return;
// Don't do anything if the dragged item is NOT a UIItem
@@ -2804,7 +2806,7 @@ $.fn.close = async function(options) {
// tell child app that this window is about to close, get its response
if(app_uses_sdk){
if(!options.bypass_iframe_messaging){
- const resp = await sendWindowWillCloseMsg(el_iframe.get(0));
+ const resp = await window.sendWindowWillCloseMsg(el_iframe.get(0));
if(!resp.msg){
return false;
}
@@ -2815,8 +2817,8 @@ $.fn.close = async function(options) {
if($(this).hasClass('window')){
const win_id = parseInt($(this).attr('data-id'));
let window_uuid = $(this).attr('data-element_uuid');
- // remove all instances of win_id from window_stack
- _.pullAll(window_stack, [win_id]);
+ // remove all instances of win_id from window.window_stack
+ _.pullAll(window.window_stack, [win_id]);
// taskbar update
let open_window_count = parseInt($(`.taskbar-item[data-app="${$(this).attr('data-app')}"]`).attr('data-open-windows'));
// update open window count of corresponding taskbar item
@@ -2826,14 +2828,14 @@ $.fn.close = async function(options) {
// decide whether to remove taskbar item
if(open_window_count === 1){
$(`.taskbar-item[data-app="${$(this).attr('data-app')}"] .active-taskbar-indicator`).hide();
- remove_taskbar_item($(`.taskbar-item[data-app="${$(this).attr('data-app')}"][data-keep-in-taskbar="false"]`));
+ window.remove_taskbar_item($(`.taskbar-item[data-app="${$(this).attr('data-app')}"][data-keep-in-taskbar="false"]`));
}
// if no more windows of this app are open, remove taskbar item
if(open_window_count - 1 === 0)
$(`.taskbar-item[data-app="${$(this).attr('data-app')}"] .active-taskbar-indicator`).hide();
// if a fullpage window is closed, show desktop and taskbar
if($(this).attr('data-is_fullpage') === '1'){
- exit_fullpage_mode();
+ window.exit_fullpage_mode();
}
// FileDialog closed
@@ -2850,11 +2852,11 @@ $.fn.close = async function(options) {
// close any open FileDialogs belonging to this window
$(`.window-filedialog[data-parent_uuid="${window_uuid}"]`).close();
// bring focus to the last window in the window-stack (only if not minimized)
- if(!_.isEmpty(window_stack)){
- const $last_window_in_stack = $(`.window[data-id="${window_stack[window_stack.length - 1]}"]`);
+ if(!_.isEmpty(window.window_stack)){
+ const $last_window_in_stack = $(`.window[data-id="${window.window_stack[window.window_stack.length - 1]}"]`);
// check if previous window is not minimized
if($last_window_in_stack !== null && $last_window_in_stack.attr('data-is_minimized') !== '1' && $last_window_in_stack.attr('data-is_minimized') !== 'true'){
- $(`.window[data-id="${window_stack[window_stack.length - 1]}"]`).focusWindow();
+ $(`.window[data-id="${window.window_stack[window.window_stack.length - 1]}"]`).focusWindow();
}
// otherwise, change URL/Title to desktop
else{
@@ -2913,7 +2915,7 @@ $.fn.close = async function(options) {
}
}
// focus back to desktop?
- if(_.isEmpty(window_stack)){
+ if(_.isEmpty(window.window_stack)){
// The following is to make sure the iphone keyboard is dismissed when the last window is closed
if(isMobile.phone || isMobile.tablet){
document.activeElement.blur();
@@ -2921,7 +2923,7 @@ $.fn.close = async function(options) {
}
// focus back to desktop
$('.desktop').find('.item-blurred').removeClass('item-blurred');
- active_item_container = $('.desktop.item-container').get(0);
+ window.active_item_container = $('.desktop.item-container').get(0);
}
})
@@ -2946,7 +2948,7 @@ window.scale_window = (el_window)=>{
// set new size and position
$(el_window).css({
- 'top': toolbar_height+'px',
+ 'top': window.toolbar_height+'px',
'left': '0',
'width': '100%',
'height': `calc(100% - ${window.taskbar_height + window.toolbar_height + 1}px)`,
@@ -3004,7 +3006,7 @@ window.set_sort_by = function(item_uid, sort_by, sort_order){
sort_order = 'asc';
$.ajax({
- url: api_origin + "/set_sort_by",
+ url: window.api_origin + "/set_sort_by",
type: 'POST',
data: JSON.stringify({
sort_by: sort_by,
@@ -3014,11 +3016,11 @@ window.set_sort_by = function(item_uid, sort_by, sort_order){
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (){
@@ -3080,7 +3082,7 @@ $.fn.showWindow = async function(options) {
width: $(el_window).attr('data-orig-width') + 'px',
height: $(el_window).attr('data-orig-height') + 'px',
});
- $(el_window).css('z-index', ++last_window_zindex);
+ $(el_window).css('z-index', ++window.last_window_zindex);
setTimeout(() => {
$(this).focusWindow();
@@ -3120,15 +3122,15 @@ $.fn.focusWindow = function(event) {
$('.window-app-iframe').not($app_iframe).css('pointer-events', 'none');
// bring this window to front, only if it's not stay_on_top
if($(this).attr('data-stay_on_top') !== 'true'){
- $(this).css('z-index', ++last_window_zindex);
+ $(this).css('z-index', ++window.last_window_zindex);
}
// if this window has a parent, bring them to the front too
if($(this).attr('data-parent_uuid') !== 'null'){
- $(`.window[data-element_uuid="${$(this).attr('data-parent_uuid')}"]`).css('z-index', last_window_zindex);
+ $(`.window[data-element_uuid="${$(this).attr('data-parent_uuid')}"]`).css('z-index', window.last_window_zindex);
}
// if this window has child windows, bring them to the front too
if($(this).attr('data-element_uuid') !== 'null'){
- $(`.window[data-parent_uuid="${$(this).attr('data-element_uuid')}"]`).css('z-index', ++last_window_zindex);
+ $(`.window[data-parent_uuid="${$(this).attr('data-element_uuid')}"]`).css('z-index', ++window.last_window_zindex);
}
//
// if this has an iframe, focus on it
@@ -3144,17 +3146,17 @@ $.fn.focusWindow = function(event) {
event !== undefined &&
(event.type === 'click' || event.type === 'dblclick' || event.type === 'contextmenu' || event.type === 'mousedown' || event.type === 'mouseup' || event.type === 'mousemove')
){
- $app_iframe.get(0).contentWindow.postMessage({msg: "click", x: (mouseX - rect.left), y: (mouseY - rect.top)}, '*');
+ $app_iframe.get(0).contentWindow.postMessage({msg: "click", x: (window.mouseX - rect.left), y: (window.mouseY - rect.top)}, '*');
}
}
// set active_item_container
- active_item_container = $(this).find('.item-container').get(0);
+ window.active_item_container = $(this).find('.item-container').get(0);
// grey out all selected items on other windows/desktop
- $('.item-container').not(active_item_container).find('.item-selected').addClass('item-blurred');
+ $('.item-container').not(window.active_item_container).find('.item-selected').addClass('item-blurred');
// update window-stack
- window_stack.push(parseInt($(this).attr('data-id')));
+ window.window_stack.push(parseInt($(this).attr('data-id')));
// remove blurred class from items on this window
- $(active_item_container).find('.item-blurred').removeClass('item-blurred');
+ $(window.active_item_container).find('.item-blurred').removeClass('item-blurred');
//change window URL
const update_window_url = $(this).attr('data-update_window_url');
if(update_window_url === 'true' || update_window_url === null){
@@ -3249,13 +3251,13 @@ $(document).on('click', '.explore-table-headers-th', function(e){
}
// sort
- sort_items($(e.target).closest('.window-body'), sort_by, sort_order);
- set_sort_by($(e.target).closest('.window').attr('data-uid'), sort_by, sort_order)
+ window.sort_items($(e.target).closest('.window-body'), sort_by, sort_order);
+ window.set_sort_by($(e.target).closest('.window').attr('data-uid'), sort_by, sort_order)
})
window.set_layout = function(item_uid, layout){
$.ajax({
- url: api_origin + "/set_layout",
+ url: window.api_origin + "/set_layout",
type: 'POST',
data: JSON.stringify({
item_uid: item_uid,
@@ -3264,11 +3266,11 @@ window.set_layout = function(item_uid, layout){
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (){
@@ -3277,7 +3279,7 @@ window.set_layout = function(item_uid, layout){
if(el_window.length > 0){
let sort_by = el_window.attr('data-sort_by');
let sort_order = el_window.attr('data-sort_order');
- update_details_layout_sort_visuals(el_window, sort_by, sort_order);
+ window.update_details_layout_sort_visuals(el_window, sort_by, sort_order);
}
}
}
diff --git a/src/UI/UIWindowChangePassword.js b/src/UI/UIWindowChangePassword.js
index 8aeeda5d7..9301ed162 100644
--- a/src/UI/UIWindowChangePassword.js
+++ b/src/UI/UIWindowChangePassword.js
@@ -104,7 +104,7 @@ async function UIWindowChangePassword(options){
return;
}
// check password strength
- const pass_strength = check_password_strength(new_password);
+ const pass_strength = window.check_password_strength(new_password);
if(!pass_strength.overallPass){
$(el_window).find('.form-error-msg').html(i18n('password_strength_error'));
$(el_window).find('.form-error-msg').fadeIn();
@@ -114,11 +114,11 @@ async function UIWindowChangePassword(options){
$(el_window).find('.form-error-msg').hide();
$.ajax({
- url: api_origin + "/passwd",
+ url: window.api_origin + "/passwd",
type: 'POST',
async: true,
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
contentType: "application/json",
data: JSON.stringify({
diff --git a/src/UI/UIWindowChangeUsername.js b/src/UI/UIWindowChangeUsername.js
index dadf9d01f..e901c10c1 100644
--- a/src/UI/UIWindowChangeUsername.js
+++ b/src/UI/UIWindowChangeUsername.js
@@ -94,11 +94,11 @@ async function UIWindowChangeUsername(options){
$(el_window).find('.new-username').attr('disabled', true);
$.ajax({
- url: api_origin + "/change_username",
+ url: window.api_origin + "/change_username",
type: 'POST',
async: true,
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
contentType: "application/json",
data: JSON.stringify({
diff --git a/src/UI/UIWindowColorPicker.js b/src/UI/UIWindowColorPicker.js
index 400adbb3c..70fe2b799 100644
--- a/src/UI/UIWindowColorPicker.js
+++ b/src/UI/UIWindowColorPicker.js
@@ -23,7 +23,7 @@ async function UIWindowColorPicker(options){
// set sensible defaults
if(arguments.length > 0){
// if first argument is a string, then assume it is the default color
- if(isString(arguments[0])){
+ if(window.isString(arguments[0])){
options = {};
options.default = arguments[0];
}
diff --git a/src/UI/UIWindowCopyProgress.js b/src/UI/UIWindowCopyProgress.js
index d40bda97e..297de7270 100644
--- a/src/UI/UIWindowCopyProgress.js
+++ b/src/UI/UIWindowCopyProgress.js
@@ -71,7 +71,7 @@ async function UIWindowCopyProgress(options){
});
$(el_window).find('.copy-cancel-btn').on('click', function(e){
- operation_cancelled[options.operation_id] = true;
+ window.operation_cancelled[options.operation_id] = true;
$(el_window).close();
})
diff --git a/src/UI/UIWindowDesktopBGSettings.js b/src/UI/UIWindowDesktopBGSettings.js
index 49bace6f3..45a253f51 100644
--- a/src/UI/UIWindowDesktopBGSettings.js
+++ b/src/UI/UIWindowDesktopBGSettings.js
@@ -165,7 +165,7 @@ async function UIWindowDesktopBGSettings(options){
// /set-desktop-bg
try{
$.ajax({
- url: api_origin + "/set-desktop-bg",
+ url: window.api_origin + "/set-desktop-bg",
type: 'POST',
data: JSON.stringify({
url: window.desktop_bg_url,
@@ -175,17 +175,18 @@ async function UIWindowDesktopBGSettings(options){
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
})
$(el_window).close();
resolve(true);
}catch(err){
+ // Ignore
}
})
diff --git a/src/UI/UIWindowDownloadProgress.js b/src/UI/UIWindowDownloadProgress.js
index a9f3159a5..337fdcda7 100644
--- a/src/UI/UIWindowDownloadProgress.js
+++ b/src/UI/UIWindowDownloadProgress.js
@@ -71,7 +71,7 @@ async function UIWindowDownloadProgress(options){
// cancel download button clicked
$(el_window).find('.download-cancel-btn').on('click', function(){
- operation_cancelled[options.operation_id] = true;
+ window.operation_cancelled[options.operation_id] = true;
$(el_window).close();
})
diff --git a/src/UI/UIWindowEmailConfirmationRequired.js b/src/UI/UIWindowEmailConfirmationRequired.js
index 46bba008a..4c472f7f3 100644
--- a/src/UI/UIWindowEmailConfirmationRequired.js
+++ b/src/UI/UIWindowEmailConfirmationRequired.js
@@ -110,7 +110,7 @@ function UIWindowEmailConfirmationRequired(options){
setTimeout(() => {
$.ajax({
- url: api_origin + "/confirm-email",
+ url: window.api_origin + "/confirm-email",
type: 'POST',
data: JSON.stringify({
code: final_code,
@@ -118,17 +118,17 @@ function UIWindowEmailConfirmationRequired(options){
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (res){
if(res.email_confirmed){
$(el_window).close();
- refresh_user_data(window.auth_token)
+ window.refresh_user_data(window.auth_token)
resolve(true);
}else{
$(el_window).find('.error').html('Invalid confirmation code.');
@@ -157,16 +157,16 @@ function UIWindowEmailConfirmationRequired(options){
// send email confirmation
$(el_window).find('.send-conf-email').on('click', function(e){
$.ajax({
- url: api_origin + "/send-confirm-email",
+ url: window.api_origin + "/send-confirm-email",
type: 'POST',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: async function (res){
@@ -185,7 +185,7 @@ function UIWindowEmailConfirmationRequired(options){
// logout
$(el_window).find('.conf-email-log-out').on('click', function(e){
- logout();
+ window.logout();
$(el_window).close();
})
diff --git a/src/UI/UIWindowFeedback.js b/src/UI/UIWindowFeedback.js
index 5e0b18f7c..92ab92a5a 100644
--- a/src/UI/UIWindowFeedback.js
+++ b/src/UI/UIWindowFeedback.js
@@ -76,12 +76,12 @@ async function UIWindowQR(options){
if(message)
$(this).prop('disabled', true);
$.ajax({
- url: api_origin + "/contactUs",
+ url: window.api_origin + "/contactUs",
type: 'POST',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
data: JSON.stringify({
message: message,
diff --git a/src/UI/UIWindowFontPicker.js b/src/UI/UIWindowFontPicker.js
index a802e5499..a3bcacf42 100644
--- a/src/UI/UIWindowFontPicker.js
+++ b/src/UI/UIWindowFontPicker.js
@@ -42,7 +42,7 @@ async function UIWindowFontPicker(options){
// set sensible defaults
if(arguments.length > 0){
// if first argument is a string, then assume it is the default color
- if(isString(arguments[0])){
+ if(window.isString(arguments[0])){
options = {};
options.default = arguments[0];
}
@@ -92,7 +92,7 @@ async function UIWindowFontPicker(options){
onAppend: function(window){
let active_font = $(window).find('.font-selector-active');
if(active_font.length > 0){
- scrollParentToChild($(window).find('.font-list').get(0), active_font.get(0));
+ window.scrollParentToChild($(window).find('.font-list').get(0), active_font.get(0));
}
},
window_class: 'window-login',
diff --git a/src/UI/UIWindowItemProperties.js b/src/UI/UIWindowItemProperties.js
index 2458341f1..21d46d356 100644
--- a/src/UI/UIWindowItemProperties.js
+++ b/src/UI/UIWindowItemProperties.js
@@ -132,7 +132,9 @@ async function UIWindowItemProperties(item_name, item_path, item_uid, left, top,
$(el_window).find('.item-prop-val-original-path').text(metadata.original_path);
$(el_window).find('.item-prop-original-path').show();
}
- }catch(e){}
+ }catch(e){
+ // Ignored
+ }
}
// shortcut to
@@ -144,7 +146,7 @@ async function UIWindowItemProperties(item_name, item_path, item_uid, left, top,
// type
$(el_window).find('.item-prop-val-type').html(fsentry.is_dir ? 'Directory' : (fsentry.type === null ? '-' : fsentry.type));
// size
- $(el_window).find('.item-prop-val-size').html(fsentry.size === null || fsentry.size === undefined ? '-' : byte_format(fsentry.size));
+ $(el_window).find('.item-prop-val-size').html(fsentry.size === null || fsentry.size === undefined ? '-' : window.byte_format(fsentry.size));
// modified
$(el_window).find('.item-prop-val-modified').html(fsentry.modified === 0 ? '-' : timeago.format(fsentry.modified*1000));
// created
@@ -152,7 +154,7 @@ async function UIWindowItemProperties(item_name, item_path, item_uid, left, top,
// subdomains
if(fsentry.subdomains && fsentry.subdomains.length > 0 ){
fsentry.subdomains.forEach(subdomain => {
- $(el_window).find('.item-prop-val-websites').append(`
`;
apps_str += ``;
@@ -176,7 +176,7 @@ async function UITaskbar(options){
onClick: function(){
let open_window_count = parseInt($(`.taskbar-item[data-app="explorer"]`).attr('data-open-windows'));
if(open_window_count === 0){
- launch_app({ name: 'explorer', path: window.home_path});
+ window.launch_app({ name: 'explorer', path: window.home_path});
}else{
return false;
}
@@ -198,7 +198,7 @@ async function UITaskbar(options){
onClick: function(){
let open_window_count = parseInt($(`.taskbar-item[data-app="${app_info.name}"]`).attr('data-open-windows'));
if(open_window_count === 0){
- launch_app({
+ window.launch_app({
name: app_info.name,
})
}else{
@@ -212,7 +212,7 @@ async function UITaskbar(options){
//---------------------------------------------
// add `Trash` to the taskbar
//---------------------------------------------
- const trash = await puter.fs.stat(trash_path);
+ const trash = await puter.fs.stat(window.trash_path);
if(window.socket){
window.socket.emit('trash.is_empty', {is_empty: trash.is_empty});
}
@@ -225,19 +225,19 @@ async function UITaskbar(options){
keep_in_taskbar: true,
lock_keep_in_taskbar: true,
onClick: function(){
- let open_windows = $(`.window[data-path="${html_encode(trash_path)}"]`);
+ let open_windows = $(`.window[data-path="${html_encode(window.trash_path)}"]`);
if(open_windows.length === 0){
- launch_app({ name: 'explorer', path: window.trash_path});
+ window.launch_app({ name: 'explorer', path: window.trash_path});
}else{
open_windows.focusWindow();
}
},
onItemsDrop: function(items){
- move_items(items, trash_path);
+ window.move_items(items, window.trash_path);
}
})
- make_taskbar_sortable();
+ window.make_taskbar_sortable();
}
window.make_taskbar_sortable = function(){
@@ -259,7 +259,6 @@ window.make_taskbar_sortable = function(){
$(this).sortable('cancel');
$('.taskbar .start-app').remove();
return;
- }else{
}
}
},
@@ -281,7 +280,7 @@ window.make_taskbar_sortable = function(){
onClick: function(){
let open_window_count = parseInt($(`.taskbar-item[data-app="${$(ui.item).attr('data-app-name')}"]`).attr('data-open-windows'));
if(open_window_count === 0){
- launch_app({
+ window.launch_app({
name: $(ui.item).attr('data-app-name'),
})
}else{
@@ -293,12 +292,12 @@ window.make_taskbar_sortable = function(){
$(el).insertAfter(ui.item);
// $(ui.item).insertBefore(`})
`;
// Maximize button
if(options.is_resizable && options.show_maximize_button)
@@ -286,7 +288,7 @@ async function UIWindow(options) {
h += `} "Click to go one directory up.")
`;
h += `
`;
// Path
- h += ``;
+ h += ``;
// Path editor
h += ``;
// Layout settings
@@ -433,7 +435,7 @@ async function UIWindow(options) {
onClick: function(){
let open_window_count = parseInt($(`.taskbar-item[data-app="${options.app}"]`).attr('data-open-windows'));
if(open_window_count === 0){
- launch_app({
+ window.launch_app({
name: options.app,
})
}else{
@@ -453,8 +455,8 @@ async function UIWindow(options) {
// if directory, set window_nav_history and window_nav_history_current_position
if(options.is_dir){
- window_nav_history[win_id] = [options.path];
- window_nav_history_current_position[win_id] = 0;
+ window.window_nav_history[win_id] = [options.path];
+ window.window_nav_history_current_position[win_id] = 0;
}
// get all the elements needed
@@ -521,7 +523,7 @@ async function UIWindow(options) {
$(el_window).focusWindow();
}
- if (animate_window_opening) {
+ if (window.animate_window_opening) {
// animate window opening
$(el_window).css({
'opacity': '0',
@@ -596,7 +598,7 @@ async function UIWindow(options) {
$(el_savefiledialog_save_btn).on('click', function(e){
const filename = $(el_savefiledialog_filename).val();
try{
- validate_fsentry_name(filename)
+ window.validate_fsentry_name(filename)
}catch(err){
UIAlert(err.message, 'error', 'OK')
return;
@@ -787,8 +789,8 @@ async function UIWindow(options) {
}
if(options.is_dir){
- navbar_path_droppable(el_window);
- sidebar_item_droppable(el_window);
+ window.navbar_path_droppable(el_window);
+ window.sidebar_item_droppable(el_window);
// --------------------------------------------------------
// Back button
// --------------------------------------------------------
@@ -798,10 +800,10 @@ async function UIWindow(options) {
return;
// if ctrl/cmd are pressed, open in new window
if(e.ctrlKey || e.metaKey){
- const dirpath = window_nav_history[win_id].at(window_nav_history_current_position[win_id] - 1);
+ const dirpath = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id] - 1);
UIWindow({
path: dirpath,
- title: dirpath === '/' ? root_dirname : path.basename(dirpath),
+ title: dirpath === '/' ? window.root_dirname : path.basename(dirpath),
icon: window.icons['folder.svg'],
// uid: $(el_item).attr('data-uid'),
is_dir: true,
@@ -809,10 +811,10 @@ async function UIWindow(options) {
}
// ... otherwise, open in same window
else{
- window_nav_history_current_position[win_id] > 0 && window_nav_history_current_position[win_id]--;
- const new_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]);
+ 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
- update_window_path(el_window, new_path);
+ window.update_window_path(el_window, new_path);
}
})
// --------------------------------------------------------
@@ -822,8 +824,8 @@ async function UIWindow(options) {
let items = [];
const pos = el_window_navbar_back_btn.getBoundingClientRect();
- for(let index = window_nav_history_current_position[win_id] - 1; index >= 0; index--){
- const history_item = window_nav_history[win_id].at(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({
@@ -831,20 +833,20 @@ async function UIWindow(options) {
val: index,
onClick: async function(e){
let history_index = e.value;
- window_nav_history_current_position[win_id] = history_index;
- const new_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]);
+ 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)){
UIWindow({
path: new_path,
- title: new_path === '/' ? root_dirname : path.basename(new_path),
+ title: new_path === '/' ? window.root_dirname : path.basename(new_path),
icon: window.icons['folder.svg'],
is_dir: true,
});
}
// update window path
else{
- update_window_path(el_window, new_path);
+ window.update_window_path(el_window, new_path);
}
}
})
@@ -866,10 +868,10 @@ async function UIWindow(options) {
return;
// if ctrl/cmd are pressed, open in new window
if(e.ctrlKey || e.metaKey){
- const dirpath = window_nav_history[win_id].at(window_nav_history_current_position[win_id] + 1);
+ const dirpath = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id] + 1);
UIWindow({
path: dirpath,
- title: dirpath === '/' ? root_dirname : path.basename(dirpath),
+ title: dirpath === '/' ? window.root_dirname : path.basename(dirpath),
icon: window.icons['folder.svg'],
// uid: $(el_item).attr('data-uid'),
is_dir: true,
@@ -877,12 +879,12 @@ async function UIWindow(options) {
}
// ... otherwise, open in same window
else{
- window_nav_history_current_position[win_id]++;
+ window.window_nav_history_current_position[win_id]++;
// get last path in history
- const target_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]);
+ 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){
- update_window_path(el_window, target_path);
+ window.update_window_path(el_window, target_path);
}
}
})
@@ -893,8 +895,8 @@ async function UIWindow(options) {
let items = [];
const pos = el_window_navbar_forward_btn.getBoundingClientRect();
- for(let index = window_nav_history_current_position[win_id] + 1; index < window_nav_history[win_id].length; index++){
- const history_item = window_nav_history[win_id].at(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({
@@ -902,20 +904,20 @@ async function UIWindow(options) {
val: index,
onClick: async function(e){
let history_index = e.value;
- window_nav_history_current_position[win_id] = history_index;
- const new_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]);
+ 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)){
UIWindow({
path: new_path,
- title: new_path === '/' ? root_dirname : path.basename(new_path),
+ title: new_path === '/' ? window.root_dirname : path.basename(new_path),
icon: window.icons['folder.svg'],
is_dir: true,
});
}
// update window path
else{
- update_window_path(el_window, new_path);
+ window.update_window_path(el_window, new_path);
}
}
})
@@ -938,7 +940,7 @@ async function UIWindow(options) {
if(e.ctrlKey || e.metaKey && (target_path !== undefined && target_path !== null)){
UIWindow({
path: target_path,
- title: target_path === '/' ? root_dirname : path.basename(target_path),
+ title: target_path === '/' ? window.root_dirname : path.basename(target_path),
icon: window.icons['folder.svg'],
// uid: $(el_item).attr('data-uid'),
is_dir: true,
@@ -947,11 +949,11 @@ async function UIWindow(options) {
// ... otherwise, open in same window
else if(target_path !== undefined && target_path !== null){
// update history
- window_nav_history[win_id] = window_nav_history[win_id].slice(0, window_nav_history_current_position[win_id]+1);
- window_nav_history[win_id].push(target_path);
- window_nav_history_current_position[win_id]++;
+ 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
- update_window_path(el_window, target_path);
+ window.update_window_path(el_window, target_path);
}
})
@@ -965,7 +967,7 @@ async function UIWindow(options) {
html: `${layouts[i]}`,
icon: cur_layout === layouts[i] ? '✓' : '',
onClick: async function(e){
- update_window_layout(el_window, layouts[i]);
+ window.update_window_layout(el_window, layouts[i]);
window.set_layout($(el_window).attr('data-uid'), layouts[i]);
}
})
@@ -980,10 +982,10 @@ async function UIWindow(options) {
for(let i=0; i`;
@@ -176,7 +176,7 @@ async function UITaskbar(options){
onClick: function(){
let open_window_count = parseInt($(`.taskbar-item[data-app="explorer"]`).attr('data-open-windows'));
if(open_window_count === 0){
- launch_app({ name: 'explorer', path: window.home_path});
+ window.launch_app({ name: 'explorer', path: window.home_path});
}else{
return false;
}
@@ -198,7 +198,7 @@ async function UITaskbar(options){
onClick: function(){
let open_window_count = parseInt($(`.taskbar-item[data-app="${app_info.name}"]`).attr('data-open-windows'));
if(open_window_count === 0){
- launch_app({
+ window.launch_app({
name: app_info.name,
})
}else{
@@ -212,7 +212,7 @@ async function UITaskbar(options){
//---------------------------------------------
// add `Trash` to the taskbar
//---------------------------------------------
- const trash = await puter.fs.stat(trash_path);
+ const trash = await puter.fs.stat(window.trash_path);
if(window.socket){
window.socket.emit('trash.is_empty', {is_empty: trash.is_empty});
}
@@ -225,19 +225,19 @@ async function UITaskbar(options){
keep_in_taskbar: true,
lock_keep_in_taskbar: true,
onClick: function(){
- let open_windows = $(`.window[data-path="${html_encode(trash_path)}"]`);
+ let open_windows = $(`.window[data-path="${html_encode(window.trash_path)}"]`);
if(open_windows.length === 0){
- launch_app({ name: 'explorer', path: window.trash_path});
+ window.launch_app({ name: 'explorer', path: window.trash_path});
}else{
open_windows.focusWindow();
}
},
onItemsDrop: function(items){
- move_items(items, trash_path);
+ window.move_items(items, window.trash_path);
}
})
- make_taskbar_sortable();
+ window.make_taskbar_sortable();
}
window.make_taskbar_sortable = function(){
@@ -259,7 +259,6 @@ window.make_taskbar_sortable = function(){
$(this).sortable('cancel');
$('.taskbar .start-app').remove();
return;
- }else{
}
}
},
@@ -281,7 +280,7 @@ window.make_taskbar_sortable = function(){
onClick: function(){
let open_window_count = parseInt($(`.taskbar-item[data-app="${$(ui.item).attr('data-app-name')}"]`).attr('data-open-windows'));
if(open_window_count === 0){
- launch_app({
+ window.launch_app({
name: $(ui.item).attr('data-app-name'),
})
}else{
@@ -293,12 +292,12 @@ window.make_taskbar_sortable = function(){
$(el).insertAfter(ui.item);
// $(ui.item).insertBefore(`Hello!
`); $(el).show(); - $(ui.item).removeItems(); - update_taskbar(); + $(ui.item).removeItems(); + window.update_taskbar(); } // only proceed to update DB if the item sorted was a pinned item otherwise no point in updating the taskbar in DB else if($(ui.item).attr('data-keep-in-taskbar') === 'true'){ - update_taskbar(); + window.update_taskbar(); } }, }); diff --git a/src/UI/UITaskbarItem.js b/src/UI/UITaskbarItem.js index 478962a89..6d5b7e699 100644 --- a/src/UI/UITaskbarItem.js +++ b/src/UI/UITaskbarItem.js @@ -18,6 +18,7 @@ */ import UIContextMenu from './UIContextMenu.js'; +import path from '../lib/path.js'; let tray_item_id = 1; @@ -28,7 +29,7 @@ function UITaskbarItem(options){ options.open_windows_count = options.open_windows_count ?? 0; options.lock_keep_in_taskbar = options.lock_keep_in_taskbar ?? false; options.append_to_taskbar = options.append_to_taskbar ?? true; - const element_id = global_element_id++; + const element_id = window.global_element_id++; h += ``; // Minimize button, only if window is resizable and not embedded - if(options.is_resizable && options.show_minimize_button && !is_embedded) + if(options.is_resizable && options.show_minimize_button && !window.is_embedded) h += ``;
// Maximize button
if(options.is_resizable && options.show_maximize_button)
@@ -286,7 +288,7 @@ async function UIWindow(options) {
h += ``;
h += `${html_encode(subdomain.address)} (disassociate)
`); + $(el_window).find('.item-prop-val-websites').append(`${html_encode(subdomain.address)} (disassociate)
`); }); } else{ diff --git a/src/UI/UIWindowLogin.js b/src/UI/UIWindowLogin.js index b8e1c1ba9..cafd17928 100644 --- a/src/UI/UIWindowLogin.js +++ b/src/UI/UIWindowLogin.js @@ -138,7 +138,7 @@ async function UIWindowLogin(options){ const password = $(el_window).find('.password').val(); let data; - if(is_email(email_username)){ + if(window.is_email(email_username)){ data = JSON.stringify({ email: email_username, password: password @@ -157,14 +157,14 @@ async function UIWindowLogin(options){ headers = window.custom_headers; $.ajax({ - url: gui_origin + "/login", + url: window.gui_origin + "/login", type: 'POST', async: false, headers: headers, contentType: "application/json", data: data, success: function (data){ - update_auth_data(data.token, data.user); + window.update_auth_data(data.token, data.user); if(options.reload_on_success){ window.onbeforeunload = null; @@ -177,15 +177,15 @@ async function UIWindowLogin(options){ const $errorMessage = $(el_window).find('.login-error-msg'); if (err.status === 404) { // Don't include the whole 404 page - $errorMessage.html(`Error 404: "${gui_origin}/login" not found`); + $errorMessage.html(`Error 404: "${window.gui_origin}/login" not found`); } else if (err.responseText) { $errorMessage.html(html_encode(err.responseText)); } else { // No message was returned. *Probably* this means we couldn't reach the server. // If this is a self-hosted instance, it's probably a configuration issue. - if (app_domain !== 'puter.com') { + if (window.app_domain !== 'puter.com') { $errorMessage.html(`
-
`;
- const response = await fetch(api_origin + "/verify-pass-recovery-token", {
+ const response = await fetch(window.api_origin + "/verify-pass-recovery-token", {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -150,7 +150,7 @@ async function UIWindowNewPassword(options){
}
// check password strength
- const pass_strength = check_password_strength(new_password);
+ const pass_strength = window.check_password_strength(new_password);
if(!pass_strength.overallPass){
$(el_window).find('.form-error-msg').html(i18n('password_strength_error'));
$(el_window).find('.form-error-msg').fadeIn();
@@ -160,7 +160,7 @@ async function UIWindowNewPassword(options){
$(el_window).find('.form-error-msg').hide();
$.ajax({
- url: api_origin + "/set-pass-using-token",
+ url: window.api_origin + "/set-pass-using-token",
type: 'POST',
async: true,
contentType: "application/json",
diff --git a/src/UI/UIWindowProgressEmptyTrash.js b/src/UI/UIWindowProgressEmptyTrash.js
index b8efabd72..8f8a8aff2 100644
--- a/src/UI/UIWindowProgressEmptyTrash.js
+++ b/src/UI/UIWindowProgressEmptyTrash.js
@@ -64,7 +64,7 @@ async function UIWindowProgressEmptyTrash(options){
});
$(el_window).find('.newfolder-cancel-btn').on('click', function(e){
- operation_cancelled[options.operation_id] = true;
+ window.operation_cancelled[options.operation_id] = true;
$(el_window).close();
})
diff --git a/src/UI/UIWindowPublishWebsite.js b/src/UI/UIWindowPublishWebsite.js
index 1693c8727..751a2ed3b 100644
--- a/src/UI/UIWindowPublishWebsite.js
+++ b/src/UI/UIWindowPublishWebsite.js
@@ -64,7 +64,7 @@ async function UIWindowPublishWebsite(target_dir_uid, target_dir_name, target_di
width: 450,
dominant: true,
onAppend: function(this_window){
- $(this_window).find(`.publish-website-subdomain`).val(generate_identifier());
+ $(this_window).find(`.publish-website-subdomain`).val(window.generate_identifier());
$(this_window).find(`.publish-website-subdomain`).get(0).focus({preventScroll:true});
},
window_class: 'window-publishWebsite',
@@ -91,8 +91,8 @@ async function UIWindowPublishWebsite(target_dir_uid, target_dir_name, target_di
puter.hosting.create(
subdomain,
target_dir_path).then((res)=>{
+ let url = 'https://' + subdomain + '.' + window.hosting_domain + '/';
$(el_window).find('.window-publishWebsite-form').hide(100, function(){
- let url = 'https://' + subdomain + '.' + window.hosting_domain + '/';
$(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)
@@ -107,7 +107,7 @@ async function UIWindowPublishWebsite(target_dir_uid, target_dir_name, target_di
$(this).attr('data-website_url', url + $(this).attr('data-path').substring(target_dir_path.length));
})
- update_sites_cache();
+ window.update_sites_cache();
}).catch((err)=>{
err = err.error;
$(el_window).find('.publish-website-error-msg').html(
diff --git a/src/UI/UIWindowRecoverPassword.js b/src/UI/UIWindowRecoverPassword.js
index 64bc462ff..87e0ec271 100644
--- a/src/UI/UIWindowRecoverPassword.js
+++ b/src/UI/UIWindowRecoverPassword.js
@@ -81,14 +81,14 @@ function UIWindowRecoverPassword(options){
$(el_window).find('.send-recovery-email').on('click', function(e){
let email, username;
let input = $(el_window).find('.pass-recovery-username-or-email').val();
- if(is_email(input))
+ if(window.is_email(input))
email = input;
else
username = input;
// todo validation before sending
$.ajax({
- url: api_origin + "/send-pass-recovery-email",
+ url: window.api_origin + "/send-pass-recovery-email",
type: 'POST',
async: true,
contentType: "application/json",
@@ -98,7 +98,7 @@ function UIWindowRecoverPassword(options){
}),
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: async function (res){
diff --git a/src/UI/UIWindowRefer.js b/src/UI/UIWindowRefer.js
index a37f8e4fb..0d81dee50 100644
--- a/src/UI/UIWindowRefer.js
+++ b/src/UI/UIWindowRefer.js
@@ -22,7 +22,7 @@ import UIPopover from './UIPopover.js'
async function UIWindowRefer(options){
let h = '';
- const url = `${gui_origin}/?r=${user.referral_code}`;
+ const url = `${window.gui_origin}/?r=${window.user.referral_code}`;
h += `Error reaching "${gui_origin}/login". This is likely to be a configuration issue.
+Error reaching "${window.gui_origin}/login". This is likely to be a configuration issue.
Make sure of the following:
domainin config.json is set to the domain you're using to access puter
diff --git a/src/UI/UIWindowManageSessions.js b/src/UI/UIWindowManageSessions.js
index 11f631bb3..bfa26326a 100644
--- a/src/UI/UIWindowManageSessions.js
+++ b/src/UI/UIWindowManageSessions.js
@@ -88,7 +88,7 @@ const UIWindowManageSessions = async function UIWindowManageSessions (options) {
return;
}
- const resp = await fetch(`${api_origin}/auth/revoke-session`, {
+ const resp = await fetch(`${window.api_origin}/auth/revoke-session`, {
method: 'POST',
headers: {
Authorization: `Bearer ${puter.authToken}`,
@@ -119,7 +119,7 @@ const UIWindowManageSessions = async function UIWindowManageSessions (options) {
};
const reload_sessions = async () => {
- const resp = await fetch(`${api_origin}/auth/list-sessions`, {
+ const resp = await fetch(`${window.api_origin}/auth/list-sessions`, {
headers: {
Authorization: `Bearer ${puter.authToken}`,
},
diff --git a/src/UI/UIWindowMoveProgress.js b/src/UI/UIWindowMoveProgress.js
index 270e797d7..5ec740629 100644
--- a/src/UI/UIWindowMoveProgress.js
+++ b/src/UI/UIWindowMoveProgress.js
@@ -71,7 +71,7 @@ async function UIWindowMoveProgress(options){
});
$(el_window).find('.move-cancel-btn').on('click', function(e){
- operation_cancelled[options.operation_id] = true;
+ window.operation_cancelled[options.operation_id] = true;
$(el_window).close();
})
diff --git a/src/UI/UIWindowMyWebsites.js b/src/UI/UIWindowMyWebsites.js
index d4e23fbe5..33864ad09 100644
--- a/src/UI/UIWindowMyWebsites.js
+++ b/src/UI/UIWindowMyWebsites.js
@@ -153,7 +153,7 @@ $(document).on('click', '.mywebsites-site-setting', function(e){
}
$.ajax({
- url: api_origin + "/delete-site",
+ url: window.api_origin + "/delete-site",
type: 'POST',
data: JSON.stringify({
site_uuid: $(e.target).attr('data-site-uuid'),
@@ -161,11 +161,11 @@ $(document).on('click', '.mywebsites-site-setting', function(e){
async: false,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (){
diff --git a/src/UI/UIWindowNewFolderProgress.js b/src/UI/UIWindowNewFolderProgress.js
index 2975e94a6..08d694a4c 100644
--- a/src/UI/UIWindowNewFolderProgress.js
+++ b/src/UI/UIWindowNewFolderProgress.js
@@ -64,7 +64,7 @@ async function UIWindowNewFolderProgress(options){
});
$(el_window).find('.newfolder-cancel-btn').on('click', function(e){
- operation_cancelled[options.operation_id] = true;
+ window.operation_cancelled[options.operation_id] = true;
$(el_window).close();
})
diff --git a/src/UI/UIWindowNewPassword.js b/src/UI/UIWindowNewPassword.js
index 1b5d579a6..a097911c8 100644
--- a/src/UI/UIWindowNewPassword.js
+++ b/src/UI/UIWindowNewPassword.js
@@ -45,7 +45,7 @@ async function UIWindowNewPassword(options){
h += ``;
h += `
`;
h += ``;
@@ -70,7 +70,7 @@ async function UIWindowRefer(options){
$(el_window).find('.window-body .downloadable-link').val(url);
$(el_window).find('.window-body .share-copy-link-on-social').on('click', function(e){
- const social_links = socialLink({url: url, title: i18n('refer_friends_social_media_c2a'), description: i18n('refer_friends_social_media_c2a')});
+ const social_links = window.socialLink({url: url, title: i18n('refer_friends_social_media_c2a'), description: i18n('refer_friends_social_media_c2a')});
let social_links_html = ``;
social_links_html += `})
`,
onClick: function(){
- create_folder(dirname, append_to_element);
+ window.create_folder(dirname, append_to_element);
}
},
// divider
@@ -45,7 +45,7 @@ const new_context_menu_item = function(dirname, append_to_element){
html: i18n('text_document'),
icon: `})
`,
onClick: async function(){
- create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.txt'});
+ window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.txt'});
}
},
// HTML Document
@@ -53,7 +53,7 @@ const new_context_menu_item = function(dirname, append_to_element){
html: i18n('html_document'),
icon: `})
`,
onClick: async function(){
- create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.html'});
+ window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.html'});
}
},
// JPG Image
@@ -67,7 +67,7 @@ const new_context_menu_item = function(dirname, append_to_element){
canvas.height = 600;
canvas.toBlob((blob) =>{
- create_file({dirname: dirname, append_to_element: append_to_element, name: 'New Image.jpg', content: blob});
+ window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New Image.jpg', content: blob});
});
}
},
diff --git a/src/helpers/refresh_item_container.js b/src/helpers/refresh_item_container.js
index d111a04f9..51cb1d755 100644
--- a/src/helpers/refresh_item_container.js
+++ b/src/helpers/refresh_item_container.js
@@ -17,6 +17,7 @@
* along with this program. If not, see /?puter.fullpage=true
//--------------------------------------------------------------------------------------
- if(url_query_params.has('puter.fullpage') && (url_query_params.get('puter.fullpage') === 'false' || url_query_params.get('puter.fullpage') === '0')){
+ if(window.url_query_params.has('puter.fullpage') && (window.url_query_params.get('puter.fullpage') === 'false' || window.url_query_params.get('puter.fullpage') === '0')){
window.is_fullpage_mode = false;
- }else if(url_query_params.has('puter.fullpage') && (url_query_params.get('puter.fullpage') === 'true' || url_query_params.get('puter.fullpage') === '1')){
+ }else if(window.url_query_params.has('puter.fullpage') && (window.url_query_params.get('puter.fullpage') === 'true' || window.url_query_params.get('puter.fullpage') === '1')){
// In fullpage mode, we want to hide the taskbar for better UX
window.taskbar_height = 0;
@@ -151,7 +151,7 @@ window.initgui = async function(){
// Is GUI embedded in a popup?
// i.e. https://puter.com/?embedded_in_popup=true
//--------------------------------------------------------------------------------------
- if(url_query_params.has('embedded_in_popup') && (url_query_params.get('embedded_in_popup') === 'true' || url_query_params.get('embedded_in_popup') === '1')){
+ if(window.url_query_params.has('embedded_in_popup') && (window.url_query_params.get('embedded_in_popup') === 'true' || window.url_query_params.get('embedded_in_popup') === '1')){
window.embedded_in_popup = true;
$('body').addClass('embedded-in-popup');
@@ -161,16 +161,16 @@ window.initgui = async function(){
// if no referrer, request it from the opener via messaging
if(!document.referrer){
try{
- openerOrigin = await requestOpenerOrigin();
+ window.openerOrigin = await requestOpenerOrigin();
}catch(e){
throw new Error('No referrer found');
}
}
// this is the referrer in terms of user acquisition
- window.referrerStr = openerOrigin;
+ window.referrerStr = window.openerOrigin;
- if(action === 'sign-in' && !is_auth()){
+ if(action === 'sign-in' && !window.is_auth()){
// show signup window
if(await UIWindowSignup({
reload_on_success: false,
@@ -181,9 +181,9 @@ window.initgui = async function(){
cover_page: true,
}
}))
- await getUserAppToken(openerOrigin);
+ await window.getUserAppToken(window.openerOrigin);
}
- else if(action === 'sign-in' && is_auth()){
+ else if(action === 'sign-in' && window.is_auth()){
picked_a_user_for_sdk_login = await UIWindowSessionList({
reload_on_success: false,
draggable_body: false,
@@ -192,7 +192,7 @@ window.initgui = async function(){
});
if(picked_a_user_for_sdk_login){
- await getUserAppToken(openerOrigin);
+ await window.getUserAppToken(window.openerOrigin);
}
}
@@ -202,8 +202,8 @@ window.initgui = async function(){
// Get user referral code from URL query params
// i.e. https://puter.com/?r=123456
//--------------------------------------------------------------------------------------
- if(url_query_params.has('r')){
- window.referral_code = url_query_params.get('r');
+ if(window.url_query_params.has('r')){
+ window.referral_code = window.url_query_params.get('r');
// remove 'r' from URL
window.history.pushState(null, document.title, '/');
// show referral notice, this will be used later if Desktop is loaded
@@ -215,9 +215,9 @@ window.initgui = async function(){
// Action: Request Permission
//--------------------------------------------------------------------------------------
if(action === 'request-permission'){
- let app_uid = url_query_params.get('app_uid');
- let origin = openerOrigin ?? url_query_params.get('origin');
- let permission = url_query_params.get('permission');
+ let app_uid = window.url_query_params.get('app_uid');
+ let origin = window.openerOrigin ?? window.url_query_params.get('origin');
+ let permission = window.url_query_params.get('permission');
let granted = await UIWindowRequestPermission({
app_uid: app_uid,
@@ -225,7 +225,7 @@ window.initgui = async function(){
permission: permission,
});
- let messageTarget = embedded_in_popup ? window.opener : window.parent;
+ let messageTarget = window.embedded_in_popup ? window.opener : window.parent;
messageTarget.postMessage({
msg: "permissionGranted",
granted: granted,
@@ -235,8 +235,8 @@ window.initgui = async function(){
// Action: Password recovery
//--------------------------------------------------------------------------------------
else if(action === 'set-new-password'){
- let user = url_query_params.get('user');
- let token = url_query_params.get('token');
+ let user = window.url_query_params.get('user');
+ let token = window.url_query_params.get('token');
await UIWindowNewPassword({
user: user,
@@ -267,11 +267,11 @@ window.initgui = async function(){
// if yes, we need to get the user app token and send it to the opener
// if not, we need to ask the user for confirmation before proceeding BUT only if the action is a file-picker action
// -------------------------------------------------------------------------------------
- if(window.embedded_in_popup && openerOrigin){
- let response = await checkUserSiteRelationship(openerOrigin);
+ if(window.embedded_in_popup && window.openerOrigin){
+ let response = await window.checkUserSiteRelationship(window.openerOrigin);
window.userAppToken = response.token;
- if(!picked_a_user_for_sdk_login && logged_in_users.length > 0 && (!userAppToken || url_query_params.get('request_auth') )){
+ if(!picked_a_user_for_sdk_login && window.logged_in_users.length > 0 && (!window.userAppToken || window.url_query_params.get('request_auth') )){
await UIWindowSessionList({
reload_on_success: false,
draggable_body: false,
@@ -281,11 +281,11 @@ window.initgui = async function(){
}
// if not and action is show-open-file-picker, we need confirmation before proceeding
if(action === 'show-open-file-picker' || action === 'show-save-file-picker' || action === 'show-directory-picker'){
- if(!userAppToken){
+ if(!window.userAppToken){
let is_confirmed = await PuterDialog();
if(is_confirmed === false){
- if(!is_auth()){
+ if(!window.is_auth()){
window.first_visit_ever = false;
localStorage.removeItem("has_visited_before", true);
}
@@ -299,14 +299,14 @@ window.initgui = async function(){
// -------------------------------------------------------------------------------------
// `auth_token` provided in URL, use it to log in
// -------------------------------------------------------------------------------------
- else if(url_query_params.has('auth_token')){
- let query_param_auth_token = url_query_params.get('auth_token');
+ else if(window.url_query_params.has('auth_token')){
+ let query_param_auth_token = window.url_query_params.get('auth_token');
try{
whoami = await puter.os.user();
}catch(e){
if(e.status === 401){
- logout();
+ window.logout();
return;
}
}
@@ -328,7 +328,7 @@ window.initgui = async function(){
// show login progress window
UIWindowLoginInProgress({user_info: whoami});
// update auth data
- update_auth_data(query_param_auth_token, whoami);
+ window.update_auth_data(query_param_auth_token, whoami);
}
// remove auth_token from URL
window.history.pushState(null, document.title, '/');
@@ -360,7 +360,7 @@ window.initgui = async function(){
// -------------------------------------------------------------------------------------
// Authed
// -------------------------------------------------------------------------------------
- if(is_auth()){
+ if(window.is_auth()){
// try to get user data using /whoami, only if that data is missing
if(!whoami){
try{
@@ -385,14 +385,14 @@ window.initgui = async function(){
}
while(!is_verified)
}
- update_auth_data(whoami.token || window.auth_token, whoami);
+ window.update_auth_data(whoami.token || window.auth_token, whoami);
// -------------------------------------------------------------------------------------
// Load desktop, only if we're not embedded in a popup
// -------------------------------------------------------------------------------------
if(!window.embedded_in_popup){
- await get_auto_arrange_data()
- puter.fs.stat(desktop_path, async function(desktop_fsentry){
+ await window.get_auto_arrange_data()
+ puter.fs.stat(window.desktop_path, async function(desktop_fsentry){
UIDesktop({desktop_fsentry: desktop_fsentry});
})
}
@@ -400,9 +400,9 @@ window.initgui = async function(){
// If embedded in a popup, send the token to the opener and close the popup
// -------------------------------------------------------------------------------------
else{
- let msg_id = url_query_params.get('msg_id');
+ let msg_id = window.url_query_params.get('msg_id');
try{
- let data = await getUserAppToken(new URL(openerOrigin).origin);
+ let data = await window.getUserAppToken(new URL(window.openerOrigin).origin);
// This is an implicit app and the app_uid is sent back from the server
// we cache it here so that we can use it later
window.host_app_uid = data.app_uid;
@@ -412,9 +412,9 @@ window.initgui = async function(){
success: true,
token: data.token,
app_uid: data.app_uid,
- username: user.username,
+ username: window.user.username,
msg_id: msg_id,
- }, openerOrigin);
+ }, window.openerOrigin);
// close popup
if(!action || action==='sign-in'){
window.close();
@@ -427,7 +427,7 @@ window.initgui = async function(){
success: false,
token: null,
msg_id: msg_id,
- }, openerOrigin);
+ }, window.openerOrigin);
// close popup
window.close();
window.open('','_self').close();
@@ -435,13 +435,13 @@ window.initgui = async function(){
let app_uid;
- if(openerOrigin){
- app_uid = await getAppUIDFromOrigin(openerOrigin);
+ if(window.openerOrigin){
+ app_uid = await window.getAppUIDFromOrigin(window.openerOrigin);
window.host_app_uid = app_uid;
}
if(action === 'show-open-file-picker'){
- let options = url_query_params.get('options');
+ let options = window.url_query_params.get('options');
options = JSON.parse(options ?? '{}');
// Open dialog
@@ -505,7 +505,7 @@ window.initgui = async function(){
// Action: Show Save File Dialog
//--------------------------------------------------------------------------------------
else if(action === 'show-save-file-picker'){
- let allowed_file_types = url_query_params.get('allowed_file_types');
+ let allowed_file_types = window.url_query_params.get('allowed_file_types');
// send 'sendMeFileData' event to parent
window.opener.postMessage({
@@ -627,13 +627,13 @@ window.initgui = async function(){
// done
let busy_duration = (Date.now() - busy_init_ts);
- if( busy_duration >= busy_indicator_hide_delay){
+ if( busy_duration >= window.busy_indicator_hide_delay){
$(el_filedialog_window).close();
}else{
setTimeout(() => {
// close this dialog
$(el_filedialog_window).close();
- }, Math.abs(busy_indicator_hide_delay - busy_duration));
+ }, Math.abs(window.busy_indicator_hide_delay - busy_duration));
}
}
});
@@ -644,7 +644,7 @@ window.initgui = async function(){
// ----------------------------------------------------------
// Get user's sites
// ----------------------------------------------------------
- update_sites_cache();
+ window.update_sites_cache();
}
}
// -------------------------------------------------------------------------------------
@@ -653,13 +653,13 @@ window.initgui = async function(){
// because it's not visible anyway and it's a waste of bandwidth
// -------------------------------------------------------------------------------------
if(!window.is_fullpage_mode && !window.embedded_in_popup){
- refresh_desktop_background();
+ window.refresh_desktop_background();
}
// -------------------------------------------------------------------------------------
// Un-authed but not first visit -> try to log in/sign up
// -------------------------------------------------------------------------------------
- if(!is_auth() && !first_visit_ever){
- if(logged_in_users.length > 0){
+ if(!window.is_auth() && !window.first_visit_ever){
+ if(window.logged_in_users.length > 0){
UIWindowSessionList();
}
else{
@@ -676,7 +676,7 @@ window.initgui = async function(){
// -------------------------------------------------------------------------------------
// Un-authed and first visit ever -> create temp user
// -------------------------------------------------------------------------------------
- else if(!is_auth() && first_visit_ever){
+ else if(!window.is_auth() && window.first_visit_ever){
let referrer;
try{
referrer = new URL(window.location.href).pathname;
@@ -690,10 +690,10 @@ window.initgui = async function(){
window.referrerStr = referrer;
// in case there is also a referrer query param, add it to the referrer URL
- if(url_query_params.has('ref')){
+ if(window.url_query_params.has('ref')){
if(!referrer)
referrer = '/';
- referrer += '?ref=' + html_encode(url_query_params.get('ref'));
+ referrer += '?ref=' + html_encode(window.url_query_params.get('ref'));
}
@@ -701,7 +701,7 @@ window.initgui = async function(){
if(window.custom_headers)
headers = window.custom_headers;
$.ajax({
- url: gui_origin + "/signup",
+ url: window.gui_origin + "/signup",
type: 'POST',
async: true,
headers: headers,
@@ -712,7 +712,7 @@ window.initgui = async function(){
is_temp: true,
}),
success: async function (data){
- update_auth_data(data.token, data.user);
+ window.update_auth_data(data.token, data.user);
document.dispatchEvent(new Event("login", { bubbles: true}));
},
error: function (err){
@@ -725,7 +725,7 @@ window.initgui = async function(){
}
// if there is at least one window open (only non-Explorer windows), ask user for confirmation when navigating away
- if(feature_flags.prompt_user_when_navigation_away_from_puter){
+ if(window.feature_flags.prompt_user_when_navigation_away_from_puter){
window.onbeforeunload = function(){
if($(`.window:not(.window[data-app="explorer"])`).length > 0)
return true;
@@ -743,8 +743,8 @@ window.initgui = async function(){
// Load desktop, if not embedded in a popup
// -------------------------------------------------------------------------------------
if(!window.embedded_in_popup){
- await get_auto_arrange_data();
- puter.fs.stat(desktop_path, function (desktop_fsentry) {
+ await window.get_auto_arrange_data();
+ puter.fs.stat(window.desktop_path, function (desktop_fsentry) {
UIDesktop({ desktop_fsentry: desktop_fsentry });
})
}
@@ -752,10 +752,10 @@ window.initgui = async function(){
// If embedded in a popup, send the 'ready' event to referrer and close the popup
// -------------------------------------------------------------------------------------
else{
- let msg_id = url_query_params.get('msg_id');
+ let msg_id = window.url_query_params.get('msg_id');
try{
- let data = await getUserAppToken(new URL(openerOrigin).origin);
+ let data = await window.getUserAppToken(new URL(window.openerOrigin).origin);
// This is an implicit app and the app_uid is sent back from the server
// we cache it here so that we can use it later
window.host_app_uid = data.app_uid;
@@ -765,9 +765,9 @@ window.initgui = async function(){
success: true,
msg_id: msg_id,
token: data.token,
- username: user.username,
+ username: window.user.username,
app_uid: data.app_uid,
- }, openerOrigin);
+ }, window.openerOrigin);
// close popup
if(!action || action==='sign-in'){
window.close();
@@ -780,7 +780,7 @@ window.initgui = async function(){
msg_id: msg_id,
success: false,
token: null,
- }, openerOrigin);
+ }, window.openerOrigin);
// close popup
window.close();
window.open('','_self').close();
@@ -789,8 +789,8 @@ window.initgui = async function(){
let app_uid;
- if(openerOrigin){
- app_uid = await getAppUIDFromOrigin(openerOrigin);
+ if(window.openerOrigin){
+ app_uid = await window.getAppUIDFromOrigin(window.openerOrigin);
window.host_app_uid = app_uid;
}
@@ -798,7 +798,7 @@ window.initgui = async function(){
// Action: Show Open File Picker
//--------------------------------------------------------------------------------------
if(action === 'show-open-file-picker'){
- let options = url_query_params.get('options');
+ let options = window.url_query_params.get('options');
options = JSON.parse(options ?? '{}');
// Open dialog
@@ -861,7 +861,7 @@ window.initgui = async function(){
// Action: Show Save File Dialog
//--------------------------------------------------------------------------------------
else if(action === 'show-save-file-picker'){
- let allowed_file_types = url_query_params.get('allowed_file_types');
+ let allowed_file_types = window.url_query_params.get('allowed_file_types');
// send 'sendMeFileData' event to parent
window.opener.postMessage({
@@ -984,13 +984,13 @@ window.initgui = async function(){
// done
let busy_duration = (Date.now() - busy_init_ts);
- if( busy_duration >= busy_indicator_hide_delay){
+ if( busy_duration >= window.busy_indicator_hide_delay){
$(el_filedialog_window).close();
}else{
setTimeout(() => {
// close this dialog
$(el_filedialog_window).close();
- }, Math.abs(busy_indicator_hide_delay - busy_duration));
+ }, Math.abs(window.busy_indicator_hide_delay - busy_duration));
}
}
@@ -1018,7 +1018,7 @@ window.initgui = async function(){
// If .item-container clicked, unselect all its item children
if($(e.target).hasClass('item-container') && !e.ctrlKey && !e.metaKey){
$(e.target).children('.item-selected').removeClass('item-selected');
- update_explorer_footer_selected_items_count(e.target);
+ window.update_explorer_footer_selected_items_count(e.target);
}
// If the clicked element is not a context menu, remove all context menus
@@ -1054,21 +1054,21 @@ window.initgui = async function(){
// update active_item_container
if($(e.target).hasClass('item-container')){
- active_item_container = e.target;
+ window.active_item_container = e.target;
}else{
let ic = $(e.target).closest('.item-container')
if(ic.length > 0){
- active_item_container = ic.get(0);
+ window.active_item_container = ic.get(0);
}else{
let pp = $(e.target).find('.item-container')
if(pp.length > 0){
- active_item_container = pp.get(0);
+ window.active_item_container = pp.get(0);
}
}
}
//active element
- active_element = e.target;
+ window.active_element = e.target;
});
$(document).bind('keydown', async function(e){
@@ -1176,13 +1176,13 @@ window.initgui = async function(){
// if no item is selected and down arrow is pressed, select the first item
if($('.context-menu-active .context-menu-item-active').length === 0 && (e.which === 40)){
let selected_item = $('.context-menu-active .context-menu-item').get(0);
- select_ctxmenu_item(selected_item);
+ window.select_ctxmenu_item(selected_item);
return false;
}
// if no item is selected and up arrow is pressed, select the last item
else if($('.context-menu-active .context-menu-item-active').length === 0 && (e.which === 38)){
let selected_item = $('.context-menu .context-menu-item').get($('.context-menu .context-menu-item').length - 1);
- select_ctxmenu_item(selected_item);
+ window.select_ctxmenu_item(selected_item);
return false;
}
// if an item is selected and down arrow is pressed, select the next enabled item
@@ -1195,7 +1195,7 @@ window.initgui = async function(){
new_selected_item_index = new_selected_item_index + 1;
new_selected_item = $('.context-menu-active .context-menu-item').get(new_selected_item_index);
}
- select_ctxmenu_item(new_selected_item);
+ window.select_ctxmenu_item(new_selected_item);
return false;
}
// if an item is selected and up arrow is pressed, select the previous enabled item
@@ -1208,7 +1208,7 @@ window.initgui = async function(){
new_selected_item_index = new_selected_item_index - 1;
new_selected_item = $('.context-menu-active .context-menu-item').get(new_selected_item_index);
}
- select_ctxmenu_item(new_selected_item);
+ window.select_ctxmenu_item(new_selected_item);
return false;
}
// if right arrow is pressed, open the submenu by triggering a mouseover event
@@ -1219,7 +1219,7 @@ window.initgui = async function(){
if($(selected_item).hasClass('context-menu-item-submenu') === true){
$(selected_item).removeClass('context-menu-item-active');
$(selected_item).addClass('context-menu-item-active-blurred');
- select_ctxmenu_item($('.context-menu[data-is-submenu="true"] .context-menu-item').get(0));
+ window.select_ctxmenu_item($('.context-menu[data-is-submenu="true"] .context-menu-item').get(0));
}
return false;
}
@@ -1252,27 +1252,27 @@ window.initgui = async function(){
else if(!$(focused_el).is('input') && !$(focused_el).is('textarea') && (e.which === 37 || e.which === 38 || e.which === 39 || e.which === 40)){
let item_width = 110, item_height = 110, selected_item;
// select first item in container if none is selected
- if($(active_item_container).find('.item-selected').length === 0){
- selected_item = $(active_item_container).find('.item').get(0);
- active_element = selected_item;
- $(active_item_container).find('.item-selected').removeClass('item-selected');
+ if($(window.active_item_container).find('.item-selected').length === 0){
+ selected_item = $(window.active_item_container).find('.item').get(0);
+ window.active_element = selected_item;
+ $(window.active_item_container).find('.item-selected').removeClass('item-selected');
$(selected_item).addClass('item-selected');
return false;
}
// if Shift key is pressed and ONE item is already selected, pick that item
- else if($(active_item_container).find('.item-selected').length === 1 && e.shiftKey){
- selected_item = $(active_item_container).find('.item-selected').get(0);
+ else if($(window.active_item_container).find('.item-selected').length === 1 && e.shiftKey){
+ selected_item = $(window.active_item_container).find('.item-selected').get(0);
}
// if Shift key is pressed and MORE THAN ONE item is selected, pick the latest active item
- else if($(active_item_container).find('.item-selected').length > 1 && e.shiftKey){
- selected_item = $(active_element).hasClass('item') ? active_element : $(active_element).closest('.item').get(0);
+ else if($(window.active_item_container).find('.item-selected').length > 1 && e.shiftKey){
+ selected_item = $(window.active_element).hasClass('item') ? window.active_element : $(window.active_element).closest('.item').get(0);
}
// otherwise if an item is selected, pick that item
- else if($(active_item_container).find('.item-selected').length === 1){
- selected_item = $(active_item_container).find('.item-selected').get(0);
+ else if($(window.active_item_container).find('.item-selected').length === 1){
+ selected_item = $(window.active_item_container).find('.item-selected').get(0);
}
else{
- selected_item = $(active_element).hasClass('item') ? active_element : $(active_element).closest('.item').get(0);
+ selected_item = $(window.active_element).hasClass('item') ? window.active_element : $(window.active_element).closest('.item').get(0);
}
// override the default behavior of ctrl/meta key
@@ -1320,7 +1320,7 @@ window.initgui = async function(){
let next_item;
for (let index = 0; index < elements_at_next_pos.length; index++) {
const elem_at_next_pos = elements_at_next_pos[index];
- if($(elem_at_next_pos).hasClass('item') && $(elem_at_next_pos).closest('.item-container').is(active_item_container)){
+ if($(elem_at_next_pos).hasClass('item') && $(elem_at_next_pos).closest('.item-container').is(window.active_item_container)){
next_item = elem_at_next_pos;
break;
}
@@ -1328,10 +1328,10 @@ window.initgui = async function(){
if(next_item){
selected_item = next_item;
- active_element = next_item;
+ window.active_element = next_item;
// if ctrl or meta key is not pressed, unselect all items
if(!e.shiftKey){
- $(active_item_container).find('.item').removeClass('item-selected');
+ $(window.active_item_container).find('.item').removeClass('item-selected');
}
$(next_item).addClass('item-selected');
window.latest_selected_item = next_item;
@@ -1387,7 +1387,7 @@ window.initgui = async function(){
// Permanent delete bypassing trash after alert
//-----------------------------------------------------------------------
if((e.keyCode === 46 && e.shiftKey) || (e.altKey && e.metaKey && e.keyCode === 8)) {
- let $selected_items = $(active_element).closest(`.item-container`).find(`.item-selected`);
+ let $selected_items = $(window.active_element).closest(`.item-container`).find(`.item-selected`);
if($selected_items.length > 0){
const alert_resp = await UIAlert({
message: i18n('confirm_delete_multiple_items'),
@@ -1404,7 +1404,7 @@ window.initgui = async function(){
if((alert_resp) === 'Delete'){
for (let index = 0; index < $selected_items.length; index++) {
const element = $selected_items[index];
- await delete_item(element);
+ await window.delete_item(element);
}
}
}
@@ -1416,7 +1416,7 @@ window.initgui = async function(){
//-----------------------------------------------------------------------
if(e.keyCode === 46 || (e.keyCode === 8 && (e.ctrlKey || e.metaKey))) {
// permanent delete?
- let $selected_items = $(active_element).closest(`.item-container`).find(`.item-selected[data-path^="${trash_path + '/'}"]`);
+ let $selected_items = $(window.active_element).closest(`.item-container`).find(`.item-selected[data-path^="${window.trash_path + '/'}"]`);
if($selected_items.length > 0){
const alert_resp = await UIAlert({
message: i18n('confirm_delete_multiple_items'),
@@ -1433,27 +1433,27 @@ window.initgui = async function(){
if((alert_resp) === 'Delete'){
for (let index = 0; index < $selected_items.length; index++) {
const element = $selected_items[index];
- await delete_item(element);
+ await window.delete_item(element);
}
- const trash = await puter.fs.stat(trash_path);
+ const trash = await puter.fs.stat(window.trash_path);
if(window.socket){
window.socket.emit('trash.is_empty', {is_empty: trash.is_empty});
}
if(trash.is_empty){
$(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash.svg']);
- $(`.item[data-path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
- $(`.window[data-path="${html_encode(trash_path)}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
+ $(`.item[data-path="${html_encode(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']);
}
}
}
// regular delete?
else{
- $selected_items = $(active_element).closest('.item-container').find('.item-selected');
+ $selected_items = $(window.active_element).closest('.item-container').find('.item-selected');
if($selected_items.length > 0){
// Only delete the items if we're not renaming one.
if ($selected_items.children('.item-name-editor-active').length === 0) {
- move_items($selected_items, trash_path);
+ window.move_items($selected_items, window.trash_path);
}
}
}
@@ -1464,27 +1464,27 @@ window.initgui = async function(){
// A letter or number is pressed and there is no context menu open: search items by name
//-----------------------------------------------------------------------
if(!e.ctrlKey && !e.metaKey && !$(focused_el).is('input') && !$(focused_el).is('textarea') && $('.context-menu').length === 0){
- if(keypress_item_seach_term !== '')
- clearTimeout(keypress_item_seach_buffer_timeout);
+ if(window.keypress_item_seach_term !== '')
+ clearTimeout(window.keypress_item_seach_buffer_timeout);
- keypress_item_seach_buffer_timeout = setTimeout(()=>{
- keypress_item_seach_term = '';
+ window.keypress_item_seach_buffer_timeout = setTimeout(()=>{
+ window.keypress_item_seach_term = '';
}, 700);
- keypress_item_seach_term += e.key.toLocaleLowerCase();
+ window.keypress_item_seach_term += e.key.toLocaleLowerCase();
let matches= [];
- const selected_items = $(active_item_container).find(`.item-selected`).not('.item-disabled').first();
+ const selected_items = $(window.active_item_container).find(`.item-selected`).not('.item-disabled').first();
// if one item is selected and the selected item matches the search term, don't continue search and select this item again
- if(selected_items.length === 1 && $(selected_items).attr('data-name').toLowerCase().startsWith(keypress_item_seach_term)){
+ if(selected_items.length === 1 && $(selected_items).attr('data-name').toLowerCase().startsWith(window.keypress_item_seach_term)){
return false;
}
// search for matches
- let haystack = $(active_item_container).find(`.item`).not('.item-disabled');
+ let haystack = $(window.active_item_container).find(`.item`).not('.item-disabled');
for(let j=0; j < haystack.length; j++){
- if($(haystack[j]).attr('data-name').toLowerCase().startsWith(keypress_item_seach_term)){
+ if($(haystack[j]).attr('data-name').toLowerCase().startsWith(window.keypress_item_seach_term)){
matches.push(haystack[j])
}
}
@@ -1502,11 +1502,11 @@ window.initgui = async function(){
matches.splice(0, match_index+1);
}
// deselect all selected sibling items
- $(active_item_container).find(`.item-selected`).removeClass('item-selected');
+ $(window.active_item_container).find(`.item-selected`).removeClass('item-selected');
// select matching item
$(matches[0]).not('.item-disabled').addClass('item-selected');
matches[0].scrollIntoView(false);
- update_explorer_footer_selected_items_count($(active_element).closest('.window'));
+ window.update_explorer_footer_selected_items_count($(window.active_element).closest('.window'));
}
return false;
@@ -1515,27 +1515,27 @@ window.initgui = async function(){
// A letter or number is pressed and there is a context menu open: search items by name
//-----------------------------------------------------------------------
else if(!e.ctrlKey && !e.metaKey && !$(focused_el).is('input') && !$(focused_el).is('textarea') && $('.context-menu').length > 0){
- if(keypress_item_seach_term !== '')
- clearTimeout(keypress_item_seach_buffer_timeout);
+ if(window.keypress_item_seach_term !== '')
+ clearTimeout(window.keypress_item_seach_buffer_timeout);
- keypress_item_seach_buffer_timeout = setTimeout(()=>{
- keypress_item_seach_term = '';
+ window.keypress_item_seach_buffer_timeout = setTimeout(()=>{
+ window.keypress_item_seach_term = '';
}, 700);
- keypress_item_seach_term += e.key.toLocaleLowerCase();
+ window.keypress_item_seach_term += e.key.toLocaleLowerCase();
let matches= [];
const selected_items = $('.context-menu').find(`.context-menu-item-active`).first();
// if one item is selected and the selected item matches the search term, don't continue search and select this item again
- if(selected_items.length === 1 && $(selected_items).text().toLowerCase().startsWith(keypress_item_seach_term)){
+ if(selected_items.length === 1 && $(selected_items).text().toLowerCase().startsWith(window.keypress_item_seach_term)){
return false;
}
// search for matches
let haystack = $('.context-menu-active').find(`.context-menu-item`);
for(let j=0; j < haystack.length; j++){
- if($(haystack[j]).text().toLowerCase().startsWith(keypress_item_seach_term)){
+ if($(haystack[j]).text().toLowerCase().startsWith(window.keypress_item_seach_term)){
matches.push(haystack[j])
}
}
@@ -1557,7 +1557,7 @@ window.initgui = async function(){
// select matching item
$(matches[0]).addClass('context-menu-item-active');
// matches[0].scrollIntoView(false);
- // update_explorer_footer_selected_items_count($(active_element).closest('.window'));
+ // update_explorer_footer_selected_items_count($(window.active_element).closest('.window'));
}
return false;
@@ -1578,16 +1578,16 @@ window.initgui = async function(){
// ctrl/command + a, will select all items on desktop and windows
//-----------------------------------------------------------------------------
if((e.ctrlKey || e.metaKey) && e.which === 65 && !$(focused_el).is('input') && !$(focused_el).is('textarea')){
- let $parent_container = $(active_element).closest('.item-container');
+ let $parent_container = $(window.active_element).closest('.item-container');
if($parent_container.length === 0)
- $parent_container = $(active_element).find('.item-container');
+ $parent_container = $(window.active_element).find('.item-container');
if($parent_container.attr('data-multiselectable') === 'false')
return false;
if($parent_container){
$($parent_container).find('.item').not('.item-disabled').addClass('item-selected');
- update_explorer_footer_selected_items_count($parent_container.closest('.window'));
+ window.update_explorer_footer_selected_items_count($parent_container.closest('.window'));
}
return false;
@@ -1597,9 +1597,9 @@ window.initgui = async function(){
// ctrl + w, will close the active window
//-----------------------------------------------------------------------------
if(e.ctrlKey && e.which === 87){
- let $parent_window = $(active_element).closest('.window');
+ let $parent_window = $(window.active_element).closest('.window');
if($parent_window.length === 0)
- $parent_window = $(active_element).find('.window');
+ $parent_window = $(window.active_element).find('.window');
if($parent_window !== null){
@@ -1612,28 +1612,28 @@ window.initgui = async function(){
// ctrl/command + c, will copy selected items on the active element to the clipboard
//-----------------------------------------------------------------------------
if((e.ctrlKey || e.metaKey) && e.which === 67 &&
- $(mouseover_window).attr('data-is_dir') !== 'false' &&
- $(mouseover_window).attr('data-path') !== trash_path &&
+ $(window.mouseover_window).attr('data-is_dir') !== 'false' &&
+ $(window.mouseover_window).attr('data-path') !== window.trash_path &&
!$(focused_el).is('input') &&
!$(focused_el).is('textarea')){
let $selected_items;
- let parent_container = $(active_element).closest('.item-container');
+ let parent_container = $(window.active_element).closest('.item-container');
if(parent_container.length === 0)
- parent_container = $(active_element).find('.item-container');
+ parent_container = $(window.active_element).find('.item-container');
if(parent_container !== null){
$selected_items = $(parent_container).find('.item-selected');
if($selected_items.length > 0){
- clipboard = [];
- clipboard_op = 'copy';
+ window.clipboard = [];
+ window.clipboard_op = 'copy';
$selected_items.each(function() {
// error if trash is being copied
- if($(this).attr('data-path') === trash_path){
+ if($(this).attr('data-path') === window.trash_path){
return;
}
// add to clipboard
- clipboard.push({path: $(this).attr('data-path'), uid: $(this).attr('data-uid'), metadata: $(this).attr('data-metadata')});
+ window.clipboard.push({path: $(this).attr('data-path'), uid: $(this).attr('data-uid'), metadata: $(this).attr('data-metadata')});
})
}
}
@@ -1645,17 +1645,17 @@ window.initgui = async function(){
//-----------------------------------------------------------------------------
if((e.ctrlKey || e.metaKey) && e.which === 88 && !$(focused_el).is('input') && !$(focused_el).is('textarea')){
let $selected_items;
- let parent_container = $(active_element).closest('.item-container');
+ let parent_container = $(window.active_element).closest('.item-container');
if(parent_container.length === 0)
- parent_container = $(active_element).find('.item-container');
+ parent_container = $(window.active_element).find('.item-container');
if(parent_container !== null){
$selected_items = $(parent_container).find('.item-selected');
if($selected_items.length > 0){
- clipboard = [];
- clipboard_op = 'move';
+ window.clipboard = [];
+ window.clipboard_op = 'move';
$selected_items.each(function() {
- clipboard.push($(this).attr('data-path'));
+ window.clipboard.push($(this).attr('data-path'));
})
}
}
@@ -1665,7 +1665,7 @@ window.initgui = async function(){
// Open
// Enter key on a selected item will open it
//-----------------------------------------------------------------------
- if(e.which === 13 && !$(focused_el).is('input') && !$(focused_el).is('textarea') && (Date.now() - last_enter_pressed_to_rename_ts) >200
+ if(e.which === 13 && !$(focused_el).is('input') && !$(focused_el).is('textarea') && (Date.now() - window.last_enter_pressed_to_rename_ts) >200
// prevent firing twice, because this will be fired on both keyup and keydown
&& e.type === 'keydown'){
let $selected_items;
@@ -1679,7 +1679,7 @@ window.initgui = async function(){
if($('.launch-app-selected').length > 0){
// close launch menu
$(".launch-popover").fadeOut(200, function(){
- launch_app({
+ window.launch_app({
name: $('.launch-app-selected').attr('data-name'),
})
$(".launch-popover").remove();
@@ -1702,7 +1702,7 @@ window.initgui = async function(){
$(selected_item).trigger('click');
if($('.context-menu[data-is-submenu="true"]').length > 0){
let selected_item = $('.context-menu[data-is-submenu="true"] .context-menu-item').get(0);
- select_ctxmenu_item(selected_item);
+ window.select_ctxmenu_item(selected_item);
}
return false;
@@ -1710,11 +1710,11 @@ window.initgui = async function(){
// ---------------------------------------------
// if this is a selected item, open it
// ---------------------------------------------
- else if(active_item_container){
- $selected_items = $(active_item_container).find('.item-selected');
+ else if(window.active_item_container){
+ $selected_items = $(window.active_item_container).find('.item-selected');
if($selected_items.length > 0){
$selected_items.each(function() {
- open_item({
+ window.open_item({
item: this,
new_window: e.metaKey || e.ctrlKey,
});
@@ -1733,7 +1733,7 @@ window.initgui = async function(){
let target_path, target_el;
// continue only if there is something in the clipboard
- if(clipboard.length === 0)
+ if(window.clipboard.length === 0)
return;
let parent_container = determine_active_container_parent();
@@ -1742,13 +1742,13 @@ window.initgui = async function(){
target_el = parent_container;
target_path = $(parent_container).attr('data-path');
// don't allow pasting in Trash
- if((target_path === trash_path || target_path.startsWith(trash_path + '/')) && clipboard_op !== 'move')
+ if((target_path === window.trash_path || target_path.startsWith(window.trash_path + '/')) && window.clipboard_op !== 'move')
return;
// execute clipboard operation
- if(clipboard_op === 'copy')
- copy_clipboard_items(target_path);
- else if(clipboard_op === 'move')
- move_clipboard_items(target_el, target_path);
+ if(window.clipboard_op === 'copy')
+ window.copy_clipboard_items(target_path);
+ else if(window.clipboard_op === 'move')
+ window.move_clipboard_items(target_el, target_path);
}
return false;
}
@@ -1757,40 +1757,40 @@ window.initgui = async function(){
// ctrl/command + z, will undo last action
//-----------------------------------------------------------------------------
if((e.ctrlKey || e.metaKey) && e.which === 90){
- undo_last_action();
+ window.undo_last_action();
return false;
}
});
// update mouse position coordinates
$(document).mousemove(function(event){
- mouseX = event.clientX;
- mouseY = event.clientY;
+ window.mouseX = event.clientX;
+ window.mouseY = event.clientY;
// mouse in top-left corner of screen
- if((mouseX < 150 && mouseY < toolbar_height + 20) || (mouseX < 20 && mouseY < 150))
- current_active_snap_zone = 'nw';
+ if((window.mouseX < 150 && window.mouseY < window.toolbar_height + 20) || (window.mouseX < 20 && window.mouseY < 150))
+ window.current_active_snap_zone = 'nw';
// mouse in left edge of screen
- else if(mouseX < 20 && mouseY >= 150 && mouseY < desktop_height - 150)
- current_active_snap_zone = 'w';
+ else if(window.mouseX < 20 && window.mouseY >= 150 && window.mouseY < window.desktop_height - 150)
+ window.current_active_snap_zone = 'w';
// mouse in bottom-left corner of screen
- else if(mouseX < 20 && mouseY > desktop_height - 150)
- current_active_snap_zone = 'sw';
+ else if(window.mouseX < 20 && window.mouseY > window.desktop_height - 150)
+ window.current_active_snap_zone = 'sw';
// mouse in right edge of screen
- else if(mouseX > desktop_width - 20 && mouseY >= 150 && mouseY < desktop_height - 150)
- current_active_snap_zone = 'e';
+ else if(window.mouseX > window.desktop_width - 20 && window.mouseY >= 150 && window.mouseY < window.desktop_height - 150)
+ window.current_active_snap_zone = 'e';
// mouse in top-right corner of screen
- else if((mouseX > desktop_width - 150 && mouseY < toolbar_height + 20) || (mouseX > desktop_width - 20 && mouseY < 150))
- current_active_snap_zone = 'ne';
+ else if((window.mouseX > window.desktop_width - 150 && window.mouseY < window.toolbar_height + 20) || (window.mouseX > window.desktop_width - 20 && window.mouseY < 150))
+ window.current_active_snap_zone = 'ne';
// mouse in bottom-right corner of screen
- else if(mouseX > desktop_width - 20 && mouseY >= desktop_height - 150)
- current_active_snap_zone = 'se';
+ else if(window.mouseX > window.desktop_width - 20 && window.mouseY >= window.desktop_height - 150)
+ window.current_active_snap_zone = 'se';
// mouse in top edge of screen
- else if(mouseY < toolbar_height + 20 && mouseX >= 150 && mouseX < desktop_width - 150)
- current_active_snap_zone = 'n';
+ else if(window.mouseY < window.toolbar_height + 20 && window.mouseX >= 150 && window.mouseX < window.desktop_width - 150)
+ window.current_active_snap_zone = 'n';
// not in any snap zone
else
- current_active_snap_zone = undefined;
+ window.current_active_snap_zone = undefined;
// mouseover_window
var windows = document.getElementsByClassName("window");
@@ -1799,7 +1799,7 @@ window.initgui = async function(){
let highest_window_zindex = 0;
for(let i=0; i rect.x && mouseX < (rect.x + rect.width) && mouseY > rect.y && mouseY < (rect.y + rect.height)){
+ if( window.mouseX > rect.x && window.mouseX < (rect.x + rect.width) && window.mouseY > rect.y && window.mouseY < (rect.y + rect.height)){
if(parseInt($(windows[i]).css('z-index')) >= highest_window_zindex){
active_win = windows[i];
highest_window_zindex = parseInt($(windows[i]).css('z-index'));
@@ -1816,7 +1816,7 @@ window.initgui = async function(){
let highest_window_zindex = 0;
for(let i=0; i rect.x && mouseX < (rect.x + rect.width) && mouseY > rect.y && mouseY < (rect.y + rect.height)){
+ if( window.mouseX > rect.x && window.mouseX < (rect.x + rect.width) && window.mouseY > rect.y && window.mouseY < (rect.y + rect.height)){
let active_container_zindex = parseInt($(item_containers[i]).closest('.window').css('z-index'));
if( !isNaN(active_container_zindex) && active_container_zindex >= highest_window_zindex){
active_ic = item_containers[i];
@@ -1837,8 +1837,8 @@ window.initgui = async function(){
return;
// if mouse is clicked on a window, activate it
- if(mouseover_window !== undefined){
- $(mouseover_window).focusWindow(e);
+ if(window.mouseover_window !== undefined){
+ $(window.mouseover_window).focusWindow(e);
}
})
@@ -1873,7 +1873,7 @@ window.initgui = async function(){
if(items?.length>0){
let parent_container = determine_active_container_parent();
if(parent_container){
- upload_items(items, $(parent_container).attr('data-path'));
+ window.upload_items(items, $(parent_container).attr('data-path'));
}
}
@@ -1931,9 +1931,9 @@ window.initgui = async function(){
default_username: window.user.username
});
if(saved)
- logout();
+ window.logout();
}else if (alert_resp === 'log_out'){
- logout();
+ window.logout();
}
else{
return;
@@ -1943,12 +1943,12 @@ window.initgui = async function(){
// logout
try{
await $.ajax({
- url: gui_origin + "/logout",
+ url: window.gui_origin + "/logout",
type: 'POST',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer " + auth_token
+ "Authorization": "Bearer " + window.auth_token
},
statusCode: {
401: function () {
@@ -1956,7 +1956,7 @@ window.initgui = async function(){
},
})
}catch(e){
-
+ // Ignored
}
// remove this user from the array of logged_in_users
`;
diff --git a/src/UI/UIWindowSaveAccount.js b/src/UI/UIWindowSaveAccount.js
index 6048ccd1a..f0c7b8611 100644
--- a/src/UI/UIWindowSaveAccount.js
+++ b/src/UI/UIWindowSaveAccount.js
@@ -127,7 +127,7 @@ async function UIWindowSaveAccount(options){
$(el_window).find('.signup-btn').prop('disabled', true);
$.ajax({
- url: api_origin + "/save_account",
+ url: window.api_origin + "/save_account",
type: 'POST',
async: true,
contentType: "application/json",
@@ -139,10 +139,10 @@ async function UIWindowSaveAccount(options){
send_confirmation_code: options.send_confirmation_code,
}),
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
- success: async function (data){
- update_auth_data(data.token, data.user)
+ success: async function (data){
+ window.update_auth_data(data.token, data.user)
//close this window
if(data.user.email_confirmation_required){
diff --git a/src/UI/UIWindowSessionList.js b/src/UI/UIWindowSessionList.js
index a0d8bdb90..751f2e185 100644
--- a/src/UI/UIWindowSessionList.js
+++ b/src/UI/UIWindowSessionList.js
@@ -30,9 +30,9 @@ async function UIWindowSessionList(options){
h += `
`;
@@ -3393,9 +3399,9 @@ window.store_auto_arrange_preference = (preference)=>{
window.get_auto_arrange_data = async()=>{
const preferenceValue = await puter.kv.get('user_preferences.auto_arrange_desktop');
- is_auto_arrange_enabled = preferenceValue === null ? true : preferenceValue;
+ window.is_auto_arrange_enabled = preferenceValue === null ? true : preferenceValue;
const positions = await puter.kv.get('desktop_item_positions')
- desktop_item_positions = (!positions || typeof positions !== 'object' || Array.isArray(positions)) ? {} : positions;
+ window.desktop_item_positions = (!positions || typeof positions !== 'object' || Array.isArray(positions)) ? {} : positions;
}
window.clear_desktop_item_positions = async(el_desktop)=>{
@@ -3405,14 +3411,14 @@ window.clear_desktop_item_positions = async(el_desktop)=>{
$(el_item).css('left', '');
$(el_item).css('top', '');
});
- if(reset_item_positions){
- delete_desktop_item_positions()
+ if(window.reset_item_positions){
+ window.delete_desktop_item_positions()
}
}
window.set_desktop_item_positions = async(el_desktop)=>{
$(el_desktop).find('.item').each(async function(){
- const position = desktop_item_positions[$(this).attr('data-uid')]
+ const position = window.desktop_item_positions[$(this).attr('data-uid')]
const el_item = $(this)[0];
if(position){
$(el_item).css('position', 'absolute');
@@ -3423,11 +3429,11 @@ window.set_desktop_item_positions = async(el_desktop)=>{
}
window.save_desktop_item_positions = ()=>{
- puter.kv.set('desktop_item_positions', desktop_item_positions);
+ puter.kv.set('desktop_item_positions', window.desktop_item_positions);
}
window.delete_desktop_item_positions = ()=>{
- desktop_item_positions = {}
+ window.desktop_item_positions = {}
puter.kv.del('desktop_item_positions');
}
@@ -3435,7 +3441,7 @@ window.change_clock_visible = (clock_visible) => {
let newValue = clock_visible || window.user_preferences.clock_visible;
- newValue === 'auto' && is_fullscreen() ? $('#clock').show() : $('#clock').hide();
+ newValue === 'auto' && window.is_fullscreen() ? $('#clock').show() : $('#clock').hide();
newValue === 'show' && $('#clock').show();
newValue === 'hide' && $('#clock').hide();
@@ -3459,14 +3465,14 @@ window.window_for_app_instance = (instance_id) => {
// Finds the `iframe` element for the given app instance ID
window.iframe_for_app_instance = (instance_id) => {
- return $(window_for_app_instance(instance_id)).find('.window-app-iframe').get(0);
+ return $(window.window_for_app_instance(instance_id)).find('.window-app-iframe').get(0);
};
// Run any callbacks to say that the app has launched
window.report_app_launched = (instance_id, { uses_sdk = true }) => {
const child_launch_callback = window.child_launch_callbacks[instance_id];
if (child_launch_callback) {
- const parent_iframe = iframe_for_app_instance(child_launch_callback.parent_instance_id);
+ const parent_iframe = window.iframe_for_app_instance(child_launch_callback.parent_instance_id);
// send confirmation to requester window
parent_iframe.contentWindow.postMessage({
msg: 'childAppLaunched',
@@ -3480,7 +3486,7 @@ window.report_app_launched = (instance_id, { uses_sdk = true }) => {
// Run any callbacks to say that the app has closed
window.report_app_closed = (instance_id) => {
- const el_window = window_for_app_instance(instance_id);
+ const el_window = window.window_for_app_instance(instance_id);
// notify parent app, if we have one, that we're closing
const parent_id = el_window.dataset['parent_instance_id'];
@@ -3511,7 +3517,7 @@ window.check_password_strength = (password) => {
hasUpperCase: /[A-Z]/.test(password),
hasLowerCase: /[a-z]/.test(password),
hasNumber: /\d/.test(password),
- hasSpecialChar: /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)
+ hasSpecialChar: /[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]/.test(password)
};
let overallPass = true;
diff --git a/src/helpers/determine_active_container_parent.js b/src/helpers/determine_active_container_parent.js
index 32a8388d6..c66d03f68 100644
--- a/src/helpers/determine_active_container_parent.js
+++ b/src/helpers/determine_active_container_parent.js
@@ -19,22 +19,22 @@
const determine_active_container_parent = function(){
// the container is either an ancestor of active element...
- let parent_container = $(active_element).closest('.item-container');
+ let parent_container = $(window.active_element).closest('.item-container');
// ... or a descendant of it...
if(parent_container.length === 0){
- parent_container = $(active_element).find('.item-container');
+ parent_container = $(window.active_element).find('.item-container');
}
// ... or siblings or cousins
if(parent_container.length === 0){
- parent_container = $(active_element).closest('.window').find('.item-container');
+ parent_container = $(window.active_element).closest('.window').find('.item-container');
}
// ... or the active element itself (if it's a container)
- if(parent_container.length === 0 && active_element && $(active_element).hasClass('item-container')){
- parent_container = $(active_element);
+ if(parent_container.length === 0 && window.active_element && $(window.active_element).hasClass('item-container')){
+ parent_container = $(window.active_element);
}
// ... or if there is no active element, the selected item that is not blurred
- if(parent_container.length === 0 && active_item_container){
- parent_container = active_item_container;
+ if(parent_container.length === 0 && window.active_item_container){
+ parent_container = window.active_item_container;
}
return parent_container;
diff --git a/src/helpers/download.js b/src/helpers/download.js
index 3429b6648..5ccbb8a26 100644
--- a/src/helpers/download.js
+++ b/src/helpers/download.js
@@ -48,8 +48,8 @@ const download = function(options){
let item_download_progress = batch_download_progress[options.item_upload_id];
let xhr = new XMLHttpRequest();
- xhr.open("post", (api_origin + '/download'), true);
- xhr.setRequestHeader("Authorization", "Bearer " + auth_token);
+ xhr.open("post", (window.api_origin + '/download'), true);
+ xhr.setRequestHeader("Authorization", "Bearer " + window.auth_token);
xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
xhr.addEventListener('load', function(e){
@@ -89,7 +89,7 @@ const download = function(options){
// Regularly check if this operation has been cancelled by the user
//----------------------------------------------
cancel_check_interval = setInterval(() => {
- if(operation_cancelled[options.operation_id]){
+ if(window.operation_cancelled[options.operation_id]){
xhr.abort();
clearInterval(cancel_check_interval);
clearInterval(progress_check_interval);
diff --git a/src/helpers/new_context_menu_item.js b/src/helpers/new_context_menu_item.js
index 05a7eeaf9..6c2ea49e1 100644
--- a/src/helpers/new_context_menu_item.js
+++ b/src/helpers/new_context_menu_item.js
@@ -35,7 +35,7 @@ const new_context_menu_item = function(dirname, append_to_element){
html: i18n('new_folder'),
icon: ``;
h += `${html_encode(err.entry_name)} already exists.`,
buttons:[
{label: i18n('replace'), type: 'primary', value: 'replace'},
- ... (clipboard.length > 1) ? [{label: i18n('replace_all'), value: 'replace_all'}] : [],
- ... (clipboard.length > 1) ? [{label: i18n('skip'), value: 'skip'}] : [{label: i18n('cancel'), value: 'cancel'}],
+ ... (window.clipboard.length > 1) ? [{label: i18n('replace_all'), value: 'replace_all'}] : [],
+ ... (window.clipboard.length > 1) ? [{label: i18n('skip'), value: 'skip'}] : [{label: i18n('cancel'), value: 'cancel'}],
]
})
if(alert_resp === 'replace'){
@@ -1324,7 +1329,7 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
// done
// Add action to actions_history for undo ability
- actions_history.push({
+ window.actions_history.push({
operation: 'copy',
data: copied_item_paths
});
@@ -1332,13 +1337,13 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
clearTimeout(progwin_timeout);
let copy_duration = (Date.now() - copy_progress_window_init_ts);
- if(progwin && copy_duration >= copy_progress_hide_delay){
+ if(progwin && copy_duration >= window.copy_progress_hide_delay){
$(progwin).close();
}else if(progwin){
setTimeout(() => {
setTimeout(() => {
$(progwin).close();
- }, Math.abs(copy_progress_hide_delay - copy_duration));
+ }, Math.abs(window.copy_progress_hide_delay - copy_duration));
})
}
})();
@@ -1351,7 +1356,7 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
* @param {string} dest_path - Destination path to copy items to
*/
window.copy_items = function(el_items, dest_path){
- let copy_op_id = operation_id++;
+ let copy_op_id = window.operation_id++;
let overwrite_all = false;
(async()=>{
let copy_progress_window_init_ts = Date.now();
@@ -1374,7 +1379,7 @@ window.copy_items = function(el_items, dest_path){
if(overwrite)
item_with_same_name_already_exists = false;
// cancelled?
- if(operation_cancelled[copy_op_id])
+ if(window.operation_cancelled[copy_op_id])
return;
try{
let resp = await puter.fs.copy({
@@ -1429,7 +1434,7 @@ window.copy_items = function(el_items, dest_path){
// done
// Add action to actions_history for undo ability
- actions_history.push({
+ window.actions_history.push({
operation: 'copy',
data: copied_item_paths
});
@@ -1437,13 +1442,13 @@ window.copy_items = function(el_items, dest_path){
clearTimeout(progwin_timeout);
let copy_duration = (Date.now() - copy_progress_window_init_ts);
- if(progwin && copy_duration >= copy_progress_hide_delay){
+ if(progwin && copy_duration >= window.copy_progress_hide_delay){
$(progwin).close();
}else if(progwin){
setTimeout(() => {
setTimeout(() => {
$(progwin).close();
- }, Math.abs(copy_progress_hide_delay - copy_duration));
+ }, Math.abs(window.copy_progress_hide_delay - copy_duration));
})
}
})()
@@ -1483,8 +1488,8 @@ window.delete_item = async function(el_item, descendants_only = false){
$(`.item[data-uid='${$(el_item).attr('data-uid')}']`).removeItems();
// update parent windows' item counts
$(parent_windows).each(function(index){
- update_explorer_footer_item_count(this);
- update_explorer_footer_selected_items_count(this);
+ window.update_explorer_footer_item_count(this);
+ window.update_explorer_footer_selected_items_count(this);
});
// update all shortcuts to this item
$(`.item[data-shortcut_to_path="${html_encode($(el_item).attr('data-path'))}" i]`).attr(`data-shortcut_to_path`, '');
@@ -1497,15 +1502,15 @@ window.delete_item = async function(el_item, descendants_only = false){
window.move_clipboard_items = function (el_target_container, target_path){
let dest_path = target_path === undefined ? $(el_target_container).attr('data-path') : target_path;
let el_items = [];
- if(clipboard.length > 0){
- for(let i=0; i 0){
+ for(let i=0; i 0)
- move_items(el_items, dest_path);
+ window.move_items(el_items, dest_path);
}
- clipboard = [];
+ window.clipboard = [];
}
/**
@@ -1534,7 +1539,7 @@ window.trigger_download = (paths)=>{
let urls = [];
for (let index = 0; index < paths.length; index++) {
urls.push({
- download: api_origin + "/down?path=" + paths[index] + "&auth_token=" + auth_token,
+ download: window.api_origin + "/down?path=" + paths[index] + "&auth_token=" + window.auth_token,
filename: path.basename(paths[index]),
});
}
@@ -1553,7 +1558,7 @@ window.trigger_download = (paths)=>{
* @param {*} options
*/
window.launch_app = async (options)=>{
- const uuid = options.uuid ?? uuidv4();
+ const uuid = options.uuid ?? window.uuidv4();
let icon, title, file_signature;
const window_options = options.window_options ?? {};
@@ -1562,15 +1567,13 @@ window.launch_app = async (options)=>{
}
// try to get 3rd-party app info
- let app_info = options.app_obj ?? await get_apps(options.name);
+ let app_info = options.app_obj ?? await window.get_apps(options.name);
//-----------------------------------
// icon
//-----------------------------------
if(app_info.icon)
icon = app_info.icon;
- else if(app_info.icon)
- icon = window.icons['app.svg'];
else if(options.name === 'explorer')
icon = window.icons['folder.svg'];
else
@@ -1636,7 +1639,7 @@ window.launch_app = async (options)=>{
title = 'Trash';
}
else if(!options.path)
- title = root_dirname;
+ title = window.root_dirname;
else
title = path.dirname(options.path);
@@ -1681,7 +1684,7 @@ window.launch_app = async (options)=>{
iframe_url = new URL('https://'+options.name+'.' + window.app_domain + `/index.html`);
} else if ( app_info.index_url.startsWith(BUILTIN_PREFIX) ) {
const name = app_info.index_url.slice(BUILTIN_PREFIX.length);
- iframe_url = new URL(`${gui_origin}/builtin/${name}`);
+ iframe_url = new URL(`${window.gui_origin}/builtin/${name}`);
} else {
iframe_url = new URL(app_info.index_url);
}
@@ -1708,7 +1711,7 @@ window.launch_app = async (options)=>{
iframe_url.searchParams.append('puter.item.accessed', file_signature.fsentry_accessed);
iframe_url.searchParams.append('puter.item.modified', file_signature.fsentry_modified);
iframe_url.searchParams.append('puter.item.created', file_signature.fsentry_created);
- iframe_url.searchParams.append('puter.domain', app_domain);
+ iframe_url.searchParams.append('puter.domain', window.app_domain);
}
else if(options.readURL){
iframe_url.searchParams.append('puter.item.name', options.filename);
@@ -1720,7 +1723,7 @@ window.launch_app = async (options)=>{
if (app_info.godmode && app_info.godmode === 1){
// Add auth_token to GODMODE apps
- iframe_url.searchParams.append('puter.auth.token', auth_token);
+ iframe_url.searchParams.append('puter.auth.token', window.auth_token);
iframe_url.searchParams.append('puter.auth.username', window.user.username);
iframe_url.searchParams.append('puter.domain', window.app_domain);
} else if (options.token){
@@ -1734,7 +1737,7 @@ window.launch_app = async (options)=>{
let response = await fetch(window.api_origin + "/auth/get-user-app-token", {
"headers": {
"Content-Type": "application/json",
- "Authorization": "Bearer "+ auth_token,
+ "Authorization": "Bearer "+ window.auth_token,
},
"body": JSON.stringify({app_uid: app_info.uid ?? app_info.uuid}),
"method": "POST",
@@ -1745,8 +1748,8 @@ window.launch_app = async (options)=>{
}
}
- if(api_origin)
- iframe_url.searchParams.append('puter.api_origin', api_origin);
+ if(window.api_origin)
+ iframe_url.searchParams.append('puter.api_origin', window.api_origin);
// Add options.params to URL
if(options.params){
@@ -1797,17 +1800,17 @@ window.launch_app = async (options)=>{
// send post request to /rao to record app open
if(options.name !== 'explorer'){
// add the app to the beginning of the array
- launch_apps.recent.unshift(app_info);
+ window.launch_apps.recent.unshift(app_info);
// dedupe the array by uuid, uid, and id
- launch_apps.recent = _.uniqBy(launch_apps.recent, 'name');
+ window.launch_apps.recent = _.uniqBy(window.launch_apps.recent, 'name');
// limit to window.launch_recent_apps_count
- launch_apps.recent = launch_apps.recent.slice(0, window.launch_recent_apps_count);
+ window.launch_apps.recent = window.launch_apps.recent.slice(0, window.launch_recent_apps_count);
// send post request to /rao to record app open
$.ajax({
- url: api_origin + "/rao",
+ url: window.api_origin + "/rao",
type: 'POST',
data: JSON.stringify({
original_client_socket_id: window.socket?.id,
@@ -1816,7 +1819,7 @@ window.launch_app = async (options)=>{
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
})
}
@@ -1864,13 +1867,13 @@ window.open_item = async function(options){
//----------------------------------------------------------------
// Is this a shortcut whose source is trashed?
//----------------------------------------------------------------
- else if(is_shortcut && shortcut_to_path.startsWith(trash_path + '/')){
+ else if(is_shortcut && shortcut_to_path.startsWith(window.trash_path + '/')){
UIAlert(`This shortcut can't be opened because its source has been deleted.`)
}
//----------------------------------------------------------------
// Is this a trashed file?
//----------------------------------------------------------------
- else if(item_path.startsWith(trash_path + '/')){
+ else if(item_path.startsWith(window.trash_path + '/')){
UIAlert(`This item can't be opened because it's in the trash. To use this item, first drag it out of the Trash.`)
}
//----------------------------------------------------------------
@@ -1939,21 +1942,21 @@ window.open_item = async function(options){
}
// done
let busy_duration = (Date.now() - busy_init_ts);
- if( busy_duration >= busy_indicator_hide_delay){
+ if( busy_duration >= window.busy_indicator_hide_delay){
$el_parent_window.close();
}else{
setTimeout(() => {
// close this dialog
$el_parent_window.close();
- }, Math.abs(busy_indicator_hide_delay - busy_duration));
+ }, Math.abs(window.busy_indicator_hide_delay - busy_duration));
}
}
//----------------------------------------------------------------
// Does the user have a preference for this file type?
//----------------------------------------------------------------
- else if(!associated_app_name && !is_dir && user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`]) {
- launch_app({
- name: user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`],
+ else if(!associated_app_name && !is_dir && window.user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`]) {
+ window.launch_app({
+ name: window.user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`],
file_path: item_path,
window_title: path.basename(item_path),
maximized: options.maximized,
@@ -1964,7 +1967,7 @@ window.open_item = async function(options){
// Is there an app associated with this item?
//----------------------------------------------------------------
else if(associated_app_name !== ''){
- launch_app({
+ window.launch_app({
name: associated_app_name,
})
}
@@ -1975,7 +1978,7 @@ window.open_item = async function(options){
UIWindow({
path: item_path,
title: path.basename(item_path),
- icon: await item_icon({is_dir: true, path: item_path}),
+ icon: await window.item_icon({is_dir: true, path: item_path}),
uid: $(el_item).attr('data-uid'),
is_dir: is_dir,
app: 'explorer',
@@ -1989,11 +1992,11 @@ window.open_item = async function(options){
// Dir with an open window: change the path of the open window
//----------------------------------------------------------------
else if($el_parent_window.length > 0 && is_dir){
- window_nav_history[parent_win_id] = window_nav_history[parent_win_id].slice(0, window_nav_history_current_position[parent_win_id]+1);
- window_nav_history[parent_win_id].push(item_path);
- window_nav_history_current_position[parent_win_id]++;
+ window.window_nav_history[parent_win_id] = window.window_nav_history[parent_win_id].slice(0, window.window_nav_history_current_position[parent_win_id]+1);
+ window.window_nav_history[parent_win_id].push(item_path);
+ window.window_nav_history_current_position[parent_win_id]++;
- update_window_path($el_parent_window, item_path);
+ window.update_window_path($el_parent_window, item_path);
}
//----------------------------------------------------------------
// all other cases: try to open using an app
@@ -2006,7 +2009,7 @@ window.open_item = async function(options){
// get all info needed to open an item
try{
open_item_meta = await $.ajax({
- url: api_origin + "/open_item",
+ url: window.api_origin + "/open_item",
type: 'POST',
contentType: "application/json",
data: JSON.stringify({
@@ -2014,19 +2017,20 @@ window.open_item = async function(options){
path: fspath ?? undefined,
}),
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
});
}catch(err){
+ // Ignored
}
// get a list of suggested apps for this file type.
- let suggested_apps = open_item_meta?.suggested_apps ?? await 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
@@ -2037,7 +2041,7 @@ window.open_item = async function(options){
// If .zip file, unzip it
//---------------------------------------------
if(path.extname(item_path) === '.zip'){
- unzipItem(item_path);
+ window.unzipItem(item_path);
return;
}
const alert_resp = await UIAlert(
@@ -2054,7 +2058,7 @@ window.open_item = async function(options){
}
])
if(alert_resp === 'download_file'){
- trigger_download([item_path]);
+ window.trigger_download([item_path]);
}
return;
}
@@ -2062,7 +2066,7 @@ window.open_item = async function(options){
// First suggested app is default app to open this item
//---------------------------------------------
else{
- launch_app({
+ window.launch_app({
name: suggested_apps[0].name,
token: open_item_meta.token,
file_path: item_path,
@@ -2084,8 +2088,8 @@ window.open_item = async function(options){
* @returns {Promise}
*/
window.move_items = async function(el_items, dest_path, is_undo = false){
- let move_op_id = operation_id++;
- operation_cancelled[move_op_id] = false;
+ let move_op_id = window.operation_id++;
+ window.operation_cancelled[move_op_id] = false;
// --------------------------------------------------------
// Optimization: in case all items being moved
@@ -2126,7 +2130,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
let el_item = el_items[i];
// if operation cancelled by user, stop
- if(operation_cancelled[move_op_id])
+ if(window.operation_cancelled[move_op_id])
return;
// cannot move an immutable item, skip it
@@ -2164,13 +2168,14 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
try{
metadata = JSON.parse(metadata)
}catch(e){
+ // Ignored
}
}
let new_name;
// user cancelled?
- if(operation_cancelled[move_op_id])
+ if(window.operation_cancelled[move_op_id])
return;
// indicates whether this is a recycling operation
@@ -2179,7 +2184,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
// --------------------------------------------------------
// Trashing
// --------------------------------------------------------
- if(dest_path === trash_path){
+ if(dest_path === window.trash_path){
new_name = $(el_item).attr('data-uid');
metadata = {
original_name: $(el_item).attr('data-name'),
@@ -2193,12 +2198,12 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
// change trash icons to 'trash-full.svg'
$(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash-full.svg']);
- $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash-full.svg']);
- $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash-full.svg']);
+ $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash-full.svg']);
+ $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash-full.svg']);
}
// moving an item into a trashed directory? deny.
- else if(dest_path.startsWith(trash_path)){
+ else if(dest_path.startsWith(window.trash_path)){
$(progwin).close();
UIAlert('Cannot move items into a deleted folder.');
return;
@@ -2212,7 +2217,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
new_name = metadata.original_name;
metadata = {};
untrashed_at_least_one_item = true;
- path_to_show_on_progwin = trash_path + '/' + new_name;
+ path_to_show_on_progwin = window.trash_path + '/' + new_name;
}
// --------------------------------------------------------
@@ -2251,13 +2256,13 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
$(this).removeItems();
// update parent windows' item counts and selected item counts in their footers
$(parent_windows).each(function(){
- update_explorer_footer_item_count(this);
- update_explorer_footer_selected_items_count(this)
+ window.update_explorer_footer_item_count(this);
+ window.update_explorer_footer_selected_items_count(this)
});
})
// if trashing, close windows of trashed items and its descendants
- if(dest_path === trash_path){
+ if(dest_path === window.trash_path){
$(`.window[data-path="${html_encode($(el_item).attr('data-path'))}" i]`).close();
// todo this has to be case-insensitive but the `i` selector doesn't work on ^=
$(`.window[data-path^="${html_encode($(el_item).attr('data-path'))}/"]`).close();
@@ -2267,16 +2272,17 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
else{
// todo this has to be case-insensitive but the `i` selector doesn't work on ^=
$(`.window[data-path^="${html_encode($(el_item).attr('data-path'))}/"], .window[data-path="${html_encode($(el_item).attr('data-path'))}" i]`).each(function(){
- update_window_path(this, $(this).attr('data-path').replace($(el_item).attr('data-path'), path.join(dest_path, fsentry.name)));
+ window.update_window_path(this, $(this).attr('data-path').replace($(el_item).attr('data-path'), path.join(dest_path, fsentry.name)));
})
}
- if(dest_path === trash_path){
+ if(dest_path === window.trash_path){
// if trashing dir...
if($(el_item).attr('data-is_dir') === '1'){
// disassociate all its websites
// todo, some client-side check to see if this dir has at least one associated website before sending ajax request
- puter.hosting.delete(dir_uuid)
+ // FIXME: dir_uuid is not defined, is this the same as the data-uid attribute?
+ // puter.hosting.delete(dir_uuid)
$(`.mywebsites-dir-path[data-uuid="${$(el_item).attr('data-uid')}"]`).remove();
// remove the website badge from all instances of the dir
@@ -2299,14 +2305,14 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
associated_app_name: fsentry.associated_app?.name,
uid: fsentry.uid,
path: fsentry.path,
- icon: await item_icon(fsentry),
- name: (dest_path === trash_path) ? $(el_item).attr('data-name') : fsentry.name,
+ icon: await window.item_icon(fsentry),
+ name: (dest_path === window.trash_path) ? $(el_item).attr('data-name') : fsentry.name,
is_dir: fsentry.is_dir,
size: fsentry.size,
type: fsentry.type,
modified: fsentry.modified,
is_selected: false,
- is_shared: (dest_path === trash_path) ? false : fsentry.is_shared,
+ is_shared: (dest_path === window.trash_path) ? false : fsentry.is_shared,
is_shortcut: fsentry.is_shortcut,
shortcut_to: fsentry.shortcut_to,
shortcut_to_path: fsentry.shortcut_to_path,
@@ -2328,7 +2334,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
immutable: false,
uid: dir.uid,
path: dir.path,
- icon: await item_icon(dir),
+ icon: await window.item_icon(dir),
name: dir.name,
size: dir.size,
type: dir.type,
@@ -2340,12 +2346,12 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
suggested_apps: dir.suggested_apps,
});
}
- sort_items(item_container);
+ window.sort_items(item_container);
});
//sort each container
$(`.item-container[data-path="${html_encode(dest_path)}" i]`).each(function(){
- sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
+ window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order'))
})
}catch(err){
// -----------------------------------------------------------------------
@@ -2388,14 +2394,14 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
// check if trash is empty
if(untrashed_at_least_one_item){
- const trash = await puter.fs.stat(trash_path);
+ const trash = await puter.fs.stat(window.trash_path);
if(window.socket){
window.socket.emit('trash.is_empty', {is_empty: trash.is_empty});
}
if(trash.is_empty){
$(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash.svg']);
- $(`.item[data-path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
- $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
+ $(`.item[data-path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
+ $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
}
}
}
@@ -2410,13 +2416,13 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
// DONE! close progress window with delay to allow user to see 100% progress
// -----------------------------------------------------------------------
// Add action to actions_history for undo ability
- if(!is_undo && dest_path !== trash_path){
- actions_history.push({
+ if(!is_undo && dest_path !== window.trash_path){
+ window.actions_history.push({
operation: 'move',
data: moved_items,
});
- }else if(!is_undo && dest_path === trash_path){
- actions_history.push({
+ }else if(!is_undo && dest_path === window.trash_path){
+ window.actions_history.push({
operation: 'delete',
data: moved_items,
});
@@ -2425,7 +2431,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
if(progwin){
setTimeout(() => {
$(progwin).close();
- }, copy_progress_hide_delay);
+ }, window.copy_progress_hide_delay);
}
}
@@ -2638,7 +2644,7 @@ window.init_upload_using_dialog = function(el_target_container, target_path = nu
const files = $('#upload-file-dialog')[0].files;
if(files.length > 0){
try{
- upload_items(files, target_path);
+ window.upload_items(files, target_path);
}
catch(err){
UIAlert(err.message ?? err)
@@ -2656,7 +2662,7 @@ window.upload_items = async function(items, dest_path){
let upload_progress_window;
let opid;
- if(dest_path == trash_path){
+ if(dest_path == window.trash_path){
UIAlert('Uploading to trash is not allowed!');
return;
}
@@ -2676,11 +2682,11 @@ window.upload_items = async function(items, dest_path){
// cancel btn
$(upload_progress_window).find('.upload-cancel-btn').on('click', function(e){
$(upload_progress_window).close();
- show_save_account_notice_if_needed();
+ window.show_save_account_notice_if_needed();
xhr.abort();
})
// add to active_uploads
- active_uploads[opid] = 0;
+ window.active_uploads[opid] = 0;
},
// start
start: async function(){
@@ -2692,7 +2698,7 @@ window.upload_items = async function(items, dest_path){
$(`[data-upload-operation-id="${operation_id}"]`).find('.upload-progress-bar').css( 'width', op_progress+'%');
$(`[data-upload-operation-id="${operation_id}"]`).find('.upload-progress-percent').html(op_progress+'%');
// update active_uploads
- active_uploads[opid] = op_progress;
+ window.active_uploads[opid] = op_progress;
// update title if window is not visible
if(document.visibilityState !== "visible"){
update_title_based_on_uploads();
@@ -2711,32 +2717,32 @@ window.upload_items = async function(items, dest_path){
files.push(items.path)
}
- actions_history.push({
+ window.actions_history.push({
operation: 'upload',
data: files
});
// close progress window after a bit of delay for a better UX
setTimeout(() => {
setTimeout(() => {
- $(upload_progress_window).close();
- show_save_account_notice_if_needed();
- }, Math.abs(upload_progress_hide_delay));
+ $(upload_progress_window).close();
+ window.show_save_account_notice_if_needed();
+ }, Math.abs(window.upload_progress_hide_delay));
})
// remove from active_uploads
- delete active_uploads[opid];
+ delete window.active_uploads[opid];
},
// error
error: async function(err){
$(upload_progress_window).close();
// UIAlert(err?.message ?? 'An error occurred while uploading.');
// remove from active_uploads
- delete active_uploads[opid];
+ delete window.active_uploads[opid];
},
// abort
abort: async function(operation_id){
// console.log('upload aborted');
// remove from active_uploads
- delete active_uploads[opid];
+ delete window.active_uploads[opid];
}
}
);
@@ -2763,13 +2769,13 @@ window.empty_trash = async function(){
// only show progress window if it takes longer than 500ms to create folder
let init_ts = Date.now();
let progwin;
- let op_id = uuidv4();
+ let op_id = window.uuidv4();
let progwin_timeout = setTimeout(async () => {
progwin = await UIWindowProgressEmptyTrash({operation_id: op_id});
}, 500);
await puter.fs.delete({
- paths: trash_path,
+ paths: window.trash_path,
descendantsOnly: true,
recursive: true,
success: async function (resp){
@@ -2779,24 +2785,24 @@ window.empty_trash = async function(){
}
// use the 'empty trash' icon for Trash
$(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash.svg']);
- $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
- $(`.window[data-path="${trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
+ $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']);
+ $(`.window[data-path="${window.trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']);
// remove all items with trash paths
// todo this has to be case-insensitive but the `i` selector doesn't work on ^=
- $(`.item[data-path^="${trash_path}/"]`).removeItems();
+ $(`.item[data-path^="${window.trash_path}/"]`).removeItems();
// update the footer item count for Trash
- update_explorer_footer_item_count($(`.window[data-path="${trash_path}"]`))
+ window. update_explorer_footer_item_count($(`.window[data-path="${window.trash_path}"]`))
// close progress window
clearTimeout(progwin_timeout);
setTimeout(() => {
$(progwin).close();
- }, Math.max(0, copy_progress_hide_delay - (Date.now() - init_ts)));
+ }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - init_ts)));
},
error: async function (err){
clearTimeout(progwin_timeout);
setTimeout(() => {
$(progwin).close();
- }, Math.max(0, copy_progress_hide_delay - (Date.now() - init_ts)));
+ }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - init_ts)));
}
});
}
@@ -2812,10 +2818,10 @@ window.copy_to_clipboard = async function(text){
}
window.getUsage = () => {
- return fetch(api_origin + "/drivers/usage", {
+ return fetch(window.api_origin + "/drivers/usage", {
headers: {
"Content-Type": "application/json",
- "Authorization": "Bearer " + auth_token
+ "Authorization": "Bearer " + window.auth_token
},
method: "GET"
})
@@ -2988,14 +2994,14 @@ window.zipItems = async function(el_items, targetDirPath, download = true) {
clearTimeout(progwin_timeout);
setTimeout(() => {
$(progwin).close();
- }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts)));
+ }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts)));
})
.catch(function (err) {
// close progress window
clearTimeout(progwin_timeout);
setTimeout(() => {
$(progwin).close();
- }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts)));
+ }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts)));
// handle errors
console.error("Error in zipping files: ", err);
@@ -3063,7 +3069,7 @@ window.unzipItem = async function(itemPath) {
clearTimeout(progwin_timeout);
setTimeout(() => {
$(progwin).close();
- }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts)));
+ }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts)));
}).catch(function (e) {
// UIAlert(e.message);
@@ -3071,7 +3077,7 @@ window.unzipItem = async function(itemPath) {
clearTimeout(progwin_timeout);
setTimeout(() => {
$(progwin).close();
- }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts)));
+ }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts)));
})
}
@@ -3083,7 +3089,7 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
success: async (fsentry)=>{
// Add action to actions_history for undo ability
if (!is_undo)
- actions_history.push({
+ window.actions_history.push({
operation: 'rename',
data: {options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url}
});
@@ -3092,7 +3098,7 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
const old_extension = path.extname(old_name);
const new_extension = path.extname(new_name);
if(old_extension !== new_extension){
- suggest_apps_for_fsentry({
+ window.suggest_apps_for_fsentry({
uid: options.uid,
onSuccess: function(suggested_apps){
options.suggested_apps = suggested_apps;
@@ -3101,14 +3107,14 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
}
// Set new item name
- $(`.item[data-uid='${$(el_item).attr('data-uid')}'] .item-name`).html(html_encode(truncate_filename(new_name, TRUNCATE_LENGTH)).replaceAll(' ', ' '));
+ $(`.item[data-uid='${$(el_item).attr('data-uid')}'] .item-name`).html(html_encode(window.truncate_filename(new_name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' '));
$(el_item_name).show();
// Hide item name editor
$(el_item_name_editor).hide();
// Set new icon
- const new_icon = (options.is_dir ? window.icons['folder.svg'] : (await item_icon(fsentry)).image);
+ const new_icon = (options.is_dir ? window.icons['folder.svg'] : (await window.item_icon(fsentry)).image);
$(el_item_icon).find('.item-icon-icon').attr('src', new_icon);
// Set new data-name
@@ -3147,15 +3153,15 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
// Update the 'Sites Cache'
if($(el_item).attr('data-has_website') === '1')
- await update_sites_cache();
+ await window.update_sites_cache();
// Update website_url
- website_url = determine_website_url(new_path);
+ website_url = window.determine_website_url(new_path);
$(el_item).attr('data-website_url', website_url);
// Update all exact-matching windows
$(`.window-${options.uid}`).each(function(){
- update_window_path(this, options.path);
+ window.update_window_path(this, options.path);
})
// Set new name for corresponding open windows
@@ -3163,12 +3169,12 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
// Re-sort all matching item containers
$(`.item[data-uid='${$(el_item).attr('data-uid')}']`).parent('.item-container').each(function(){
- sort_items(this, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order'));
+ window.sort_items(this, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order'));
})
},
error: function (err){
// reset to old name
- $(el_item_name).text(truncate_filename(options.name, TRUNCATE_LENGTH));
+ $(el_item_name).text(window.truncate_filename(options.name, window.TRUNCATE_LENGTH));
$(el_item_name).show();
// hide item name editor
@@ -3202,28 +3208,28 @@ window.delete_item_with_path = async function(path){
}
window.undo_last_action = async()=>{
- if (actions_history.length > 0) {
- const last_action = actions_history.pop();
+ if (window.actions_history.length > 0) {
+ const last_action = window.actions_history.pop();
// Undo the create file action
if (last_action.operation === 'create_file' || last_action.operation === 'create_folder') {
const lastCreatedItem = last_action.data;
- undo_create_file_or_folder(lastCreatedItem);
+ window.undo_create_file_or_folder(lastCreatedItem);
} else if(last_action.operation === 'rename') {
const {options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url} = last_action.data;
- rename_file(options, old_name, new_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url, true);
+ window.rename_file(options, old_name, new_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url, true);
} else if(last_action.operation === 'upload') {
const files = last_action.data;
- undo_upload(files);
+ window.undo_upload(files);
} else if(last_action.operation === 'copy') {
const files = last_action.data;
- undo_copy(files);
+ window.undo_copy(files);
} else if(last_action.operation === 'move') {
const items = last_action.data;
- undo_move(items);
+ window.undo_move(items);
} else if(last_action.operation === 'delete') {
const items = last_action.data;
- undo_delete(items);
+ window.undo_delete(items);
}
}
}
@@ -3246,23 +3252,23 @@ window.undo_copy = async(files)=>{
window.undo_move = async(items)=>{
for (const item of items) {
- const el = await get_html_element_from_options(item.options);
+ const el = await window.get_html_element_from_options(item.options);
console.log(item.original_path)
- move_items([el], path.dirname(item.original_path), true);
+ window.move_items([el], path.dirname(item.original_path), true);
}
}
window.undo_delete = async(items)=>{
for (const item of items) {
- const el = await get_html_element_from_options(item.options);
+ const el = await window.get_html_element_from_options(item.options);
let metadata = $(el).attr('data-metadata') === '' ? {} : JSON.parse($(el).attr('data-metadata'))
- move_items([el], path.dirname(metadata.original_path), true);
+ window.move_items([el], path.dirname(metadata.original_path), true);
}
}
window.get_html_element_from_options = async function(options){
- const item_id = global_element_id++;
+ const item_id = window.global_element_id++;
options.disabled = options.disabled ?? false;
options.visible = options.visible ?? 'visible'; // one of 'visible', 'revealed', 'hidden'
@@ -3279,7 +3285,7 @@ window.get_html_element_from_options = async function(options){
options.sort_container_after_append = (options.sort_container_after_append !== undefined ? options.sort_container_after_append : false);
const is_shared_with_me = (options.path !== '/'+window.user.username && !options.path.startsWith('/'+window.user.username+'/'));
- let website_url = determine_website_url(options.path);
+ let website_url = window.determine_website_url(options.path);
// do a quick check to see if the target parent has any file type restrictions
const appendto_allowed_file_types = $(options.appendTo).attr('data-allowed_file_types')
@@ -3321,7 +3327,7 @@ window.get_html_element_from_options = async function(options){
h += `
`;
// size
h += `${i18n('signing_in')}
`
h += ``;
- h += `
`
- for (let index = 0; index < logged_in_users.length; index++) {
- const l_user = logged_in_users[index];
+ h += `
`
+ for (let index = 0; index < window.logged_in_users.length; index++) {
+ const l_user = window.logged_in_users[index];
h += `
`;
@@ -131,14 +131,14 @@ async function UIWindowSessionList(options){
let selected_uuid = $(this).attr('data-uuid');
let selected_user;
for (let index = 0; index < window.logged_in_users.length; index++) {
- const l_user = logged_in_users[index];
+ const l_user = window.logged_in_users[index];
if(l_user.uuid === selected_uuid){
selected_user = l_user;
}
}
// new logged in user
- update_auth_data(selected_user.auth_token, selected_user);
+ window.update_auth_data(selected_user.auth_token, selected_user);
if(options.reload_on_success){
// disable native browser exit confirmation
window.onbeforeunload = null;
diff --git a/src/UI/UIWindowSignup.js b/src/UI/UIWindowSignup.js
index 956a90e1e..292f2cb9d 100644
--- a/src/UI/UIWindowSignup.js
+++ b/src/UI/UIWindowSignup.js
@@ -151,7 +151,7 @@ function UIWindowSignup(options){
return;
}
// must be a valid email
- else if(!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;
@@ -167,7 +167,7 @@ function UIWindowSignup(options){
return;
}
// check password strength
- const pass_strength = check_password_strength(password);
+ const pass_strength = window.check_password_strength(password);
if(!pass_strength.overallPass){
$(el_window).find('.signup-error-msg').html(i18n('password_strength_error'));
$(el_window).find('.signup-error-msg').fadeIn();
@@ -185,7 +185,7 @@ function UIWindowSignup(options){
headers = window.custom_headers;
$.ajax({
- url: gui_origin + "/signup",
+ url: window.gui_origin + "/signup",
type: 'POST',
async: true,
headers: headers,
@@ -200,7 +200,7 @@ function UIWindowSignup(options){
p102xyzname: p102xyzname,
}),
success: async function (data){
- update_auth_data(data.token, data.user)
+ window.update_auth_data(data.token, data.user)
//send out the login event
if(options.reload_on_success){
diff --git a/src/globals.js b/src/globals.js
index 3860f9219..0effd52c2 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -121,7 +121,7 @@ window.first_visit_animation = false;
window.show_twitter_link = true;
window.animate_window_opening = true;
window.animate_window_closing = true;
-window.desktop_loading_fade_delay = (window.first_visit_ever && first_visit_animation ? 6000 : 1000);
+window.desktop_loading_fade_delay = (window.first_visit_ever && window.first_visit_animation ? 6000 : 1000);
window.watchItems = [];
window.appdata_signatures = {};
window.appCallbackFunctions = [];
diff --git a/src/helpers.js b/src/helpers.js
index f895bac97..0c4521eac 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -36,7 +36,7 @@ import UIWindowDownloadDirProg from './UI/UIWindowDownloadDirProg.js';
import { PROCESS_RUNNING, PortalProcess, PseudoProcess } from "./definitions.js";
window.is_auth = ()=>{
- if(localStorage.getItem("auth_token") === null || auth_token === null)
+ if(localStorage.getItem("auth_token") === null || window.auth_token === null)
return false;
else
return true;
@@ -44,7 +44,7 @@ window.is_auth = ()=>{
window.suggest_apps_for_fsentry = async (options)=>{
let res = await $.ajax({
- url: api_origin + "/suggest_apps",
+ url: window.api_origin + "/suggest_apps",
type: 'POST',
contentType: "application/json",
data: JSON.stringify({
@@ -52,11 +52,11 @@ window.suggest_apps_for_fsentry = async (options)=>{
path: options.path ?? undefined,
}),
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (res){
@@ -196,7 +196,7 @@ window.scrollParentToChild = (parent, child)=>{
window.getItem = async function(options){
return $.ajax({
- url: api_origin + "/getItem",
+ url: window.api_origin + "/getItem",
type: 'POST',
data: JSON.stringify({
key: options.key,
@@ -205,11 +205,11 @@ window.getItem = async function(options){
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (result){
@@ -221,7 +221,7 @@ window.getItem = async function(options){
window.setItem = async function(options){
return $.ajax({
- url: api_origin + "/setItem",
+ url: window.api_origin + "/setItem",
type: 'POST',
data: JSON.stringify({
app: options.app_uid,
@@ -231,11 +231,11 @@ window.setItem = async function(options){
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
statusCode: {
401: function () {
- logout();
+ window.logout();
},
},
success: function (fsentry){
@@ -312,6 +312,7 @@ window.globToRegExp = function (glob, opts) {
reStr += ".";
break;
}
+ // fallthrough
case "[":
case "]":
@@ -319,6 +320,7 @@ window.globToRegExp = function (glob, opts) {
reStr += c;
break;
}
+ // fallthrough
case "{":
if (extended) {
@@ -326,6 +328,7 @@ window.globToRegExp = function (glob, opts) {
reStr += "(";
break;
}
+ // fallthrough
case "}":
if (extended) {
@@ -333,6 +336,7 @@ window.globToRegExp = function (glob, opts) {
reStr += ")";
break;
}
+ // fallthrough
case ",":
if (inGroup) {
@@ -364,7 +368,7 @@ window.globToRegExp = function (glob, opts) {
if (isGlobstar) {
// it's a globstar, so match zero or more path segments
- reStr += "((?:[^/]*(?:\/|$))*)";
+ reStr += "((?:[^/]*(?:/|$))*)";
i++; // move over the "/"
} else {
// it's not a globstar, so only match one path segment
@@ -408,7 +412,7 @@ window.globToRegExp = function (glob, opts) {
window.validate_fsentry_name = function(name){
if(!name)
throw {message: i18n('name_cannot_be_empty')}
- else if(!isString(name))
+ else if(!window.isString(name))
throw {message: i18n('name_must_be_string')}
else if(name.includes('/'))
throw {message: i18n('name_cannot_contain_slash')}
@@ -417,7 +421,7 @@ window.validate_fsentry_name = function(name){
else if(name === '..')
throw {message: i18n('name_cannot_contain_double_period')};
else if(name.length > window.max_item_name_length)
- throw {message: i18n('name_too_long', config.max_item_name_length)}
+ throw {message: i18n('name_too_long', window.max_item_name_length)}
else
return true
}
@@ -516,7 +520,7 @@ window.check_fsentry_against_allowed_file_types_string =function (fsentry, allow
}
// MIME types (e.g. text/plain)
- else if(globToRegExp(allowed_file_type).test(fsentry.type?.toLowerCase())){
+ else if(window.globToRegExp(allowed_file_type).test(fsentry.type?.toLowerCase())){
passes_allowed_file_type_filter = true;
break;
}
@@ -649,11 +653,11 @@ window.refresh_user_data = async (auth_token)=>{
try{
whoami = await puter.os.user();
}catch(e){
-
+ // Ignored
}
// update local user data
if(whoami){
- update_auth_data(auth_token, whoami)
+ window.update_auth_data(auth_token, whoami)
}
}
@@ -675,7 +679,7 @@ window.update_auth_data = (auth_token, user)=>{
localStorage.setItem('user', JSON.stringify(window.user));
// re-initialize the Puter.js objects with the new auth token
- puter.setAuthToken(auth_token, api_origin)
+ puter.setAuthToken(auth_token, window.api_origin)
//update the logged_in_users array entry for this user
if(window.user){
@@ -719,7 +723,7 @@ window.mutate_user_preferences = function(user_preferences_delta) {
puter.kv.set(`user_preferences.${key}`, value);
}
// There may be syncing issues across multiple devices
- update_user_preferences({ ...window.user_preferences, ...user_preferences_delta });
+ window.update_user_preferences({ ...window.user_preferences, ...user_preferences_delta });
}
window.update_user_preferences = function(user_preferences) {
@@ -737,13 +741,13 @@ window.update_user_preferences = function(user_preferences) {
window.sendWindowWillCloseMsg = function(iframe_element) {
return new Promise(function(resolve){
- const msg_id = uuidv4();
+ const msg_id = window.uuidv4();
iframe_element.contentWindow.postMessage({
msg: "windowWillClose",
msg_id: msg_id
}, '*');
//register callback
- appCallbackFunctions[msg_id] = resolve;
+ window.appCallbackFunctions[msg_id] = resolve;
})
}
@@ -786,12 +790,12 @@ window.get_apps = async (app_names, callback)=>{
return [];
let res = await $.ajax({
- url: api_origin + "/apps/"+app_names,
+ url: window.api_origin + "/apps/"+app_names,
type: 'GET',
async: true,
contentType: "application/json",
headers: {
- "Authorization": "Bearer "+auth_token
+ "Authorization": "Bearer "+window.auth_token
},
success: function (res){
}
@@ -858,13 +862,14 @@ window.item_icon = async (fsentry)=>{
// --------------------------------------------------
// If this file is Trashed then set the name to the original name of the file before it was trashed
// --------------------------------------------------
- if(fsentry.path?.startsWith(trash_path + '/')){
+ if(fsentry.path?.startsWith(window.trash_path + '/')){
if(fsentry.metadata){
try{
let metadata = JSON.parse(fsentry.metadata);
fsentry.name = (metadata && metadata.original_name) ? metadata.original_name : fsentry.name
}
catch(e){
+ // Ignored
}
}
}
@@ -886,12 +891,12 @@ window.item_icon = async (fsentry)=>{
// --------------------------------------------------
// Trash
// --------------------------------------------------
- else if(fsentry.shortcut_to_path && fsentry.shortcut_to_path === trash_path){
+ else if(fsentry.shortcut_to_path && fsentry.shortcut_to_path === window.trash_path){
// get trash image, this is needed to get the correct empty vs full trash icon
- let trash_img = $(`.item[data-path="${html_encode(trash_path)}" i] .item-icon-icon`).attr('src')
+ let trash_img = $(`.item[data-path="${html_encode(window.trash_path)}" i] .item-icon-icon`).attr('src')
// if trash_img is undefined that's probably because trash wasn't added anywhere, do a direct lookup to see if trash is empty or no
if(!trash_img){
- let trashstat = await puter.fs.stat(trash_path);
+ let trashstat = await puter.fs.stat(window.trash_path);
if(trashstat.is_empty !== undefined && trashstat.is_empty === true)
trash_img = window.icons['trash.svg'];
else
@@ -904,15 +909,15 @@ window.item_icon = async (fsentry)=>{
// --------------------------------------------------
else if(fsentry.is_dir){
// System Directories
- if(fsentry.path === docs_path)
+ if(fsentry.path === window.docs_path)
return {image: window.icons['folder-documents.svg'], type: 'icon'};
- else if (fsentry.path === pictures_path)
+ else if (fsentry.path === window.pictures_path)
return { image: window.icons['folder-pictures.svg'], type: 'icon' };
- else if (fsentry.path === home_path)
+ else if (fsentry.path === window.home_path)
return { image: window.icons['folder-home.svg'], type: 'icon' };
- else if (fsentry.path === videos_path)
+ else if (fsentry.path === window.videos_path)
return { image: window.icons['folder-videos.svg'], type: 'icon' };
- else if (fsentry.path === desktop_path)
+ else if (fsentry.path === window.desktop_path)
return { image: window.icons['folder-desktop.svg'], type: 'icon' };
// regular directories
else
@@ -1034,11 +1039,11 @@ window.item_icon = async (fsentry)=>{
*/
window.show_save_account_notice_if_needed = function(message){
- getItem({
+ window.getItem({
key: "save_account_notice_shown",
success: async function(value){
if(!value && window.user?.is_temp){
- setItem({key: "save_account_notice_shown", value: true});
+ window.setItem({key: "save_account_notice_shown", value: true});
// Show the notice
setTimeout(async () => {
@@ -1068,6 +1073,7 @@ window.show_save_account_notice_if_needed = function(message){
})
if(alert_resp === 'remind-later'){
+ // TODO
}
if(alert_resp === 'save-session'){
let saved = await UIWindowSaveAccount({
@@ -1085,10 +1091,9 @@ window.show_save_account_notice_if_needed = function(message){
close_on_backdrop_click: false,
}
});
- if(!login_result)
- $('.toolbar').prepend(ht);
+ // FIXME: Report login error.
}
- }, desktop_loading_fade_delay + 1000);
+ }, window.desktop_loading_fade_delay + 1000);
}
}
})
@@ -1147,8 +1152,8 @@ window.create_folder = async(basedir, appendto_element)=>{
let dirname = basedir;
let folder_name = 'New Folder';
- let newfolder_op_id = operation_id++;
- operation_cancelled[newfolder_op_id] = false;
+ let newfolder_op_id = window.operation_id++;
+ window.operation_cancelled[newfolder_op_id] = false;
let newfolder_progress_window_init_ts = Date.now();
let progwin;
@@ -1166,10 +1171,10 @@ window.create_folder = async(basedir, appendto_element)=>{
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){
- activate_item_name_editor(el_created_dir);
+ window.activate_item_name_editor(el_created_dir);
// Add action to actions_history for undo ability
- actions_history.push({
+ window.actions_history.push({
operation: 'create_folder',
data: el_created_dir
});
@@ -1178,13 +1183,13 @@ window.create_folder = async(basedir, appendto_element)=>{
// done
let newfolder_duration = (Date.now() - newfolder_progress_window_init_ts);
- if( progwin && newfolder_duration >= copy_progress_hide_delay){
+ if( progwin && newfolder_duration >= window.copy_progress_hide_delay){
$(progwin).close();
}else if(progwin){
setTimeout(() => {
setTimeout(() => {
$(progwin).close();
- }, Math.abs(copy_progress_hide_delay - newfolder_duration));
+ }, Math.abs(window.copy_progress_hide_delay - newfolder_duration));
})
}
}
@@ -1208,10 +1213,10 @@ window.create_file = async(options)=>{
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){
- activate_item_name_editor(created_file);
+ window.activate_item_name_editor(created_file);
// Add action to actions_history for undo ability
- actions_history.push({
+ window.actions_history.push({
operation: 'create_file',
data: created_file
});
@@ -1242,11 +1247,11 @@ window.create_shortcut = async(filename, is_dir, basedir, appendto_element, shor
}
window.copy_clipboard_items = async function(dest_path, dest_container_element){
- let copy_op_id = operation_id++;
- operation_cancelled[copy_op_id] = false;
+ let copy_op_id = window.operation_id++;
+ window.operation_cancelled[copy_op_id] = false;
// unselect previously selected items in the target container
$(dest_container_element).children('.item-selected').removeClass('item-selected');
- update_explorer_footer_selected_items_count($(dest_container_element).closest('.window'));
+ window.update_explorer_footer_selected_items_count($(dest_container_element).closest('.window'));
let overwrite_all = false;
(async()=>{
@@ -1260,8 +1265,8 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
const copied_item_paths = []
- for(let i=0; i
${i18n('sign_in_with_puter')}
`
- for (let index = 0; index < logged_in_users.length; index++) {
- const l_user = logged_in_users[index];
+ h += `
${i18n('sign_in_with_puter')}
`
+ for (let index = 0; index < window.logged_in_users.length; index++) {
+ const l_user = window.logged_in_users[index];
h += `${l_user.username}
`;
}
h += ``;
- h += `${options.size ? byte_format(options.size) : '-'}`;
+ h += `${options.size ? window.byte_format(options.size) : '-'}`;
h += `
`;
// type
h += ``;
@@ -3378,7 +3384,7 @@ window.get_html_element_from_options = async function(options){
h += `
`;
// name
- h += `${html_encode(truncate_filename(options.name, TRUNCATE_LENGTH)).replaceAll(' ', ' ')}`
+ h += `${html_encode(window.truncate_filename(options.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' ')}`
// name editor
h += ``
h += ``,
onClick: function(){
- create_folder(dirname, append_to_element);
+ window.create_folder(dirname, append_to_element);
}
},
// divider
@@ -45,7 +45,7 @@ const new_context_menu_item = function(dirname, append_to_element){
html: i18n('text_document'),
icon: ``,
onClick: async function(){
- create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.txt'});
+ window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.txt'});
}
},
// HTML Document
@@ -53,7 +53,7 @@ const new_context_menu_item = function(dirname, append_to_element){
html: i18n('html_document'),
icon: ``,
onClick: async function(){
- create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.html'});
+ window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.html'});
}
},
// JPG Image
@@ -67,7 +67,7 @@ const new_context_menu_item = function(dirname, append_to_element){
canvas.height = 600;
canvas.toBlob((blob) =>{
- create_file({dirname: dirname, append_to_element: append_to_element, name: 'New Image.jpg', content: blob});
+ window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New Image.jpg', content: blob});
});
}
},
diff --git a/src/helpers/refresh_item_container.js b/src/helpers/refresh_item_container.js
index d111a04f9..51cb1d755 100644
--- a/src/helpers/refresh_item_container.js
+++ b/src/helpers/refresh_item_container.js
@@ -17,6 +17,7 @@
* along with this program. If not, see