Fix for possible server restriction issue with XMLHttpRequest domain issues with Google Docs

13 years ago · f809d2c7ea
12 changed files with 28 additions and 12 deletions
--- a/locale/de.js
+++ b/locale/de.js
--- a/locale/es.js
+++ b/locale/es.js
--- a/locale/fr.js
+++ b/locale/fr.js
--- a/locale/is.js
+++ b/locale/is.js
--- a/locale/it.js
+++ b/locale/it.js
--- a/locale/kr.js
+++ b/locale/kr.js
--- a/locale/nl.js
+++ b/locale/nl.js
--- a/locale/pt-br.js
+++ b/locale/pt-br.js
--- a/locale/zh-ch.js
+++ b/locale/zh-ch.js
--- a/locale/zh-tw.js
+++ b/locale/zh-tw.js
--- a/source/js/VMM.Timeline.DataObj.js
+++ b/source/js/VMM.Timeline.DataObj.js
@ -223,10 +223,18 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
 			//	https://docs.google.com/previewtemplate?id=0AppSVxABhnltdEhzQjQ4MlpOaldjTmZLclQxQWFTOUE&mode=public
 			type: "google spreadsheet",
 			
+			
 			getData: function(raw_data) {
+				var loc = (window.parent.document.location).toString();
+				var prefix = "";
+				if (loc.match("http")) {
+					prefix = loc;
+				} else {
+					prefix = "https://";
+				}
 				
 				var _key = VMM.Util.getUrlVars(raw_data)["key"];
-				var _url = "https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
+				var _url = prefix + "spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
 				VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
 			},
 			
--- a/timeline.js
+++ b/timeline.js
@ -6840,10 +6840,18 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
 			//	https://docs.google.com/previewtemplate?id=0AppSVxABhnltdEhzQjQ4MlpOaldjTmZLclQxQWFTOUE&mode=public
 			type: "google spreadsheet",
 			
+			
 			getData: function(raw_data) {
+				var loc = (window.parent.document.location).toString();
+				var prefix = "";
+				if (loc.match("http")) {
+					prefix = loc;
+				} else {
+					prefix = "https://";
+				}
 				
 				var _key = VMM.Util.getUrlVars(raw_data)["key"];
-				var _url = "https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
+				var _url = prefix + "spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
 				VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
 			},