aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-11 23:09:33 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-11 23:09:33 +0000
commit767d259bb89a337ec57abeeb8c3ac5c5fc3e9d21 (patch)
treee3229ba658fbc5f38c73b20e9fc43cdb5085451c /mod
parent891739afadddad56b517b7d565458296eeb58c0b (diff)
downloadelgg-767d259bb89a337ec57abeeb8c3ac5c5fc3e9d21.tar.gz
elgg-767d259bb89a337ec57abeeb8c3ac5c5fc3e9d21.tar.bz2
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
Diffstat (limited to 'mod')
-rw-r--r--mod/blog/views/default/js/blog/save_draft.php2
-rw-r--r--mod/bookmarks/views/default/widgets/bookmarks/view.php8
-rw-r--r--mod/defaultwidgets/views/default/defaultwidgets/editor.php51
-rw-r--r--mod/embed/views/default/embed/embed.php1
-rw-r--r--mod/embed/views/default/embed/item/gallery.php2
-rw-r--r--mod/embed/views/default/embed/item/list.php2
-rw-r--r--mod/embed/views/default/embed/metatags.php5
-rw-r--r--mod/embed/views/default/embed/upload/content.php1
-rw-r--r--mod/file/views/default/file/embed_upload.php1
-rw-r--r--mod/groups/views/default/groups/profile/widgets.php4
-rw-r--r--mod/messageboard/views/default/widgets/messageboard/content.php1
-rw-r--r--mod/messages/views/default/forms/messages/process.php1
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/collections.php2
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/forminternals.php32
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/jsfuncs.php2
-rw-r--r--mod/pages/views/default/pages/sidebar/navigation.php2
-rw-r--r--mod/profile/views/default/profile/wrapper.php2
-rw-r--r--mod/thewire/views/default/thewire/forms/add.php11
-rw-r--r--mod/tinymce/views/default/tinymce/init.php2
-rw-r--r--mod/zaudio/views/default/zaudio/audioplayer.php1
20 files changed, 70 insertions, 63 deletions
diff --git a/mod/blog/views/default/js/blog/save_draft.php b/mod/blog/views/default/js/blog/save_draft.php
index 177ecc1df..7f3c3bb12 100644
--- a/mod/blog/views/default/js/blog/save_draft.php
+++ b/mod/blog/views/default/js/blog/save_draft.php
@@ -3,6 +3,8 @@
* Save draft through ajax
*
* @package Blog
+ *
+ * @todo JS 1.8: no. Convert to use elgg.blog.*
*/
?>
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php
index f9bbf5488..6a5c7476a 100644
--- a/mod/bookmarks/views/default/widgets/bookmarks/view.php
+++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php
@@ -1,10 +1,10 @@
-
+<?php //@todo JS 1.8: Remove inline JS, use elgg-toggle ?>
<script type="text/javascript">
$(document).ready(function () {
- $('a.share_more_info').click(function () {
+ $('a.share_more_info').click(function () {
$(this.parentNode).children("[class=share_desc]").slideToggle("fast");
return false;
- });
+ });
}); /* end document ready function */
</script>
@@ -35,7 +35,7 @@ if($shares){
"profile/icon", array(
'entity' => $owner,
'size' => 'tiny',
- )
+ )
);
//get the bookmark title
diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
index 0decde97d..439f36ce4 100644
--- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php
+++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
@@ -7,8 +7,8 @@
* @subpackage Core
*
* Edited version of the widget editor to be used to set default widgets
- *
- **/
+ *
+ **/
// set some defaults
$owner = elgg_get_page_owner_entity();
@@ -45,11 +45,6 @@
}
?>
-<script type="text/javascript">
-$(document).ready(function () {
- //$('div#customise_editpanel').slideToggle("fast");
-});
-</script>
<div id="customise_editpanel" style="visibility:visible;">
@@ -99,24 +94,24 @@ $(document).ready(function () {
<div id="customise_page_view">
<table cellspacing="0">
- <tr>
- <td colspan="2" align="left" valign="top">
-
- <?php
+<tr>
+ <td colspan="2" align="left" valign="top">
+
+ <?php
if (elgg_get_context() == "profile"){
- ?>
- <h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2>
- <div id="profile_box_widgets">
- <p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p>
- </div>
- <?php
+ ?>
+ <h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2>
+ <div id="profile_box_widgets">
+ <p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p>
+ </div>
+ <?php
}
- ?>
-
- </td>
-
-
- <td rowspan="2" align="left" valign="top">
+ ?>
+
+ </td>
+
+
+ <td rowspan="2" align="left" valign="top">
<h2><?php echo elgg_echo("widgets:rightcolumn"); ?></h2>
<div id="rightcolumn_widgets" <?php if (elgg_get_context() == "profile") echo "class=\"long\""; ?>>
<?php
@@ -154,11 +149,11 @@ $(document).ready(function () {
?>
</div>
- </td><!-- /rightcolumn td -->
-
- </tr>
-
- <tr>
+ </td><!-- /rightcolumn td -->
+
+</tr>
+
+<tr>
<td>
<h2><?php echo elgg_echo("widgets:leftcolumn"); ?></h2>
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index e839450da..9b875fdeb 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -123,6 +123,7 @@ if (!$sections) {
echo $content;
?>
+<?php //@todo: JS 1.8: ugly ?>
<script type="text/javascript">
$(document).ready(function() {
var internal_name = '<?php echo addslashes($internal_name); ?>';
diff --git a/mod/embed/views/default/embed/item/gallery.php b/mod/embed/views/default/embed/item/gallery.php
index 52c0966fa..daee8ee94 100644
--- a/mod/embed/views/default/embed/item/gallery.php
+++ b/mod/embed/views/default/embed/item/gallery.php
@@ -47,7 +47,7 @@ $info = htmlentities($title, ENT_QUOTES, 'UTF-8');
$listing = elgg_view('entities/gallery_listing', array('icon' => $icon, 'info' => $info));
-// @todo is this approach better than inline js?
+// @todo JS 1.8: no
echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">$listing</div>";
echo "<script type=\"text/javascript\">
$('#embed_{$item->getGUID()}').data('embed_code', " . json_encode($embed_code) . ");
diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php
index fc5545df0..c5c604854 100644
--- a/mod/embed/views/default/embed/item/list.php
+++ b/mod/embed/views/default/embed/item/list.php
@@ -44,7 +44,7 @@ $icon = "<img src=\"{$item->getIcon($icon_size)}\" />";
$info = "<p class='entity-title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
$info .= "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>";
-// @todo is this approach better than inline js?
+// @todo JS 1.8: is this approach better than inline js?
echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_listing($icon, $info) . '</div>';
echo "<script type=\"text/javascript\">
$('#embed_{$item->getGUID()}').data('embed_code', " . json_encode($embed_code) . ");
diff --git a/mod/embed/views/default/embed/metatags.php b/mod/embed/views/default/embed/metatags.php
index 3c7ab87a9..5ff602362 100644
--- a/mod/embed/views/default/embed/metatags.php
+++ b/mod/embed/views/default/embed/metatags.php
@@ -1,5 +1,6 @@
+ <?php //@todo JS 1.8: no ?>
<script type="text/javascript">
- jQuery(document).ready(function($) {
- $('a[rel*=facebox]').facebox()
+ jQuery(document).ready(function($) {
+ $('a[rel*=facebox]').facebox()
});
</script>
diff --git a/mod/embed/views/default/embed/upload/content.php b/mod/embed/views/default/embed/upload/content.php
index bac8e1393..874ed44b1 100644
--- a/mod/embed/views/default/embed/upload/content.php
+++ b/mod/embed/views/default/embed/upload/content.php
@@ -29,6 +29,7 @@ if ($upload_sections) {
echo $upload_content . "</div>";
?>
+ <?php //@todo: JS 1.8: ugly ?>
<script type="text/javascript">
$(document).ready(function() {
diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
index 229fcd40b..65308cb63 100644
--- a/mod/file/views/default/file/embed_upload.php
+++ b/mod/file/views/default/file/embed_upload.php
@@ -26,6 +26,7 @@ echo elgg_view('input/form', array(
?>
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(document).ready(function() {
// fire off the ajax upload
diff --git a/mod/groups/views/default/groups/profile/widgets.php b/mod/groups/views/default/groups/profile/widgets.php
index b72932ab3..76fa08647 100644
--- a/mod/groups/views/default/groups/profile/widgets.php
+++ b/mod/groups/views/default/groups/profile/widgets.php
@@ -4,7 +4,7 @@
*
* @package ElggGroups
*/
-
+
// tools widget area
echo "<div id='group_tools_latest' class='clearfix'>";
@@ -13,6 +13,8 @@ echo "<div id='group_tools_latest' class='clearfix'>";
echo "</div>";
?>
+
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(document).ready(function () { // subclass every other group tool widget
$('#group_tools_latest').find('.group_tool_widget:odd').addClass('odd');
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index a81a99b44..45d4426a2 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -19,6 +19,7 @@ if (isset($vars['entity']->num_display)) {
//Just the loggedin user can post messages
if (elgg_is_logged_in()) {
?>
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(document).ready(function(){
diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 6c7c07ee6..7b3cd1a9e 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -32,6 +32,7 @@ echo elgg_view('input/button', array(
echo '</div>';
?>
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(document).ready(function() {
$("#messages-toggle").click(function() {
diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index 765998e0e..8daae6f4f 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -1,4 +1,4 @@
-
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
function setCollection(members, method, id) {
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index c8989be26..98ca1ccb5 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -118,7 +118,7 @@ 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() {
@@ -133,13 +133,13 @@ if (!isset($vars['replacement'])) {
data: inputs.join('&'),
url: this.action,
success: function(){
- $('a.collectionmembers<?php echo $friendspicker; ?>').click();
- }
+ $('a.collectionmembers<?php echo $friendspicker; ?>').click();
+ }
});
return false;
- })
- })
+ })
+ })
</script>
@@ -173,8 +173,8 @@ if (!isset($vars['replacement'])) {
?>
<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
- <tr>
- <td>&nbsp;</td>
+<tr>
+ <td>&nbsp;</td>
<?php
$i = 0;
foreach($NOTIFICATION_HANDLERS as $method => $foo) {
@@ -187,8 +187,8 @@ if (!isset($vars['replacement'])) {
$i++;
}
?>
- <td>&nbsp;</td>
- </tr>
+ <td>&nbsp;</td>
+</tr>
<?php
@@ -222,8 +222,8 @@ END;
}
?>
- <tr>
- <td class="namefield">
+<tr>
+ <td class="namefield">
<a href="<?php echo $friend->getURL(); ?>">
<?php
echo elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true));
@@ -233,11 +233,11 @@ END;
<a href="<?php echo $friend->getURL(); ?>"><?php echo $friend->name ?></a>
</p>
</td>
-
+
<?php echo $fields; ?>
-
- <td>&nbsp;</td>
- </tr>
+
+<td>&nbsp;</td>
+</tr>
<?php
@@ -288,7 +288,7 @@ if (!$callback) {
<?php
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/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php b/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
index d94edf9ef..ace622581 100644
--- a/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
+++ b/mod/notifications/views/default/notifications/subscriptions/jsfuncs.php
@@ -3,7 +3,7 @@
global $NOTIFICATION_HANDLERS;
?>
-
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(document).ready(function () {
diff --git a/mod/pages/views/default/pages/sidebar/navigation.php b/mod/pages/views/default/pages/sidebar/navigation.php
index d38f4096c..cbf21c058 100644
--- a/mod/pages/views/default/pages/sidebar/navigation.php
+++ b/mod/pages/views/default/pages/sidebar/navigation.php
@@ -25,7 +25,7 @@ echo elgg_view('layout/objects/module', array(
'class' => 'elgg-module-aside',
));
-?>
+?><?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(document).ready(function() {
$(".pages-nav").treeview({
diff --git a/mod/profile/views/default/profile/wrapper.php b/mod/profile/views/default/profile/wrapper.php
index 88e1cd22f..1c27ec05a 100644
--- a/mod/profile/views/default/profile/wrapper.php
+++ b/mod/profile/views/default/profile/wrapper.php
@@ -10,7 +10,7 @@
<?php echo elgg_view('profile/details'); ?>
</div>
</div>
-
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(document).ready(function() {
$('#elgg-widget-col-1').css('min-height', $('.profile').outerHeight(true));
diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php
index 3b3519e40..3ad968b3b 100644
--- a/mod/thewire/views/default/thewire/forms/add.php
+++ b/mod/thewire/views/default/thewire/forms/add.php
@@ -13,15 +13,16 @@
?>
<div class="new_wire_post clearfix">
<h3><?php echo elgg_echo("thewire:doing"); ?></h3>
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/thewire/views/default/thewire/scripts/counter.js"></script>
<form action="<?php echo elgg_get_site_url(); ?>action/thewire/add" method="post" name="new_post">
<?php
$action_txt = elgg_echo('post');
- $display .= "<textarea name='new_post_textarea' value='' onKeyDown=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\" onKeyUp=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\">{$msg}</textarea>";
- $display .= "<input type='submit' class='elgg-button-action' value='{$action_txt}' />";
- $display .= "<div class='character_count'><input readonly type=\"text\" name=\"remLen1\" size=\"3\" maxlength=\"3\" value=\"140\">";
- echo $display;
- echo elgg_echo("thewire:charleft") . "</div>";
+ $display .= "<textarea name='new_post_textarea' value='' onKeyDown=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\" onKeyUp=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\">{$msg}</textarea>";
+ $display .= "<input type='submit' class='elgg-button-action' value='{$action_txt}' />";
+ $display .= "<div class='character_count'><input readonly type=\"text\" name=\"remLen1\" size=\"3\" maxlength=\"3\" value=\"140\">";
+ echo $display;
+ echo elgg_echo("thewire:charleft") . "</div>";
echo elgg_view('input/securitytoken');
?>
<input type="hidden" name="method" value="site" />
diff --git a/mod/tinymce/views/default/tinymce/init.php b/mod/tinymce/views/default/tinymce/init.php
index 6282fa0f6..7064709d6 100644
--- a/mod/tinymce/views/default/tinymce/init.php
+++ b/mod/tinymce/views/default/tinymce/init.php
@@ -6,7 +6,7 @@
* http://tinymce.moxiecode.com/wiki.php/Configuration
*/
?>
-
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
tinyMCE.init({
mode : "specific_textareas",
diff --git a/mod/zaudio/views/default/zaudio/audioplayer.php b/mod/zaudio/views/default/zaudio/audioplayer.php
index f46d15e2c..2708f4cec 100644
--- a/mod/zaudio/views/default/zaudio/audioplayer.php
+++ b/mod/zaudio/views/default/zaudio/audioplayer.php
@@ -11,6 +11,7 @@ $swf_url = elgg_get_site_url() . 'mod/zaudio/audioplayer/player.swf';
$mp3_url = elgg_get_site_url() . "mod/file/download.php?file_guid={$vars['file_guid']}";
?>
+<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
AudioPlayer.setup("<?php echo $swf_url; ?>", {width: 290});
</script>