From b4038b50a16c4de984c0575f6593f0fc193ec488 Mon Sep 17 00:00:00 2001
From: Daryn Warriner <daryn@iivip.com>
Date: Wed, 9 Jun 2010 15:22:30 -0500
Subject: [PATCH] Load common.js after jquery conflicts have been resolved.
 Remove tal attribute inadvertently left in from template branch. Rename
 minified jquery to indicate the version.  Add symbolic link and use the
 symbolic link for ease of upgrades.

---
 core/html_api.php                                 | 6 +++---
 javascript/dev/jquery.js                          | 1 +
 javascript/min/{jquery-min.js => jquery-1.4.2.js} | 0
 javascript/min/jquery.js                          | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 120000 javascript/dev/jquery.js
 rename javascript/min/{jquery-min.js => jquery-1.4.2.js} (100%)
 create mode 120000 javascript/min/jquery.js

diff --git a/core/html_api.php b/core/html_api.php
index 590b389b5f..f7b73a704f 100644
--- a/core/html_api.php
+++ b/core/html_api.php
@@ -403,10 +403,9 @@ function html_meta_redirect( $p_url, $p_time = null, $p_sanitize = true ) {
  */
 function html_head_javascript() {
 	if( ON == config_get( 'use_javascript' ) ) {
-		html_javascript_link( 'common.js' );
 		echo '<script type="text/javascript">var loading_lang = "' . lang_get( 'loading' ) . '";</script>';
 		html_javascript_link( 'ajax.js' );
-		html_javascript_link( 'jquery-min.js' );
+		html_javascript_link( 'jquery.js' );
 
 		global $g_enable_projax;
 
@@ -414,10 +413,11 @@ function html_head_javascript() {
 			html_javascript_link( 'projax/prototype.js' );
 			html_javascript_link( 'projax/scriptaculous.js' );
 		}
-		echo '<script type="text/javascript" tal:condition="use_javascript">';
+		echo '<script type="text/javascript">';
 		echo '/* Prevent jQuery from conflicting with projax...for now */';
 		echo 'var $j = jQuery.noConflict();';
 		echo '</script>';
+		html_javascript_link( 'common.js' );
 	}
 }
 
diff --git a/javascript/dev/jquery.js b/javascript/dev/jquery.js
new file mode 120000
index 0000000000..bc48276e8e
--- /dev/null
+++ b/javascript/dev/jquery.js
@@ -0,0 +1 @@
+jquery-1.4.2.js
\ No newline at end of file
diff --git a/javascript/min/jquery-min.js b/javascript/min/jquery-1.4.2.js
similarity index 100%
rename from javascript/min/jquery-min.js
rename to javascript/min/jquery-1.4.2.js
diff --git a/javascript/min/jquery.js b/javascript/min/jquery.js
new file mode 120000
index 0000000000..bc48276e8e
--- /dev/null
+++ b/javascript/min/jquery.js
@@ -0,0 +1 @@
+jquery-1.4.2.js
\ No newline at end of file