mirror/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-05-03 21:51:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix html encode/decode issue in item rename

Browse Source
This commit is contained in:
Nariman Jelveh
2024-06-13 11:46:54 -07:00
parent cf08244b6f
commit cb60759687
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/UI/UIItem.js
+6 -1
View File
@@ -649,7 +649,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).replaceAll(' ', ' '));
$(el_item_name).html(html_encode(truncate_filename(options.name)).replaceAll(' ', ' '));
$(el_item_name).show();
$(el_item_name_editor).val($(el_item).attr('data-name'));
$(el_item_name_editor).hide();
@@ -1540,6 +1540,11 @@ window.activate_item_name_editor= function(el_item){
$(el_item_name_editor).focus();
$(el_item_name_editor).addClass('item-name-editor-active');
// html-decode the content of the item name editor, this is necessary because the item name is html-encoded when displayed
// but the item name editor is not html-encoded. If we remove this line, the item name editor will display the html-encoded
// version of the item name after a successful name edit.
$(el_item_name_editor).val(html_decode($(el_item_name_editor).val()));
// select all text before extension
const item_name = $(el_item).attr('data-name');
const is_dir = parseInt($(el_item).attr('data-is_dir'));
src/helpers.js
+6 -6
View File
@@ -3143,21 +3143,21 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
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
// Set new `data-name`
options.name = new_name;
$(el_item).attr('data-name', html_encode(new_name));
$(`.item[data-uid='${$(el_item).attr('data-uid')}']`).attr('data-name', html_encode(new_name));
$(`.window-${options.uid}`).attr('data-name', html_encode(new_name));
// Set new title attribute
// Set new `title` attribute
$(`.item[data-uid='${$(el_item).attr('data-uid')}']`).attr('title', html_encode(new_name));
$(`.window-${options.uid}`).attr('title', html_encode(new_name));
// Set new value for item-name-editor
// Set new value for `item-name-editor`
$(`.item[data-uid='${$(el_item).attr('data-uid')}'] .item-name-editor`).val(html_encode(new_name));
$(`.item[data-uid='${$(el_item).attr('data-uid')}'] .item-name`).attr('title', html_encode(new_name));
// Set new data-path
// Set new `data-path` attribute
options.path = path.join( path.dirname(options.path), options.name);
const new_path = options.path;
$(el_item).attr('data-path', new_path);
@@ -3171,7 +3171,7 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
$(this).text(new_name);
});
// Update the paths of all elements whose paths start with old_path
// Update the paths of all elements whose paths start with `old_path`
$(`[data-path^="${html_encode(old_path) + '/'}"]`).each(function(){
const new_el_path = _.replace($(this).attr('data-path'), old_path + '/', new_path+'/');
$(this).attr('data-path', new_el_path);
@@ -3181,7 +3181,7 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it
if($(el_item).attr('data-has_website') === '1')
await window.update_sites_cache();
// Update website_url
// Update `website_url`
website_url = window.determine_website_url(new_path);
$(el_item).attr('data-website_url', website_url);