Skip to content

Commit 5e85c32

Browse files
committed
Move asciiLowerCase to html-tools
1 parent f6c766a commit 5e85c32

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

packages/html-tools/tokenize.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ var getDoctypeQuotedString = function (scanner) {
122122
//
123123
// If `getDocType` sees "<!DOCTYPE" (case-insensitive), it will match or fail fatally.
124124
getDoctype = function (scanner) {
125-
if (HTML.asciiLowerCase(scanner.rest().slice(0, 9)) !== '<!doctype')
125+
if (HTMLTools.asciiLowerCase(scanner.rest().slice(0, 9)) !== '<!doctype')
126126
return null;
127127
var start = scanner.pos;
128128
scanner.pos += 9;
@@ -141,7 +141,7 @@ getDoctype = function (scanner) {
141141
name += ch;
142142
scanner.pos++;
143143
}
144-
name = HTML.asciiLowerCase(name);
144+
name = HTMLTools.asciiLowerCase(name);
145145

146146
// Now we're looking at a space or a `>`.
147147
skipSpaces(scanner);
@@ -154,7 +154,7 @@ getDoctype = function (scanner) {
154154
// but we're not looking at space or `>`.
155155

156156
// this should be "public" or "system".
157-
var publicOrSystem = HTML.asciiLowerCase(scanner.rest().slice(0, 6));
157+
var publicOrSystem = HTMLTools.asciiLowerCase(scanner.rest().slice(0, 6));
158158

159159
if (publicOrSystem === 'system') {
160160
scanner.pos += 6;

packages/html-tools/utils.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11

22
HTMLTools = {};
33

4-
var asciiLowerCase = HTML.asciiLowerCase;
4+
var asciiLowerCase = HTMLTools.asciiLowerCase = function (str) {
5+
return str.replace(/[A-Z]/g, function (c) {
6+
return String.fromCharCode(c.charCodeAt(0) + 32);
7+
});
8+
};
59

610
var svgCamelCaseAttributes = 'attributeName attributeType baseFrequency baseProfile calcMode clipPathUnits contentScriptType contentStyleType diffuseConstant edgeMode externalResourcesRequired filterRes filterUnits glyphRef glyphRef gradientTransform gradientTransform gradientUnits gradientUnits kernelMatrix kernelUnitLength kernelUnitLength kernelUnitLength keyPoints keySplines keyTimes lengthAdjust limitingConeAngle markerHeight markerUnits markerWidth maskContentUnits maskUnits numOctaves pathLength patternContentUnits patternTransform patternUnits pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits refX refY repeatCount repeatDur requiredExtensions requiredFeatures specularConstant specularExponent specularExponent spreadMethod spreadMethod startOffset stdDeviation stitchTiles surfaceScale surfaceScale systemLanguage tableValues targetX targetY textLength textLength viewBox viewTarget xChannelSelector yChannelSelector zoomAndPan'.split(' ');
711

packages/htmljs/htmljs_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ Tinytest.add("htmljs - construction", function (test) {
6969
Tinytest.add("htmljs - utils", function (test) {
7070

7171
test.notEqual("\u00c9".toLowerCase(), "\u00c9");
72-
test.equal(HTML.asciiLowerCase("\u00c9"), "\u00c9");
72+
test.equal(HTMLTools.asciiLowerCase("\u00c9"), "\u00c9");
7373

74-
test.equal(HTML.asciiLowerCase("Hello There"), "hello there");
74+
test.equal(HTMLTools.asciiLowerCase("Hello There"), "hello there");
7575

7676
test.isTrue(HTML.isVoidElement("br"));
7777
test.isFalse(HTML.isVoidElement("div"));

packages/htmljs/package.js

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Package.on_use(function (api) {
1010

1111
Package.on_test(function (api) {
1212
api.use('htmljs');
13+
api.use('html-tools');
1314
api.use('tinytest');
1415
api.use('underscore');
1516
api.add_files(['htmljs_test.js']);

packages/htmljs/utils.js

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ HTML.isNully = function (node) {
1717
return false;
1818
};
1919

20-
HTML.asciiLowerCase = function (str) {
21-
return str.replace(/[A-Z]/g, function (c) {
22-
return String.fromCharCode(c.charCodeAt(0) + 32);
23-
});
24-
};
25-
2620
HTML.escapeData = function (str) {
2721
// string; escape the two special chars in HTML data and RCDATA
2822
return str.replace(/&/g, '&amp;').replace(/</g, '&lt;');

0 commit comments

Comments
 (0)