Fix loading jQuery in the offline reference

SpecLad · SpecLad · commit 724ed9fd13ab · 2014-03-10T18:21:31.000+04:00
Currently, jQuery is being loaded from Google's CDN via a schemaless URI
reference "//ajax.googleapis.com/...". When the reference is viewed
offline, that URI reference resolves to "file://ajax.googleapis.com/...",
which causes two problems:

1) jQuery is obviously not loaded (can be checked by seeing whether the navbar
   remains pinned to the top of the page when scrolling). This is mitigated
   by the fallbacks on some pages that attempt to load the local copy of
   jQuery if the Google copy didn't load, although some pages lack the
   fallbacks.

2) More importantly, when viewed on Windows, this causes long browser freezes,
   as Windows tries to look up the script in a shared folder on
   ajax.googleapis.com, which only fails after a long timeout.

This commit fixes both problems by making the offline reference only
refer to the local copy of jQuery.
diff --git a/java_generate/ReferenceGenerator/src/writers/TemplateWriter.java b/java_generate/ReferenceGenerator/src/writers/TemplateWriter.java
@@ -65,12 +65,14 @@ private Boolean write( String templateName, HashMap<String, String> vars, String
 		ArrayList<String> output = new ArrayList<String>();
 		vars.put("timestamp", getTimestamp());
 		if(isLocal)
-		{ //add local nav
+		{
 			vars.put( "webcontentpath",  getRelativePathToRoot( outputName ) );
+			vars.put("jquery", writePartial("jquery.local.partial.html", vars));
 			vars.put("navigation", writePartial("nav.local.template.html", vars));
 		} else
 		{
 			vars.put( "webcontentpath",  "/" );
+			vars.put("jquery", writePartial("jquery.web.partial.html", vars));
 			vars.put("navigation", writePartial("nav.web.template.html", vars));
 		}
 
diff --git a/java_generate/templates/class.template.html b/java_generate/templates/class.template.html
@@ -122,7 +122,7 @@
   			</div>
   			
 		</div>
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+		<!-- jquery -->
 		<script src="<!-- webcontentpath -->javascript/site.js" type="text/javascript"></script>
 	</body>
 
diff --git a/java_generate/templates/generic.template.html b/java_generate/templates/generic.template.html
@@ -123,7 +123,7 @@
   			</div>
   			
 		</div>
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+		<!-- jquery -->
 		<script src="<!-- webcontentpath -->javascript/site.js" type="text/javascript"></script>
 	</body>
 </html>
diff --git a/java_generate/templates/index.alphabetical.template.html b/java_generate/templates/index.alphabetical.template.html
@@ -17,10 +17,6 @@
 	
 		<script src="<!-- webcontentpath -->javascript/modernizr-2.6.2.touch.js" type="text/javascript"></script>
 		<link href="<!-- webcontentpath -->css/style.css" rel="stylesheet" type="text/css" />
-		
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-		<script>window.jQuery || document.write('<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"><\/script>')</script>
-		<script src="<!-- webcontentpath -->javascript/site.js" type="text/javascript"></script>
 	</head>
 	<body id="A-Z" onload="" >
 		
@@ -88,8 +84,7 @@ <h1 class="large-header"><span class="black">Reference.</span> The Processing La
   			</div>
   			
 		</div>
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-		<script>window.jQuery || document.write('<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"><\/script>')</script>
+		<!-- jquery -->
 		<script src="<!-- webcontentpath -->javascript/site.js" type="text/javascript"></script>
 	</body>
 </html>
diff --git a/java_generate/templates/index.template.html b/java_generate/templates/index.template.html
@@ -266,8 +266,7 @@ <h5>Random</h5>
   			</div>
   			
 		</div>
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-		<script>window.jQuery || document.write('<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"><\/script>')</script>
+		<!-- jquery -->
 		<script src="<!-- webcontentpath -->javascript/site.js" type="text/javascript"></script>
 
 		<script type="text/javascript">
diff --git a/java_generate/templates/jquery.local.partial.html b/java_generate/templates/jquery.local.partial.html
@@ -0,0 +1 @@
+<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"></script>
diff --git a/java_generate/templates/jquery.web.partial.html b/java_generate/templates/jquery.web.partial.html
@@ -0,0 +1,2 @@
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+<script>window.jQuery || document.write('<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"><\\/script>');</script>
diff --git a/java_generate/templates/library.index.template.html b/java_generate/templates/library.index.template.html
@@ -79,8 +79,7 @@ <h5><!-- libraryname --> Events</h5>
   			</div>
   			
 		</div>
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-		<script>window.jQuery || document.write('<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"><\/script>')</script>
+		<!-- jquery -->
 		<script src="<!-- webcontentpath -->javascript/site.js" type="text/javascript"></script>
 	</body>
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"></script>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>`
	`2`	`+<script>window.jQuery \|\| document.write('<script src="<!-- webcontentpath -->javascript/jquery-1.9.1.min.js"><\\/script>');</script>`