Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 02:35:49 +00:00
Code Issues Projects Releases Wiki Activity

fix(dom) bug in Firefox with Imagus extension enabled: change getCurrentName to read from data-name instead of title (#313)

Browse source 
Separated out name generation/parsing logic.
Added test case.
This commit is contained in:
Jacob Henry 2021-01-18 13:42:31 -05:00 • committed by coderaiser
parent b6f30d1ccb
commit c057b950c8
9 changed files with 122 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

35
client/dom/current-file.js
View file

@ -1,9 +1,14 @@
/**
* Parse a `data-name` attribute string back into the original filename
* @param attribute The string we wish to decode
*/
'use strict';
/* global DOM */
/* global CloudCmd */
const btoa = require('../../common/btoa');
const {atob, btoa} = require('../../common/base64');
const createElement = require('@cloudcmd/create-element');
const {
@ -41,7 +46,7 @@ module.exports.setCurrentName = (name, current) => {
link.href = dir + encoded;
link.innerHTML = encoded;
current.setAttribute('data-name', 'js-file-' + btoa(encodeURI(name)));
current.setAttribute('data-name', createNameAttribute(name));
CloudCmd.emit('current-file', current);
return link;
@ -58,13 +63,25 @@ module.exports.getCurrentName = (currentFile) => {
if (!current)
return '';
const link = DOM.getCurrentLink(current);
if (!link)
return '';
return decode(link.title)
.replace(NBSP_REG, SPACE);
return parseNameAttribute(current.getAttribute('data-name'));
};
/**
* Generate a `data-name` attribute for the given filename
* @param name The string name to encode
*/
const createNameAttribute = (name) => {
const encoded = btoa(encodeURI(name));
return `js-file-${encoded}`;
};
/**
* Parse a `data-name` attribute string back into the original filename
* @param attribute The string we wish to decode
*/
const parseNameAttribute = (attribute) => {
attribute = attribute.replace('js-file-', '');
return decodeURI(atob(attribute));
};
/**

10
client/dom/current-file.spec.js
View file

@ -54,6 +54,16 @@ test('current-file: setCurrentName: setAttribute: cyrillic', (t) => {
t.end();
});
test('current-file: getCurrentName', (t) => {
const current = create();
current.getAttribute.returns('js-file-Ymlu');
const result = currentFile.getCurrentName(current);
t.equal(result, 'bin');
t.end();
});
test('current-file: emit', (t) => {
const {
DOM,