github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

unit tests and a couple fixes

Browse Source
This commit is contained in:
David Greenspan
2013-10-29 18:25:18 -07:00
parent b85ae3ccc6
commit c2da2dac1d
3 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/ui/package.js
View File

@@ -37,6 +37,7 @@ Package.on_test(function (api) {
api.add_files([
'base_tests.js',
'render_tests.js',
'domrange_tests.js'
'domrange_tests.js',
'render2_tests.js'
], 'client');
});

33
packages/ui/render2.js
View File

@@ -71,17 +71,19 @@ var sanitizeComment = function (content) {
// For example, check that CharRef has `html` and `str` properties and no content.
// Check that Comment has a single string child and no attributes. Etc.
var materialize = function (node, parentNode, beforeNode) {
beforeNode = beforeNode || null; // for IE
var insert = function (nodeOrRange, parent, before) {
parent.insertBefore(nodeOrRange, before || null); // `null` for IE
};
var materialize = function (node, parent, before) {
if (node && (typeof node === 'object') &&
(typeof node.splice === 'function')) {
// Tag or array
if (node.tagName) {
if (node.tagName === 'CharRef') {
parentNode.insertBefore(document.createTextNode(node.attrs.str), beforeNode);
insert(document.createTextNode(node.attrs.str), parent, before);
} else if (node.tagName === 'Comment') {
parentNode.insertBefore(document.createComment(sanitizeComment(node[0])));
insert(document.createComment(sanitizeComment(node[0])), parent, before);
} else if (node.tagName === 'EmitCode') {
throw new Error("EmitCode node can only be processed by toCode");
} else {
@@ -94,19 +96,19 @@ var materialize = function (node, parentNode, beforeNode) {
_.each(node, function (child) {
materialize(child, elem);
});
parentNode.insertBefore(elem, beforeNode);
insert(elem, parent, before);
}
} else {
// array
_.each(node, function (child) {
materialize(child, parentNode, beforeNode);
materialize(child, parent, before);
});
}
} else if (typeof node === 'string') {
parentNode.insertBefore(document.createTextNode(node), beforeNode);
insert(document.createTextNode(node), parent, before);
} else if (typeof node === 'function') {
// XXX make this reactive...
materialize(node(), parentNode, beforeNode);
materialize(node(), parent, before);
} else if (node == null) {
// null or undefined.
// do nothing.
@@ -130,7 +132,7 @@ var attributeValuePartToQuotedStringPart = function (v) {
var attributeValueToQuotedString = function (v) {
var result = '"';
if (typeof v === 'object' && (typeof v.length === 'number')) {
if (typeof v === 'object' && (typeof v.length === 'number') && ! v.tagName) {
// array
for (var i = 0; i < v.length; i++)
result += attributeValuePartToQuotedStringPart(v[i]);
@@ -150,7 +152,7 @@ var attributeValuePartToString = function (v) {
};
var attributeValueToString = function (v) {
if (typeof v === 'object' && (typeof v.length === 'number')) {
if (typeof v === 'object' && (typeof v.length === 'number') && ! v.tagName) {
// array
var result = '';
for (var i = 0; i < v.length; i++)
@@ -162,7 +164,7 @@ var attributeValueToString = function (v) {
};
var attributeValueToCode = function (v) {
if (typeof v === 'object' && (typeof v.length === 'number')) {
if (typeof v === 'object' && (typeof v.length === 'number') && ! v.tagName) {
// array
var partStrs = [];
for (var i = 0; i < v.length; i++)
@@ -222,10 +224,12 @@ var toHTML = function (node) {
};
var toJSLiteral = function (obj) {
// http://timelessrepo.com/json-isnt-a-javascript-subset
// See <http://timelessrepo.com/json-isnt-a-javascript-subset> for `\u2028\u2029`.
// Also escape Unicode surrogates.
return (JSON.stringify(obj)
.replace(/\u2028/g, '\\u2028')
.replace(/\u2029/g, '\\u2029'));
.replace(/[\u2028\u2029\ud800-\udfff]/g, function (c) {
return '\\u' + ('000' + c.charCodeAt(0).toString(16)).slice(-4);
}));
};
var toCode = function (node) {
@@ -277,6 +281,7 @@ var toCode = function (node) {
return result;
};
// XXX we're just exposing these for now
UI.materialize = materialize;
UI.toHTML = toHTML;
UI.toCode = toCode;

45
packages/ui/render2_tests.js Normal file
View File

@@ -0,0 +1,45 @@
Tinytest.add("ui - render2", function (test) {
var run = function (input, expectedInnerHTML, expectedHTML, expectedCode) {
var div = document.createElement("DIV");
UI.materialize(input, div);
test.equal(canonicalizeHtml(div.innerHTML), expectedInnerHTML);
test.equal(UI.toHTML(input), expectedHTML);
test.equal(UI.toCode(input), expectedCode);
};
var P = UI.Tag.P;
var CharRef = UI.Tag.CharRef;
var DIV = UI.Tag.DIV;
var Comment = UI.Tag.Comment;
run(P('Hello'),
'<p>Hello</p>',
'<p>Hello</p>',
'UI.Tag.P("Hello")');
// Test crazy character references
// `&zopf;` is "Mathematical double-struck small z" a.k.a. "open-face z"
run(P(CharRef({html: '&zopf;', str: '\ud835\udd6b'})),
'<p>\ud835\udd6b</p>',
'<p>&zopf;</p>',
'UI.Tag.P(UI.Tag.CharRef({html: "&zopf;", str: "\\ud835\\udd6b"}))');
run(P({id: CharRef({html: '&zopf;', str: '\ud835\udd6b'})}, 'Hello'),
'<p id="\ud835\udd6b">Hello</p>',
'<p id="&zopf;">Hello</p>',
'UI.Tag.P({id: UI.Tag.CharRef({html: "&zopf;", str: "\\ud835\\udd6b"})}, "Hello")');
run(P({id: [CharRef({html: '&zopf;', str: '\ud835\udd6b'}), '!']}, 'Hello'),
'<p id="\ud835\udd6b!">Hello</p>',
'<p id="&zopf;!">Hello</p>',
'UI.Tag.P({id: [UI.Tag.CharRef({html: "&zopf;", str: "\\ud835\\udd6b"}), "!"]}, "Hello")');
// Test comments
run(DIV(Comment('Test')),
'<div><!----></div>', // our innerHTML-canonicalization function kills comment contents
'<div><!--Test--></div>',
'UI.Tag.DIV(UI.Tag.Comment("Test"))');
});