9 files changed, 11 insertions, 10 deletions
diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php
index a371ab0c8..89612ef1b 100644
--- a/views/default/core/account/login_box.php
+++ b/views/default/core/account/login_box.php
@@ -20,6 +20,7 @@ if (elgg_get_config('https_login')) {
 		echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
 	?>
 </div>
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	$(document).ready(function() { $('input[name=username]').focus(); });
 </script>
diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index fd01b4711..aa67c6756 100644
--- a/views/default/core/account/login_dropdown.php
+++ b/views/default/core/account/login_dropdown.php
@@ -26,7 +26,7 @@ if (elgg_get_config('https_login')) {
 		<?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login")); ?>
 	</fieldset>
 </div>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 $(document).ready(function() {
 
diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php
index c6eaf4f19..0caaa3101 100644
--- a/views/default/core/account/login_walled_garden.php
+++ b/views/default/core/account/login_walled_garden.php
@@ -52,7 +52,7 @@ __HTML;
 			));
 		?>
 </div><div id="hiddenform_bottom"></div></div>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript"> 
 $(document).ready(function() {
 	$('input.username').focus();
diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php
index bfe88a166..8d4e52e8a 100644
--- a/views/default/core/friends/collection.php
+++ b/views/default/core/friends/collection.php
@@ -39,7 +39,7 @@ if ($friends = $vars['collection']->entities) {
 
 	echo elgg_view('core/friends/picker', array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker']));
 	?>
-
+<?php //@todo JS 1.8: no ?>
 	<script type="text/javascript">
 	$(document).ready(function () {
 
diff --git a/views/default/core/friends/collections.php b/views/default/core/friends/collections.php
index 6554059b1..5a052b121 100644
--- a/views/default/core/friends/collections.php
+++ b/views/default/core/friends/collections.php
@@ -29,7 +29,7 @@ if (is_array($vars['collections']) && sizeof($vars['collections'])) {
 }
 
 ?>
-
+<?php //@todo JS 1.8: no ?>
 <script>
 $(document).ready(function(){
 	$('#friends_collections_accordian h2').click(function () {
diff --git a/views/default/core/friends/collectiontabs.php b/views/default/core/friends/collectiontabs.php
index c8d0deb67..168d2cdfb 100644
--- a/views/default/core/friends/collectiontabs.php
+++ b/views/default/core/friends/collectiontabs.php
@@ -21,10 +21,10 @@ $ownerid = $vars['owner']->getGUID();
 <li class="selected"><a href="#" class="collectionmembers<?php echo $friendspicker; ?>"><?php echo elgg_echo('friends:collections:members'); ?></a></li>
 
 <li><a href="#" class="editmembers<?php echo $friendspicker; ?>"><?php echo elgg_echo('friends:collections:edit'); ?></a></li>
- 	
+	
 </ul>
 </div>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 $(document).ready(function () {
 
diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php
index 2344d7d94..2d5976540 100644
--- a/views/default/core/friends/picker.php
+++ b/views/default/core/friends/picker.php
@@ -118,7 +118,7 @@ if (!$callback) {
 if (!isset($vars['replacement'])) {
 	if ($formtarget) {
 ?>
-
+<?php //@todo JS 1.8: no ?>
 <script language="text/javascript">
 		$(function() { // onload...do
 		$('#collectionMembersForm<?php echo $friendspicker; ?>').submit(function() {
@@ -302,7 +302,7 @@ if (!$callback) {
 
 if (!isset($vars['replacement'])) {
 ?>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	// initialise picker
 	$("div#friends-picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
diff --git a/views/default/core/friends/tablelistcountupdate.php b/views/default/core/friends/tablelistcountupdate.php
index 8e2ab637d..7a0da1caa 100644
--- a/views/default/core/friends/tablelistcountupdate.php
+++ b/views/default/core/friends/tablelistcountupdate.php
@@ -11,7 +11,7 @@
  */
 
 ?>
-
+<?php //@todo JS 1.8: no ?>
 <script language="text/javascript">
 	$("#friends_membership_count<?php echo $vars['friendspicker']; ?>").html("<?php echo $vars['count']; ?>");
 </script>
 \ No newline at end of file
diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php
index 94956a0fb..74af9969b 100644
--- a/views/default/core/river/filter.php
+++ b/views/default/core/river/filter.php
@@ -33,7 +33,7 @@ if ($selector) {
 }
 echo elgg_view('input/dropdown', $params);
 ?>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 $(document).ready(function() {
 	$('#elgg-river-selector').change(function() {