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.
mantisbt · Jun 9, 2010 · b4038b5 · b4038b5
1 parent f653c1f
commit b4038b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/core/html_api.php b/core/html_api.php
@@ -403,21 +403,21 @@ 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;
 
 		if( $g_enable_projax ) {
 			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
@@ -0,0 +1 @@
+jquery-1.4.2.js
diff --git a/javascript/min/jquery-min.js → javascript/min/jquery-1.4.2.js b/javascript/min/jquery-min.js → javascript/min/jquery-1.4.2.js
diff --git a/javascript/min/jquery.js b/javascript/min/jquery.js
@@ -0,0 +1 @@
+jquery-1.4.2.js