Skip to content

Commit 699cea7

Browse files
committed
allow escaping of curlies on server-side html and css files for importing into components
1 parent 433b333 commit 699cea7

File tree

6 files changed

+26
-8
lines changed

6 files changed

+26
-8
lines changed

dist/v-2-10-0/activecss-2-10-0.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/v-2-10-0/activecss-core-dev-2-10-0.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4162,7 +4162,10 @@ const _resolveComponentAcceptedVars = (str, o, varScope, shadowParent) => {
41624162
strObj.ref
41634163
);
41644164

4165-
return _resolveVars(strObj.str, strObj.ref);
4165+
let res = _resolveVars(strObj.str, strObj.ref);
4166+
res = res.replace(/\\{/gm, '{').replace(/\\}/gm, '}');
4167+
4168+
return res;
41664169
};
41674170

41684171
const _renderIt = (o, content, childTree, selfTree) => {
@@ -8590,8 +8593,11 @@ const _resolveAcceptedVars = (val, o, varScope) => {
85908593
strObj.ref
85918594
);
85928595

8596+
let res = _resolveVars(strObj.str, strObj.ref);
8597+
res = res.replace(/\\{/gm, '{').replace(/\\}/gm, '}');
8598+
85938599
// Return the new value.
8594-
return _resolveVars(strObj.str, strObj.ref);
8600+
return res;
85958601
}
85968602
};
85978603

dist/v-2-10-0/activecss-dev-2-10-0.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/v-2-10-0/full-source/prod.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4162,7 +4162,10 @@ const _resolveComponentAcceptedVars = (str, o, varScope, shadowParent) => {
41624162
strObj.ref
41634163
);
41644164

4165-
return _resolveVars(strObj.str, strObj.ref);
4165+
let res = _resolveVars(strObj.str, strObj.ref);
4166+
res = res.replace(/\\{/gm, '{').replace(/\\}/gm, '}');
4167+
4168+
return res;
41664169
};
41674170

41684171
const _renderIt = (o, content, childTree, selfTree) => {
@@ -8590,8 +8593,11 @@ const _resolveAcceptedVars = (val, o, varScope) => {
85908593
strObj.ref
85918594
);
85928595

8596+
let res = _resolveVars(strObj.str, strObj.ref);
8597+
res = res.replace(/\\{/gm, '{').replace(/\\}/gm, '}');
8598+
85938599
// Return the new value.
8594-
return _resolveVars(strObj.str, strObj.ref);
8600+
return res;
85958601
}
85968602
};
85978603

src/core/runtime/_renderCompDomsDo.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,5 +294,8 @@ const _resolveComponentAcceptedVars = (str, o, varScope, shadowParent) => {
294294
strObj.ref
295295
);
296296

297-
return _resolveVars(strObj.str, strObj.ref);
297+
let res = _resolveVars(strObj.str, strObj.ref);
298+
res = res.replace(/\\{/gm, '{').replace(/\\}/gm, '}');
299+
300+
return res;
298301
};

src/core/var-handling/_resolveAjaxVars.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ const _resolveAcceptedVars = (val, o, varScope) => {
5757
strObj.ref
5858
);
5959

60+
let res = _resolveVars(strObj.str, strObj.ref);
61+
res = res.replace(/\\{/gm, '{').replace(/\\}/gm, '}');
62+
6063
// Return the new value.
61-
return _resolveVars(strObj.str, strObj.ref);
64+
return res;
6265
}
6366
};

0 commit comments

Comments
 (0)