Skip to content

Commit

Permalink
Fix mix use of space and tab (#688)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aisk
aisk authored Dec 22, 2021
1 parent 7dacb11 commit 94a384d
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 40 deletions.
22 changes: 11 additions & 11 deletions jsbits/delegate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ window['delegate'] = function delegate(mountPointElement, events, getVTree) {
for (var event in events) {
mountPointElement.addEventListener(events[event][0], function(e) {
getVTree(function (obj) {
window['delegateEvent'](e, obj, window['buildTargetToElement'](mountPointElement, e.target), []);
window['delegateEvent'](e, obj, window['buildTargetToElement'](mountPointElement, e.target), []);
});
}, events[event][1]);
}
Expand All @@ -57,15 +57,15 @@ window['delegateEvent'] = function delegateEvent (event, obj, stack, parentStack
else {
var eventObj = obj['events'][event.type];
if (eventObj) {
var options = eventObj.options;
var options = eventObj.options;
if (options['preventDefault'])
event.preventDefault();
event.preventDefault();
eventObj['runEvent'](event);
if (!options['stopPropagation'])
window['propogateWhileAble'] (parentStack, event);
window['propogateWhileAble'] (parentStack, event);
} else {
/* still propagate to parent handlers even if event not defined */
window['propogateWhileAble'] (parentStack, event);
/* still propagate to parent handlers even if event not defined */
window['propogateWhileAble'] (parentStack, event);
}
}
};
Expand All @@ -83,7 +83,7 @@ window['propogateWhileAble'] = function propogateWhileAble (parentStack, event)
for (var i = 0; i < parentStack.length; i++) {
if (parentStack[i]['events'][event.type]) {
var eventObj = parentStack[i]['events'][event.type],
options = eventObj['options'];
options = eventObj['options'];
if (options['preventDefault']) event.preventDefault();
eventObj['runEvent'](event);
if (options['stopPropagation']) break;
Expand Down Expand Up @@ -131,10 +131,10 @@ window['objectToJSON'] = function objectToJSON (at, obj) {
function getAllPropertyNames(obj) {
var props = {}, i = 0;
do {
var names = Object.getOwnPropertyNames(obj);
for (i = 0; i < names.length; i++) {
props [names[i]] = null;
}
var names = Object.getOwnPropertyNames(obj);
for (i = 0; i < names.length; i++) {
props [names[i]] = null;
}
} while (obj = Object.getPrototypeOf(obj));
return props;
};
42 changes: 21 additions & 21 deletions jsbits/isomorphic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ window['collapseSiblingTextNodes'] = function collapseSiblingTextNodes(vs) {
var ax = 0, adjusted = vs.length > 0 ? [vs[0]] : [];
for (var ix = 1; ix < vs.length; ix++) {
if (adjusted[ax]['type'] === 'vtext' && vs[ix]['type'] === 'vtext') {
adjusted[ax]['text'] += vs[ix]['text'];
continue;
adjusted[ax]['text'] += vs[ix]['text'];
continue;
}
adjusted[++ax] = vs[ix];
}
Expand All @@ -17,21 +17,21 @@ window['copyDOMIntoVTree'] = function copyDOMIntoVTree(logLevel,mountPoint, vtre
var mountChildIdx = 0, node;
// If script tags are rendered first in body, skip them.
if (!mountPoint) {
if (doc.body.childNodes.length > 0) {
node = doc.body.firstChild;
} else {
node = doc.body.appendChild (doc.createElement('div'));
}
if (doc.body.childNodes.length > 0) {
node = doc.body.firstChild;
} else {
node = doc.body.appendChild (doc.createElement('div'));
}
} else if (mountPoint.childNodes.length === 0) {
node = mountPoint.appendChild (doc.createElement('div'));
node = mountPoint.appendChild (doc.createElement('div'));
} else {
while (mountPoint.childNodes[mountChildIdx] && (mountPoint.childNodes[mountChildIdx].nodeType === Node.TEXT_NODE || mountPoint.childNodes[mountChildIdx].localName === 'script')){
mountChildIdx++;
}
if (!mountPoint.childNodes[mountChildIdx]) {
node = doc.body.appendChild (doc.createElement('div'));
} else {
node = mountPoint.childNodes[mountChildIdx];
while (mountPoint.childNodes[mountChildIdx] && (mountPoint.childNodes[mountChildIdx].nodeType === Node.TEXT_NODE || mountPoint.childNodes[mountChildIdx].localName === 'script')){
mountChildIdx++;
}
if (!mountPoint.childNodes[mountChildIdx]) {
node = doc.body.appendChild (doc.createElement('div'));
} else {
node = mountPoint.childNodes[mountChildIdx];
}
}

Expand Down Expand Up @@ -72,21 +72,21 @@ window['walk'] = function walk(logLevel, vtree, node, doc) {
vdomChild = vtree['children'][i];
domChild = node.childNodes[i];
if (!domChild) {
window['diagnoseError'](logLevel,vdomChild, domChild);
return false;
window['diagnoseError'](logLevel,vdomChild, domChild);
return false;
}
if (vdomChild.type === 'vtext') {
if (domChild.nodeType !== Node.TEXT_NODE) {
window['diagnoseError'](logLevel, vdomChild, domChild);
return false;
}
window['diagnoseError'](logLevel, vdomChild, domChild);
return false;
}

if (vdomChild['text'] === domChild.textContent) {
vdomChild['domRef'] = domChild;
} else {
window['diagnoseError'](logLevel, vdomChild, domChild);
return false;
}
}
} else {
if (domChild.nodeType !== Node.ELEMENT_NODE) return false;
vdomChild['domRef'] = domChild;
Expand Down
16 changes: 8 additions & 8 deletions tests/diff.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function vtextKeyed(txt, key) {
return {
'type': 'vtext',
'text': txt,
'key': key
'key': key
};
}

Expand Down Expand Up @@ -603,7 +603,7 @@ test('Should diff keys properly when keys are prepended', () => {
vnode('div', [vnodeKeyed('div', '1')], {}, {}, "html", null, null, null, null, "key-1");
window['diff'](null, currentNode, body, document)
var newNode =
vnode('div', [vnodeKeyed('div', '2'), vnodeKeyed('div', '1')], {}, {}, "html", null, null, null, null, "key-1");
vnode('div', [vnodeKeyed('div', '2'), vnodeKeyed('div', '1')], {}, {}, "html", null, null, null, null, "key-1");
window['diff'](currentNode, newNode, body, document)
expect(newNode.children.length).toBe(2);
expect(newNode.children.length).toBe(currentNode.children.length);
Expand Down Expand Up @@ -659,8 +659,8 @@ test('Should execute flip-flop case', () => {
expect(currentNode.domRef.children).toEqual(newNode.domRef.children);
expect(currentNode.domRef.childNodes).toEqual(newNode.domRef.childNodes);
for (var i = 0; i < 3; i++) {
expect(currentNode.children[i]).not.toBe(undefined);
expect(newNode.children[i]).not.toBe(undefined);
expect(currentNode.children[i]).not.toBe(undefined);
expect(newNode.children[i]).not.toBe(undefined);
}
});

Expand All @@ -674,13 +674,13 @@ test('Should execute swapped case on 1k nodes', () => {

var newKids = [];
for (var i = 1; i < 1001; i++) {
if (i == 3) {
if (i == 3) {
newKids.push(vnodeKeyed('div', 999))
} else if (i == 999) {
} else if (i == 999) {
newKids.push(vnodeKeyed('div', 3))
} else {
} else {
newKids.push(vnodeKeyed('div', i))
}
}
}
window['diff'](null, currentNode, body, document)
var newNode = vnode('div', newKids, {}, {}, "html", null, null, null, null, "key-1");
Expand Down

0 comments on commit 94a384d

Please sign in to comment.