You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/05/13 15:46:56 UTC
svn commit: r774365 -
/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js
Author: woonsan
Date: Wed May 13 13:46:56 2009
New Revision: 774365
URL: http://svn.apache.org/viewvc?rev=774365&view=rev
Log:
JS2-1008: Fixing infinite loop problem in javascript by wrong array index usage. Should have used non-index loop.
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js?rev=774365&r1=774364&r2=774365&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/desktop/core.src.js Wed May 13 13:46:56 2009
@@ -572,13 +572,13 @@
{
var headTagElemsByMergeHintArray = headTagElemsByMergeHint[mergeHint];
var lines = childNode.text.split(/\n/);
- for (var i = 0; i < lines.length; i++)
+ for (var j = 0; j < lines.length; j++)
{
var found = false;
- for (var j = 0; j < headTagElemsByMergeHintArray.length; j++)
+ for (var k = 0; k < headTagElemsByMergeHintArray.length; k++)
{
- var existingLine = headTagElemsByMergeHintArray[j].text;
- if (existingLine && existingLine.indexOf(lines[i]) >= 0)
+ var existingLine = headTagElemsByMergeHintArray[k].text;
+ if (existingLine && existingLine.indexOf(lines[j]) >= 0)
{
found = true;
break;
@@ -587,7 +587,7 @@
if (!found)
{
var lastLine = headTagElemsByMergeHintArray[headTagElemsByMergeHintArray.length - 1].text;
- headTagElemsByMergeHintArray[headTagElemsByMergeHintArray.length - 1].text = (lastLine ? lastLine + "\r\n": "") + lines[i];
+ headTagElemsByMergeHintArray[headTagElemsByMergeHintArray.length - 1].text = (lastLine ? lastLine + "\r\n": "") + lines[j];
}
}
}
@@ -595,13 +595,13 @@
{
var headTagElemsByMergeHintArray = headTagElemsByMergeHint[mergeHint];
var lines = childNode.textContent.split(/\n/);
- for (var i = 0; i < lines.length; i++)
+ for (var j = 0; j < lines.length; j++)
{
var found = false;
- for (var j = 0; j < headTagElemsByMergeHintArray.length; j++)
+ for (var k = 0; k < headTagElemsByMergeHintArray.length; k++)
{
- var existingLine = headTagElemsByMergeHintArray[j].textContent;
- if (existingLine && existingLine.indexOf(lines[i]) >= 0)
+ var existingLine = headTagElemsByMergeHintArray[k].textContent;
+ if (existingLine && existingLine.indexOf(lines[j]) >= 0)
{
found = true;
break;
@@ -610,7 +610,7 @@
if (!found)
{
var lastLine = headTagElemsByMergeHintArray[headTagElemsByMergeHintArray.length - 1].textContent;
- headTagElemsByMergeHintArray[headTagElemsByMergeHintArray.length - 1].textContent = (lastLine ? lastLine + "\r\n": "") + lines[i];
+ headTagElemsByMergeHintArray[headTagElemsByMergeHintArray.length - 1].textContent = (lastLine ? lastLine + "\r\n": "") + lines[j];
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org