Author: pyaschenko Date: 2010-04-23 13:35:13 -0400 (Fri, 23 Apr 2010) New Revision: 16803 Modified: root/framework/trunk/impl/src/test/resources/javascript/jquery-position-qunit.js root/framework/trunk/impl/src/test/resources/javascript/richfaces-qunit.js Log: jquery position plugin qunits refactoring Modified: root/framework/trunk/impl/src/test/resources/javascript/jquery-position-qunit.js =================================================================== --- root/framework/trunk/impl/src/test/resources/javascript/jquery-position-qunit.js 2010-04-23 17:33:25 UTC (rev 16802) +++ root/framework/trunk/impl/src/test/resources/javascript/jquery-position-qunit.js 2010-04-23 17:35:13 UTC (rev 16803) @@ -3,25 +3,6 @@ var body = document.getElementsByTagName("body")[0]; - function appendDomElements(parent, html) { - var element = document.createElement("div"); - element.innerHTML = html; - var elements = [], e; - while (e = element.firstChild) { - elements.push(e); - parent.appendChild(e); - } - return elements; - } - - function removeDomElements(elements) { - var element; - while (elements.length>0) { - element = elements.pop(); - element.parentNode.removeChild(element); - } - } - function testPositioning(element, left, top, comment) { equals(element.style.left, left+"px", comment); equals(element.style.top, top+"px", comment); @@ -42,7 +23,7 @@ try { - var elements = appendDomElements(body, '<div style="position:absolute; width:200px; height:200px; background-color:red" id="testElement">some text</div><div style="width:300px; height:300px; background-color:blue" id="testElement1">some text</div>'); + var elements = RichFaces.QUnit.appendDomElements(body, '<div style="position:absolute; width:200px; height:200px; background-color:red" id="testElement">some text</div><div style="width:300px; height:300px; background-color:blue" id="testElement1">some text</div>'); var e = document.getElementById("testElement"); var e1 = jQuery("#testElement1"); @@ -72,7 +53,7 @@ e.style.left=e.style.top="0px"; } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -87,7 +68,7 @@ try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<form>'+ '<table id="parent" width="100%" cellspacing="0" cellpadding="10" border="1" style="position: relative;">'+ '<tbody>'+ @@ -113,7 +94,7 @@ testPositioning1(e, 300-Math.floor(offset.left), 300-Math.floor(offset.top), 300,300); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -126,7 +107,7 @@ try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<div style="height:350px;overflow-x:hidden;overflow-y:auto;width:300px">'+ '<div style="height:200px"></div>'+ '<table style="position:absolute; background-color:red" id="testElement">'+ @@ -147,7 +128,7 @@ testPositioning(e,500,500); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -156,7 +137,7 @@ expect(4); try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<table width="400" align="center">'+ '<tr>'+ '<td>'+ @@ -174,7 +155,7 @@ testPositioning(e,300,300); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -183,7 +164,7 @@ expect(8); try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<div style="position:absolute; top: 0px; bottom: 0px; left: 0px; right: 0px; overflow: auto;">'+ '<table style="position:absolute; background-color:red" id="testElement">'+ '<tr>'+ @@ -202,7 +183,7 @@ testPositioning(e,500,500); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -211,7 +192,7 @@ expect(8); try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<div style="position:absolute; top: 0px; bottom: 0px; left: 0px; right: 0px; overflow: auto;">'+ '<div>'+ '<table style="position:absolute; background-color:red" id="testElement">'+ @@ -232,7 +213,7 @@ testPositioning(e,500,500); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -242,7 +223,7 @@ try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<div style="position:absolute; width:400px; top: 200px; left: 200px;">'+ '<table style="position:absolute; background-color:red" id="testElement">'+ '<tr>'+ @@ -261,7 +242,7 @@ testPositioning1(e,300,300,500,500); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -271,7 +252,7 @@ try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<div style="position:absolute; width:400px; top: 200px; left: 200px;">'+ '<div>'+ '<table style="position:absolute; background-color:red" id="testElement">'+ @@ -292,7 +273,7 @@ testPositioning1(e,300,300,500,500); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); @@ -301,7 +282,7 @@ try { - var elements = appendDomElements(body, + var elements = RichFaces.QUnit.appendDomElements(body, '<div id="testElement" style="position:absolute; width:400px; height: 400px, top: 200px; left: 200px;">some text</div>'); var e = document.getElementById("testElement"); @@ -309,7 +290,7 @@ testPositioning(e,200,200); } finally { - removeDomElements(elements); + RichFaces.QUnit.removeDomElements(elements); } }); Modified: root/framework/trunk/impl/src/test/resources/javascript/richfaces-qunit.js =================================================================== --- root/framework/trunk/impl/src/test/resources/javascript/richfaces-qunit.js 2010-04-23 17:33:25 UTC (rev 16802) +++ root/framework/trunk/impl/src/test/resources/javascript/richfaces-qunit.js 2010-04-23 17:35:13 UTC (rev 16803) @@ -6,6 +6,23 @@ }; return { + appendDomElements: function (parent, html) { + var element = document.createElement("div"); + element.innerHTML = html; + var elements = [], e; + while (e = element.firstChild) { + elements.push(e); + parent.appendChild(e); + } + return elements; + }, + removeDomElements: function (elements) { + var element; + while (elements.length>0) { + element = elements.pop(); + element.parentNode.removeChild(element); + } + }, run: function (f) { jQuery(document).ready(f); }