From a186ad16e258c6335e1757a20845c64056b87f15 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 20:09:16 -0400
Subject: Fixes #3913 registering jquery.imgareaselect

---
 views/default/forms/avatar/crop.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'views/default/forms/avatar/crop.php')

diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 9fcae25c4..b97db939c 100644
--- 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">
 
-- 
cgit v1.2.3


From 00433c37e49e1ca706809a1a5f1c515cd784fc22 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 1 Oct 2011 20:28:07 -0400
Subject: Fixes #3888 correcting initialization of avatar cropping library

---
 views/default/forms/avatar/crop.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'views/default/forms/avatar/crop.php')

diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index b97db939c..1f39ff73c 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -62,9 +62,12 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 		$('<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'));
 
-		// this produces the coordinates
-		$('#user-avatar').imgAreaSelect({ selectionOpacity: 0, onSelectEnd: selectChange });
-		// show the preview
-		$('#user-avatar').imgAreaSelect({ aspectRatio: '1:1', onSelectChange: preview });
+		// init the cropping
+		$('#user-avatar').imgAreaSelect({
+			selectionOpacity: 0,
+			aspectRatio: '1:1',
+			onSelectEnd: selectChange,
+			onSelectChange: preview
+		});
 	});
 </script>
-- 
cgit v1.2.3