Added disapproving @todo's wherever I could find javascript not conforming to 1.8 conventions

git-svn-id: http://code.elgg.org/elgg/trunk@8123 36083f99-b078-4883-b0ff-0f9b5a30f544

16 files changed, 20 insertions, 15 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() {
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 856546020..cceb42e44 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -26,7 +26,7 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 ?>
 <!-- grab the required js for icon cropping -->
 <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.8.min.js"></script>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 
 	// display a preview of the users cropped section
@@ -58,7 +58,7 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 
 	$(document).ready(function() {
 		$('<div id="user-avatar-preview"><img src="<?php echo $master_image; ?>" /></div>').insertAfter($('#user-avatar'));
-        $('<div id="user-avatar-preview-title"><label><?php echo elgg_echo('avatar:preview'); ?></label></div>').insertBefore($('#user-avatar-preview'));
+		$('<div id="user-avatar-preview-title"><label><?php echo elgg_echo('avatar:preview'); ?></label></div>').insertBefore($('#user-avatar-preview'));
 
 		// this produces the coordinates
 		$('#user-avatar').imgAreaSelect({ selectionOpacity: 0, onSelectEnd: selectChange });
diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index b2f4d14f7..c2a23ad8c 100644
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -57,7 +57,7 @@ echo elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' =>
 echo elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode']));
 echo elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register')));
 ?>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	$(document).ready(function() {
 		$('input[name=name]').focus();
diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php
index a235f2cc6..d3823f22b 100644
--- a/views/default/forms/user/requestnewpassword.php
+++ b/views/default/forms/user/requestnewpassword.php
@@ -18,7 +18,7 @@
 <p>
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('request'))); ?>
 </p>
-
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	$(document).ready(function() {
 		$('input[name=username]').focus();
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php
index dbc896982..1b2652c16 100644
--- a/views/default/input/autocomplete.php
+++ b/views/default/input/autocomplete.php
@@ -47,7 +47,7 @@ if (!isset($autocomplete_js_loaded)) {
 <?php
 if (!$autocomplete_js_loaded) {
 	?>
-
+<?php //@todo JS 1.8: no ?>
 	<!-- include autocomplete -->
 	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.autocomplete.min.js"></script>
 	<script type="text/javascript">
@@ -95,6 +95,7 @@ if (!$autocomplete_js_loaded) {
 } else {
 	?>
 	<!-- rebind autocomplete -->
+	<?php //@todo JS 1.8: no ?>
 	<script type="text/javascript">bindAutocomplete();</script>
 	<?php
 }
\ No newline at end of file
diff --git a/views/default/input/datepicker.php b/views/default/input/datepicker.php
index 6e1d1150d..0687f9e31 100644
--- a/views/default/input/datepicker.php
+++ b/views/default/input/datepicker.php
@@ -29,6 +29,7 @@ if ($vars['value'] > 86400) {
 
 ?>
 <input type="text" name="<?php echo $vars['internalname']; ?>" value="<?php echo $val; ?>" />
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	$(document).ready(function() {
 		$('input[type=text][name=<?php echo $cal_name; ?>]').datepicker();
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 7413da6d4..c6ecb1688 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -55,6 +55,7 @@ $json_values = json_encode($values);
 if (!$user_picker_js_sent) {
 ?>
 <!-- User picker JS -->
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.autocomplete.min.js"></script>
 <script type="text/javascript">
 // set up a few required variables
diff --git a/views/installation/install/forms/template.php b/views/installation/install/forms/template.php
index 626bfc6c8..897772dd4 100644
--- a/views/installation/install/forms/template.php
+++ b/views/installation/install/forms/template.php
@@ -30,6 +30,7 @@ $form_body .= elgg_view('input/submit', $submit_params);
 echo $form_body;
 
 ?>
+<?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	var was_submitted = false;
 	function elggCheckFormSubmission() {