update to jquery 1.3.2 and jqueryUI 1.7.2 closes #941

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

4 files changed, 20 insertions, 14 deletions

diff --git a/views/default/embed/addcontentjs.php b/views/default/embed/addcontentjs.php
index 1e22fd74a..e97a51883 100644
--- a/views/default/embed/addcontentjs.php
+++ b/views/default/embed/addcontentjs.php
@@ -1,4 +1,4 @@
 

 	var entity;

-	$('textarea[@name='+entityname+']').val($('textarea[@name='+entityname+']').val() + ' ' + content);	

+	$('textarea[name='+entityname+']').val($('textarea[name='+entityname+']').val() + ' ' + content);	

 	
\ No newline at end of file
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 78cf9388d..cf6389aba 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -6,7 +6,7 @@ $(document).ready(function () {
 	

 	// toggle widget box edit panel

 	$('a.toggle_box_edit_panel').click(function () {

-		$(this.parentNode.parentNode).children("[class=collapsable_box_editpanel]").slideToggle("fast");

+		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast");

 		return false;

 	});

 	

@@ -18,16 +18,16 @@ $(document).ready(function () {
 	

 	// toggle plugin's settings nad more info on admin tools admin

 	$('a.pluginsettings_link').click(function () {

-		$(this.parentNode.parentNode).children("[class=pluginsettings]").slideToggle("fast");

+		$(this.parentNode.parentNode).children(".pluginsettings").slideToggle("fast");

 		return false;

 	});

 	$('a.manifest_details').click(function () {

-		$(this.parentNode.parentNode).children("[class=manifest_file]").slideToggle("fast");

+		$(this.parentNode.parentNode).children(".manifest_file").slideToggle("fast");

 		return false;

 	});

 	// reusable generic hidden panel

 	$('a.collapsibleboxlink').click(function () {

-		$(this.parentNode.parentNode).children("[class=collapsible_box]").slideToggle("fast");

+		$(this.parentNode.parentNode).children(".collapsible_box").slideToggle("fast");

 		return false;

 	});

 	

@@ -39,11 +39,12 @@ $(document).ready(function () {
 	$els.sortable({

 		items: '.draggable_widget',

 		handle: '.drag_handle',

+		forcePlaceholderSize: true,

+		placeholder: 'ui-state-highlight',

 		cursor: 'move',

 		revert: true,

-		opacity: 1.0,

+		opacity: 0.9,

 		appendTo: 'body',

-		placeholder: 'placeholder',

 		connectWith: els,

 		start:function(e,ui) {

 	

@@ -84,7 +85,7 @@ $(document).ready(function () {
 

 // List active widgets for each page column

 function outputWidgetList(forElement) {

-	return( $("input[@name='handler'], input[@name='guid']", forElement ).makeDelimitedList("value") );	

+	return( $("input[name='handler'], input[name='guid']", forElement ).makeDelimitedList("value") );	

 }

 

 // Make delimited list

@@ -126,7 +127,7 @@ var targetContent = $('div.collapsable_box_content', this.parentNode.parentNode)
 	if (targetContent.css('display') == 'none') {

 		targetContent.slideDown(400);

 		$(this).html('-');

-		$(this.parentNode).children("[class=toggle_box_edit_panel]").fadeIn('medium');

+		$(this.parentNode).children(".toggle_box_edit_panel").fadeIn('medium');

 		

 		// set cookie for widget panel open-state

 		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');

@@ -135,9 +136,9 @@ var targetContent = $('div.collapsable_box_content', this.parentNode.parentNode)
 	} else {

 		targetContent.slideUp(400);

 		$(this).html('+');

-		$(this.parentNode).children("[class=toggle_box_edit_panel]").fadeOut('medium');

+		$(this.parentNode).children(".toggle_box_edit_panel").fadeOut('medium');

 		// make sure edit pane is closed

-		$(this.parentNode.parentNode).children("[class=collapsable_box_editpanel]").hide();

+		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").hide();

 		

 		// set cookie for widget panel closed-state

 		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');

@@ -150,7 +151,7 @@ var targetContent = $('div.collapsable_box_content', this.parentNode.parentNode)
 function widget_moreinfo() {

 

 	$("img.more_info").hover(function(e) {										  

-	var widgetdescription = $("input[@name='description']", this.parentNode.parentNode.parentNode ).attr('value');

+	var widgetdescription = $("input[name='description']", this.parentNode.parentNode.parentNode ).attr('value');

 	$("body").append("<p id='widget_moreinfo'><b>"+ widgetdescription +" </b></p>");

 	

 		if (e.pageX < 900) {

diff --git a/views/default/js/upload_js.php b/views/default/js/upload_js.php
index 3647c0a95..ab8c0dc20 100644
--- a/views/default/js/upload_js.php
+++ b/views/default/js/upload_js.php
@@ -1,4 +1,8 @@
 <script>

+/*

+Part of multi file uploader

+*/

+

 var number_of_files = 1;

 

 // wait for the DOM to be loaded 

diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index cb883931d..b44b1dc52 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -60,8 +60,8 @@ END;
 	<meta name="ElggVersion" content="<?php echo $version; ?>" />
 	<title><?php echo $title; ?></title>
 
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.2.6.pack.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-personalized-1.5.3.packed.js"></script>

+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.3.2.min.js"></script>
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.custom.min.js"></script>
 	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
 	<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script>
 <?php
@@ -76,6 +76,7 @@ END;
 ?>
 	<!-- include the default css file -->
 	<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&viewtype=<?php echo $vars['view']; ?>" type="text/css" />
+
 	<?php 
 		echo $feedref;
 		echo elgg_view('metatags',$vars);