open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import: don't blindly overwrite styles with same id

Browse Source
This commit is contained in:
tophf 2017-05-15 12:40:35 +03:00
parent ab63f028eb
commit 4df35b829b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backup/fileSaveLoad.js
View File

@ -102,7 +102,8 @@ function importFromString(jsonString) {
item.name = item.name.trim(); item.name = item.name.trim();
const byId = BG.cachedStyles.byId.get(item.id); const byId = BG.cachedStyles.byId.get(item.id);
const byName = oldStylesByName.get(item.name); const byName = oldStylesByName.get(item.name);
const oldStyle = byId && byId.name.trim() == item.name || !byName ? byId : byName; const oldStyle = byId && sameStyle(byId, item) ? byId : byName;
oldStylesByName.delete(item.name);
if (oldStyle == byName && byName) { if (oldStyle == byName && byName) {
item.id = byName.id; item.id = byName.id;
} }
@ -119,6 +120,12 @@ function importFromString(jsonString) {
return {oldStyle, metaEqual, codeEqual}; return {oldStyle, metaEqual, codeEqual};
} }
function sameStyle(oldStyle, newStyle) {
return oldStyle.name.trim() === newStyle.name.trim() ||
['updateUrl', 'originalMd5', 'originalDigest']
.some(field => oldStyle[field] && oldStyle[field] == newStyle[field]);
}
function account({style, info, resolve}) { function account({style, info, resolve}) {
renderQueue.push(style); renderQueue.push(style);
if (performance.now() - lastRenderTime > RENDER_NAP_TIME_MAX if (performance.now() - lastRenderTime > RENDER_NAP_TIME_MAX