Skip to content

Commit 3bea72b

Browse files
committed
add test, do some drive-by tidying
1 parent 49da40b commit 3bea72b

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

packages/svelte/src/internal/server/index.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -269,23 +269,27 @@ export function add_styles(style_object) {
269269
*/
270270
export function merge_styles(style_attribute, style_directive) {
271271
/** @type {Record<string, string>} */
272-
const style_object = {};
273-
for (const individual_style of (style_attribute ?? '').split(';')) {
274-
const colon_index = individual_style.indexOf(':');
275-
const name = individual_style.slice(0, colon_index).trim();
276-
const value = individual_style.slice(colon_index + 1).trim();
277-
if (!name) continue;
278-
style_object[name] = value;
272+
var merged = {};
273+
274+
if (style_attribute) {
275+
for (var individual_style of style_attribute.split(';')) {
276+
var colon_index = individual_style.indexOf(':');
277+
var name = individual_style.slice(0, colon_index).trim();
278+
var value = individual_style.slice(colon_index + 1).trim();
279+
if (name) merged[name] = value;
280+
}
279281
}
280-
for (const name in style_directive) {
281-
const value = style_directive[name];
282+
283+
for (var name in style_directive) {
284+
var value = style_directive[name];
282285
if (value) {
283-
style_object[name] = value;
286+
merged[name] = value;
284287
} else {
285-
delete style_object[name];
288+
delete merged[name];
286289
}
287290
}
288-
return style_object;
291+
292+
return merged;
289293
}
290294

291295
/**
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { ok, test } from '../../test';
2+
3+
export default test({
4+
html: `
5+
<p style="color: red;">red</p>
6+
`
7+
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<p style:color="red" style={null}>red</p>

0 commit comments

Comments
 (0)