]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Refs #3016: Removes inline javascript from embed, file, groups, messages, profile...
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 14 Mar 2011 23:54:38 +0000 (23:54 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 14 Mar 2011 23:54:38 +0000 (23:54 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8711 36083f99-b078-4883-b0ff-0f9b5a30f544

20 files changed:
mod/embed/js/embed.js [new file with mode: 0644]
mod/embed/start.php
mod/embed/views/default/embed/embed.php
mod/embed/views/default/embed/js.php
mod/embed/views/default/embed/lightbox_init.php [deleted file]
mod/embed/views/default/embed/upload/content.php
mod/file/views/default/file/embed_upload.php
mod/groups/start.php
mod/groups/views/default/groups/js.php [new file with mode: 0644]
mod/groups/views/default/groups/profile/widgets.php
mod/messages/start.php
mod/messages/views/default/forms/messages/process.php
mod/messages/views/default/forms/messages/reply.php
mod/messages/views/default/messages/js.php [new file with mode: 0644]
mod/profile/start.php
mod/profile/views/default/profile/js.php [new file with mode: 0644]
mod/profile/views/default/profile/wrapper.php
mod/thewire/start.php
mod/thewire/views/default/forms/thewire/add.php
views/default/css/elements/buttons.php

diff --git a/mod/embed/js/embed.js b/mod/embed/js/embed.js
new file mode 100644 (file)
index 0000000..c29083a
--- /dev/null
@@ -0,0 +1,10 @@
+$(function() {
+
+       // change for dropdown
+       $('#embed_upload').live('change', function() {
+               var upload_section = $(this).val();
+               var url = elgg.get_site_url() + 'embed/embed?active_section=upload&active_upload_section=' + upload_section;
+               $('#facebox .body .content').load(url);
+       });
+
+});
\ No newline at end of file
index f5d17b18caf0d5c4062bf37ffc1b4cb73d54fd35..78f06c158883ebac7446dd13e2544f8ad4a39503 100644 (file)
@@ -14,12 +14,14 @@ elgg_register_event_handler('init', 'system', 'embed_init');
 function embed_init() {
        elgg_extend_view('css/elgg', 'embed/css');
        elgg_extend_view('js/elgg', 'embed/js');
-       elgg_extend_view('footer/analytics', 'embed/lightbox_init');
+       elgg_extend_view('js/elgg', 'embed/lightbox_init');
        
        elgg_register_plugin_hook_handler('register', 'menu:longtext', 'embed_longtext_menu');
 
        // Page handler for the modal media embed
        elgg_register_page_handler('embed', 'embed_page_handler');
+       
+       elgg_register_js('elgg.embed', 'mod/embed/js/embed.js', 'footer');
 }
 
 function embed_longtext_menu($hook, $type, $items, $vars) {
index e6416085253431c6761bf30c954b93bdab805bc1..84b005c8c6c8f567d98403c4e2368ed4b96a190e 100644 (file)
@@ -125,7 +125,7 @@ echo $content;
 
 <?php //@todo: JS 1.8: ugly ?>
 <script type="text/javascript">
-$(document).ready(function() {
+$(function() {
        var internal_name = '<?php echo addslashes($internal_name); ?>';
        
        // insert embed codes
@@ -135,7 +135,7 @@ $(document).ready(function() {
        });
 
        // tabs
-       $('.embed_section').click(function() {
+       $('.embed_section').live('click', function() {
                var section = $(this).attr('id');
                var url = elgg.config.wwwroot + 'embed/embed?active_section=' + section + '&internal_name=' + internal_name;
                $('#facebox .body .content').load(url);
@@ -149,9 +149,9 @@ $(document).ready(function() {
                return false;
        }
 
-       $('.pagination-number').click(elggPaginationClick);
-       $('.pagination-next').click(elggPaginationClick);
-       $('.pagination-previous').click(elggPaginationClick);
+       $('.pagination-number').live('click', elggPaginationClick);
+       $('.pagination-next').live('click', elggPaginationClick);
+       $('.pagination-previous').live('click', elggPaginationClick);
 });
 
 </script>
index fc34c24422774b636244c8f85bb6619c60ad914d..f80d7367d14e20c42b2df3dd202af3ee8738fa65 100644 (file)
@@ -6,6 +6,26 @@
  */
 
 ?>
+$(function() { 
+       $('a[rel*=facebox]').facebox();
+
+       // fire off the ajax upload
+       $('#file_embed_upload').submit(function() {
+               var options = {
+                       success: function(data) {
+                               var info = jQuery.parseJSON(data);
+
+                               if (info.status == 'success') {
+                                       $('.popup .content').load(elgg.get_site_url() + 'embed/embed?active_section=file');
+                               } else {
+                                       $('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
+                               }
+                       }
+               };
+               $(this).ajaxSubmit(options);
+               return false;
+       });
+});
 function elggEmbedInsertContent(content, textAreaName) {
        content = ' ' + content + ' ';
        
@@ -33,7 +53,6 @@ function elggEmbedInsertContent(content, textAreaName) {
        $.facebox.close();
 }
 
-
 /*
  * Facebox (for jQuery)
  * version: 1.2 (05/05/2008)
diff --git a/mod/embed/views/default/embed/lightbox_init.php b/mod/embed/views/default/embed/lightbox_init.php
deleted file mode 100644 (file)
index 2c385a5..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-       $(function() { $('a[rel*=facebox]').facebox() });
-</script>
index 5eb9b31a293198d01b44bcb68ce354d8d41e0e86..b7bcc76a07ffdc8129330e677346fa6d1d0dbd08 100644 (file)
@@ -28,21 +28,7 @@ if ($upload_sections) {
 
        echo $upload_content . "</div>";
 
-?>
-       <?php //@todo: JS 1.8: ugly ?>
-       <script type="text/javascript">
-       $(function() {
-
-               // change for dropdown
-               $('#embed_upload').change(function() {
-                       var upload_section = $(this).val();
-                       var url = elgg.get_site_url() + 'embed/embed?active_section=upload&active_upload_section=' + upload_section;
-                       $('#facebox .body .content').load(url);
-               });
-
-       });
-       </script>
-<?php
+       elgg_load_js('elgg.embed');
 
 } else {
        echo elgg_echo('embed:no_upload_sections');
index 9014809c1e224142c43503fd8ac65eff412734a6..e5076b0524ba0535f5b24638fa496849de9f76b8 100644 (file)
@@ -5,26 +5,4 @@
 
 echo elgg_view_form('file/upload', array('id' => 'file_embed_upload'), array('ajax' => TRUE));
 
-?>
 
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-$(document).ready(function() {
-       // fire off the ajax upload
-       $('#file_embed_upload').submit(function() {
-               var options = {
-                       success: function(data) {
-                               var info = jQuery.parseJSON(data);
-
-                               if (info.status == 'success') {
-                                       $('.popup .content').load('<?php echo elgg_get_site_url() . 'embed/embed'; ?>?active_section=file');
-                               } else {
-                                       $('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
-                               }
-                       }
-               };
-               $(this).ajaxSubmit(options);
-               return false;
-       });
-});
-</script>
index 8c3246660e5979c5949e3de0934da0f7a3c04cec..18fb9abd5820d35b6a41893fcb4f8c90dc44715f 100644 (file)
@@ -63,6 +63,7 @@ function groups_init() {
 
        //extend some views
        elgg_extend_view('css/elgg', 'groups/css');
+       elgg_extend_view('js/elgg', 'groups/js');
 
        // Access permissions
        elgg_register_plugin_hook_handler('access:collections:write', 'all', 'groups_write_acl_plugin_hook');
diff --git a/mod/groups/views/default/groups/js.php b/mod/groups/views/default/groups/js.php
new file mode 100644 (file)
index 0000000..df74d52
--- /dev/null
@@ -0,0 +1,3 @@
+$(function() {
+       $('#groups-tools').find('.elgg-module:odd').addClass('odd');
+});
\ No newline at end of file
index 0275035601c942756919a5e63be0deae4ae632dc..28e43fdc46ba08a593a32a923a354dccda2e81ba 100644 (file)
@@ -12,11 +12,4 @@ echo '<div id="groups-tools" class="mtl clearfix">';
 echo elgg_view("groups/tool_latest", array('entity' => $vars['entity']));
 
 echo "</div>";          
-?>
 
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-$(function () { // subclass every other group tool widget
-       $('#groups-tools').find('.elgg-module:odd').addClass('odd');
-});
-</script>       
index 24787ae03a89744d0e06dc6e51d1ae4960e899aa..5c4081a7b203b152e89e525b5a07ec1f1c7d539f 100644 (file)
@@ -49,7 +49,8 @@ function messages_init() {
 
        // Extend system CSS with our own styles, which are defined in the messages/css view
        elgg_extend_view('css/elgg', 'messages/css');
-
+       elgg_extend_view('js/elgg', 'messages/js');
+       
        // Register a page handler, so we can have nice URLs
        elgg_register_page_handler('messages', 'messages_page_handler');
 
index e415a092b40896dffd85ff4a76016a070a3d8c38..8eab262978f8f1ec3aa73f1c0d28f3d5a55b9b50 100644 (file)
@@ -31,13 +31,3 @@ 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() {
-               $('input[type=checkbox]').click();
-       });
-});
-</script>
index 2288f25f4d68170298a845c74405d5d5d93d5586..e8a27f03ec1b0baf5ed90b1b180d0c8085607868 100644 (file)
@@ -35,13 +35,4 @@ echo elgg_view('input/hidden', array(
 </div>
 <div>
        <?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
-</div>
-
-<script type="text/javascript">
-$(document).ready(function() {
-       $("#messages-show-reply").click(function() {
-               $('#messages-reply-form').slideToggle('medium');
-       });
-});
-       
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/mod/messages/views/default/messages/js.php b/mod/messages/views/default/messages/js.php
new file mode 100644 (file)
index 0000000..7ae5f8a
--- /dev/null
@@ -0,0 +1,9 @@
+$(function() {
+       $("#messages-toggle").click(function() {
+               $('input[type=checkbox]').click();
+       });
+       
+       $("#messages-show-reply").click(function() {
+               $('#messages-reply-form').slideToggle('medium');
+       });
+});
\ No newline at end of file
index 9f4e37b6dd62742df2ccdea242d7f1d135e4f98f..2106ee0ac4bcfaa36ca2f7aea1c3f5dda6619e3f 100644 (file)
@@ -31,6 +31,7 @@ function profile_init() {
 
        elgg_extend_view('html_head/extend', 'profile/metatags');
        elgg_extend_view('css/elgg', 'profile/css');
+       elgg_extend_view('js/elgg', 'profile/js');
 
        // allow ECML in parts of the profile
        elgg_register_plugin_hook_handler('get_views', 'ecml', 'profile_ecml_views_hook');
diff --git a/mod/profile/views/default/profile/js.php b/mod/profile/views/default/profile/js.php
new file mode 100644 (file)
index 0000000..edf6854
--- /dev/null
@@ -0,0 +1,3 @@
+elgg.register_hook_handler('init', 'system', function() {
+       $('#elgg-widget-col-1').css('min-height', $('.profile').outerHeight(true) + 1);
+});
\ No newline at end of file
index 7bc0397f81649949de506d6114cadc1e4af73acd..73b7934f2ff067845f549aff72b9138fea8a1c88 100644 (file)
@@ -9,10 +9,4 @@
                <?php echo elgg_view('profile/owner_block'); ?>
                <?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) + 1);
-       });
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
index 1724a33a9a903b6de1566287aa32adfbcc9b7439..c2006ddb01e96f0da958c9a57f86b030dd6ad261 100644 (file)
@@ -20,6 +20,8 @@ function thewire_init() {
        if (!update_subtype('object', 'thewire', 'ElggWire')) {\r
                add_subtype('object', 'thewire', 'ElggWire');\r
        }\r
+       \r
+       elgg_register_js('elgg.thewire', 'mod/thewire/js/thewire.js', 'footer');\r
 \r
        // add a site navigation item\r
        $item = new ElggMenuItem('thewire', elgg_echo('thewire'), 'thewire/all');\r
@@ -261,7 +263,7 @@ function thewire_save_post($text, $userid, $access_id, $parent_guid = 0, $method
        if ($parent_guid) {\r
                $post->addRelationship($parent_guid, 'parent');\r
                \r
-                // name conversation threads by guid of first post (works even if first post deleted)\r
+               // name conversation threads by guid of first post (works even if first post deleted)\r
                $parent_post = get_entity($parent_guid);\r
                $post->wire_thread = $parent_post->wire_thread;\r
        } else {\r
index 956ec7c275d327e41560fc32291e20fcddbd6df3..67585b0df451ee5da30f3bc58b8734085632384c 100644 (file)
@@ -5,6 +5,8 @@
  * @uses $vars['post']
  */
 
+elgg_load_js('elgg.thewire');
+
 $post = elgg_extract('post', $vars);
 
 $text = elgg_echo('post');
@@ -30,37 +32,5 @@ echo elgg_view('input/submit', array(
        'value' => $text,
        'id' => 'thewire-submit-button',
 ));
-
 ?>
-</div>
-<script type="text/javascript">
-
-$(document).ready(function() {
-       $("#thewire-textarea").bind('keydown', function() {
-               textCounter(this, $("#thewire-characters-remaining span"), 140);
-       });
-       $("#thewire-textarea").bind('keyup', function() {
-               textCounter(this, $("#thewire-characters-remaining span"), 140);
-       });
-});
-
-function textCounter(textarea, status, limit) {
-
-       var remaining_chars = limit - textarea.value.length;
-       status.html(remaining_chars);
-
-       if (remaining_chars < 0) {
-               status.parent().css("color", "#D40D12");
-               $("#thewire-submit-button").attr('disabled', 'disabled');
-               $("#thewire-submit-button").css('background', '#999999');
-               $("#thewire-submit-button").css('border-color', '#999999');
-               $("#thewire-submit-button").css('cursor', 'default');
-       } else {
-               status.parent().css("color", "");
-               $("#thewire-submit-button").removeAttr('disabled', 'disabled');
-               $("#thewire-submit-button").css('background', '#4690d6');
-               $("#thewire-submit-button").css('border-color', '#4690d6');
-               $("#thewire-submit-button").css('cursor', 'pointer');
-       }
-}
-</script>
+</div>
\ No newline at end of file
index b8bf6e212fcfc9b952454b1505fd76e14807b467..a6fd2f79403971e8722863e7d3dba90394f216d4 100644 (file)
@@ -48,6 +48,12 @@ a.elgg-button {
        background: #0054a7 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
 }
 
+.elgg-button-submit.elgg-state-disabled {
+       background: #999;
+       border-color: #999;
+       cursor: default;
+}
+
 /* Cancel: This button should convey a negative but easily reversible action (e.g., turning off a plugin) */
 .elgg-button-cancel {
        color: #333;