fixed jquery issues. removed dependency on google js api

mhenke · Mar 17, 2010 · f7f2f16 · f7f2f16
1 parent b31de6e
commit f7f2f16
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/framework/HtmlTestResult.cfc b/framework/HtmlTestResult.cfc
@@ -34,8 +34,8 @@
 			<link rel="stylesheet" type="text/css" href="/#mxunit_root#/resources/jquery/tablesorter/blue/style.css">
 			<link rel="stylesheet" type="text/css" href="/#mxunit_root#/resources/theme/results.css">
 
-			<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-			<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
+			<script type="text/javascript" src="/#mxunit_root#/resources/jquery/jquery.min.js"></script>
+			<script type="text/javascript" src="/#mxunit_root#/resources/jquery/jquery-ui.min.js"></script>
 			<script type="text/javascript" src="/#mxunit_root#/resources/jquery/tablesorter/jquery.tablesorter.js"></script>
 			<script type="text/javascript" src="/#mxunit_root#/resources/jquery/jquery.runner.js"></script>
 			<title>#test_title#</title>

diff --git a/index.cfm b/index.cfm
@@ -1,4 +1,4 @@
-<cfparam name="url.output" default="js" />
+<cfparam name="url.print_js_resources" type="boolean" default="true" />
 
 <cfinclude template="resources/theme/header.cfm" />
 

diff --git a/resources/theme/footer.cfm b/resources/theme/footer.cfm
@@ -8,17 +8,16 @@
 	</div>
 
 	<!--- Check if doing js enhancement --->
-	<cfif structKeyExists(url, 'output') and url.output eq 'js'>
+	<cfif structKeyExists(url, 'print_js_resources') and url.print_js_resources> <!--- just a flag to load resources? --->
+		<cfset arrayAppend(scripts, pathBase & 'resources/jquery/jquery.min.js') />
+		<cfset arrayAppend(scripts, pathBase & 'resources/jquery/jquery-ui.min.js') />
 		<cfset arrayAppend(scripts, pathBase & 'resources/jquery/tablesorter/jquery.tablesorter.js') />
 		<cfset arrayAppend(scripts, pathBase & 'resources/jquery/jquery.runner.js') />
 	</cfif>
 
 	<!--- Check for custom scripts --->
 	<cfif arrayLen(scripts)>
 		<cfoutput>
-			<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-			<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
-
 			<cfloop from="1" to="#arrayLen(scripts)#" index="i">
 				<script type="text/javascript" src="#scripts[i]#"></script>
 			</cfloop>

diff --git a/runner/index.cfm b/runner/index.cfm
@@ -2,7 +2,7 @@
 
 <cfparam name="url.test" default="" />
 <cfparam name="url.componentPath" default="" />
-<cfparam name="url.output" default="js" />
+<cfparam name="url.output" default="html" />
 
 <cfset pathBase = '../' />
 <cfset title = 'Runner' />