From cdc96b0c7d87b3db7a8192b62ffb95044a24434f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Feb 2010 10:51:35 +0000
Subject: [PATCH] Bug #58085 - Add terminating semicolons to JavaScript code
 found by JSLint. Patch by nn-

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10539 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/editor.js                  |  4 ++--
 phpBB/docs/CHANGELOG.html                  |  1 +
 phpBB/styles/prosilver/template/editor.js  | 10 +++++-----
 phpBB/styles/subsilver2/template/editor.js |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index cd4e75f51f..7e3ce1c708 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -152,7 +152,7 @@ function insert_text(text, spaces, popup)
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
 
-		mozWrap(textarea, text, '')
+		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
 	}	
@@ -269,7 +269,7 @@ function mozWrap(txtarea, open, close)
 	}
 
 	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
+	var s2 = (txtarea.value).substring(selStart, selEnd);
 	var s3 = (txtarea.value).substring(selEnd, selLength);
 
 	txtarea.value = s1 + open + s2 + close + s3;
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 8829f0abfe..4e9adaa1f9 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -96,6 +96,7 @@
 		<li>[Fix] Honor minimum and maximum password length in generated passwords as much as we can. (Bug #13181)</li>
 		<li>[Fix] No longer return the character O in generated random strings and passwords. (Bug #57345)</li>
 		<li>[Fix] Allow redirect() function to redirect across directories. (Bug #56965)</li>
+		<li>[Fix] Add terminating semicolons to JavaScript code. (Bug #58085 - Patch by nn-)</li>
 		<li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li>
 	</ul>
 
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 98dab5d7c8..9c2691db8d 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -157,7 +157,7 @@ function insert_text(text, spaces, popup)
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
 
-		mozWrap(textarea, text, '')
+		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
 	}
@@ -259,7 +259,7 @@ function addquote(post_id, username)
 			var lines = split_lines(theSelection);
 			for (i = 0; i < lines.length; i++)
 			{
-				insert_text('> ' + lines[i] + '\n')
+				insert_text('> ' + lines[i] + '\n');
 			}
 		}
 	}
@@ -289,7 +289,7 @@ function split_lines(text)
 				if (splitAt == -1)
 				{
 					splitLines[j] = line;
-					j++
+					j++;
 				}
 				else
 				{
@@ -298,7 +298,7 @@ function split_lines(text)
 					j++;
 				}
 			}
-			while(splitAt != -1)
+			while(splitAt != -1);
 		}
 	}
 	return splitLines;
@@ -319,7 +319,7 @@ function mozWrap(txtarea, open, close)
 	}
 
 	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
+	var s2 = (txtarea.value).substring(selStart, selEnd);
 	var s3 = (txtarea.value).substring(selEnd, selLength);
 
 	txtarea.value = s1 + open + s2 + close + s3;
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 0c48c93ad3..2d157caada 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -156,7 +156,7 @@ function insert_text(text, spaces, popup)
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
 
-		mozWrap(textarea, text, '')
+		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
 	}	
@@ -272,7 +272,7 @@ function mozWrap(txtarea, open, close)
 	}
 
 	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd)
+	var s2 = (txtarea.value).substring(selStart, selEnd);
 	var s3 = (txtarea.value).substring(selEnd, selLength);
 
 	txtarea.value = s1 + open + s2 + close + s3;