deblan-mirror/editor.js
deblan-mirror/editor.js
1
0
Fork 0
mirror of https://github.com/codex-team/editor.js synced 2024-05-27 19:12:56 +02:00
Code Issues Projects Releases Wiki Activity

comparison improved

Browse source
This commit is contained in:
Peter Savchenko 2022-05-18 18:53:02 +03:00
parent dfbc53419f
commit 12c1e33d1d
No known key found for this signature in database
GPG key ID: E68306B1AB0F727C
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/block/index.ts
View file

@ -772,7 +772,7 @@ export default class Block extends EventsDispatcher<BlockEvents> {
return toolboxItems.find((item) => {
return Object.entries(item.data)
.some(([propName, propValue]) => {
return blockData[propName] && blockData[propName] === propValue;
return blockData[propName] && _.equals(blockData[propName], propValue);
});
});
}

2
src/components/modules/toolbar/conversion.ts
View file

@ -352,7 +352,7 @@ export default class ConversionToolbar extends Module<ConversionToolbarNodes> {
* @param entry2 - entry to compare with
*/
function isTheSameToolboxEntry(entry1, entry2): boolean {
return entry1.icon + entry1.title === entry2.icon + entry2.title;
return entry1.icon === entry2.icon && entry1.title === entry2.title;
}
this.tools.forEach(tool => {

18
src/components/utils.ts
View file

@ -779,3 +779,21 @@ export const isIosDevice =
window.navigator.platform &&
(/iP(ad|hone|od)/.test(window.navigator.platform) ||
(window.navigator.platform === 'MacIntel' && window.navigator.maxTouchPoints > 1));
/**
* Compares two values with unknown type
*
* @param var1 - value to compare
* @param var2 - value to compare with
* @returns true if they are equal
*/
export function equals(var1: unknown, var2: unknown): boolean {
const isVar1NonPrimitive = Array.isArray(var1) || isObject(var1);
const isVar2NonPrimitive = Array.isArray(var2) || isObject(var2);
if (isVar1NonPrimitive || isVar2NonPrimitive) {
return JSON.stringify(var1) === JSON.stringify(var2);
}
return var1 === var2;
}