html_datajson_url_parameter

cancerberoSgx · Feb 21, 2017 · c127661 · c127661
1 parent 86e0c54
commit c127661
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 23 deletions.
diff --git a/Changelist.md b/Changelist.md
@@ -98,4 +98,5 @@
 
 ##0.2.8
  * html application configuration dontShowSources:boolean
- * spec for node js api
+ * spec for node js api
+ * html support for loading alternative data.json with datajson url parameter
diff --git a/html/index-dev.html b/html/index-dev.html
@@ -73,21 +73,37 @@
 
 <body>
 
-<script src="data.json" type="text/javascript"></script>
+<!-- <script src="data.json" type="text/javascript"></script> -->
 <script>
-// jQuery.getJSON('data.json').done(function(data)
-// {
-// 	Application.startApplication(data); 
-// }).fail(function()
-// {
-// 	debugger;
-// }); 
-
-var config = {
-	//dontShowSources: true
-	collapseSources: true
+
+function getCurrentParams()
+{
+	try 
+	{
+		var search = location.search.substring(1);
+		var params = {}
+		if(search)
+		{
+			params = JSON.parse('{"' + decodeURI(search).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}')
+		}
+		return params
+	}
+	catch(ex)
+	{
+		return {}
+	}
 }
-Application.startApplication(window.__shortjsdoc_data, config); 
+var params = getCurrentParams()
+
+var dataJson = params.datajson || 'data.json'
+jQuery.getScript(dataJson).then(function()
+{
+	var config = {
+		collapseSources: true
+	}
+	Application.startApplication(window.__shortjsdoc_data, config); 
+})
+
 </script>
 
 

diff --git a/html/index.html b/html/index.html
@@ -22,19 +22,40 @@
 <script src="all.min.js" type="text/javascript"></script>
 <script src="template-output.js" type="text/javascript"></script>
 
+<!--
 <script src="data.min.json" type="text/javascript"></script>
+-->
 
 <script>
-// jQuery.getJSON('data.json').done(function(data)
-// {
-// 	Application.startApplication(data); 
-// }); 
-
-var config = {
-	//dontShowSources: true
-	collapseSources: true
+
+function getCurrentParams()
+{
+	try 
+	{
+		var search = location.search.substring(1);
+		var params = {}
+		if(search)
+		{
+			params = JSON.parse('{"' + decodeURI(search).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}')
+		}
+		return params
+	}
+	catch(ex)
+	{
+		return {}
+	}
 }
-Application.startApplication(window.__shortjsdoc_data, config); 
+var params = getCurrentParams()
+
+var dataJson = params.datajson || 'data.min.json'
+jQuery.getScript(dataJson).then(function()
+{
+	var config = {
+		collapseSources: true
+	}
+	Application.startApplication(window.__shortjsdoc_data, config); 
+})
+
 </script>
 </body>
 </html>