Address eslint errors:

* modify .eslintrc w/ globals & rules
* use judgement in deciding bet proj style & eslint recommendation
* make
This commit is contained in:
daviskoh
2015-02-17 21:12:29 -05:00
parent 4dc175dda4
commit 3a6e50db99
9 changed files with 266 additions and 255 deletions

View File

@@ -44,21 +44,22 @@ var layoutTestUtils = (function() {
};
}
var _cachedIframe;
function renderIframe() {
var iframe = document.createElement('iframe');
document.body.appendChild(iframe);
return iframe;
}
var cachedIframe;
function getIframe() {
if (cachedIframe) {
return cachedIframe;
function getIframe(iframe) {
if (_cachedIframe) {
return _cachedIframe;
}
var doc = iframe.contentDocument;
if(doc.readyState === 'complete') {
if (doc.readyState === 'complete') {
var style = document.createElement('style');
style.textContent = (function() {/*
body, div {
@@ -87,7 +88,7 @@ var layoutTestUtils = (function() {
}
*/} + '').slice(15, -4);
doc.head.appendChild(style);
cachedIframe = iframe;
_cachedIframe = iframe;
return iframe;
} else {
setTimeout(getIframe, 0);
@@ -96,7 +97,7 @@ var layoutTestUtils = (function() {
if (typeof window !== 'undefined') {
var iframe = renderIframe();
getIframe();
getIframe(iframe);
}
if (typeof computeLayout === 'function') {
@@ -280,9 +281,12 @@ var layoutTestUtils = (function() {
var isModified = true;
function rec(node) {
var key;
var value;
// Style
for (var key in node.style) {
var value = node.style[key];
for (key in node.style) {
value = node.style[key];
delete node.style[key];
if (isWorking()) {
node.style[key] = value;
@@ -291,8 +295,8 @@ var layoutTestUtils = (function() {
}
}
// Round values
for (var key in node.style) {
var value = node.style[key];
for (key in node.style) {
value = node.style[key];
if (value > 100) {
node.style[key] = Math.round(value / 100) * 100;
} else if (value > 10) {
@@ -310,7 +314,7 @@ var layoutTestUtils = (function() {
}
// Children
for (var i = 0; node.children && i < node.children.length; ++i) {
var value = node.children[i];
value = node.children[i];
node.children.splice(i, 1);
if (isWorking()) {
if (!node.children) {
@@ -366,7 +370,7 @@ var layoutTestUtils = (function() {
var texts = {
small: 'small',
big: 'loooooooooong with space',
big: 'loooooooooong with space'
};
var preDefinedTextSizes = {
@@ -386,7 +390,7 @@ var layoutTestUtils = (function() {
smallHeight: measureTextSizes(texts.small, 0).height,
bigWidth: measureTextSizes(texts.big).width,
bigHeight: measureTextSizes(texts.big, 0).height,
bigMinWidth: measureTextSizes(texts.big, 0).width,
bigMinWidth: measureTextSizes(texts.big, 0).width
};
}
@@ -400,7 +404,7 @@ var layoutTestUtils = (function() {
testNamedLayout('expected-dom', expectedLayout, domLayout);
testNamedLayout('layout-dom', layout, domLayout);
},
testRandomLayout: function(node, i) {
testRandomLayout: function(node) {
expect({node: node, layout: computeCSSLayout(node)})
.toEqual({node: node, layout: computeDOMLayout(node)});
},