Fixes #3913 registering jquery.imgareaselect

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 7bdc5972a11b70014ace1a317a9756b7cf14fb58..c6217562977d10388407344a2bb85a5c7ec69313 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2031,7 +2031,10 @@ function elgg_init() {
        elgg_register_js('elgg.userpicker', 'js/lib/userpicker.js');
        elgg_register_js('elgg.friendspicker', 'js/lib/friends_picker.js');
        elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js');
+       elgg_register_js('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js');
 
+       elgg_register_css('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css');
+       
        // Trigger the shutdown:system event upon PHP shutdown.
        register_shutdown_function('_elgg_shutdown_hook');
 

diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 9fcae25c44f3a4d1f65f40a1e45b49718d8aa0f8..b97db939c2851d52969d9e2759050a43e20d2414 100644 (file)
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -5,6 +5,9 @@
  * @uses $vars['entity']
  */
 
+elgg_load_js('jquery.imgareaselect');
+elgg_load_css('jquery.imgareaselect');
+
 $master_image = $vars['entity']->getIconUrl('master');
 
 ?>
@@ -25,8 +28,6 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 ?>
 </div>
 <!-- grab the required js for icon cropping -->
-<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css" media="screen" />
 <?php //@todo JS 1.8: no ?>
 <script type="text/javascript">