playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Yet another fix for IE, I wish that browser would go away. 

IE8 and IE9 were broadcasting themselves at IE7 when in compatibility
mode and that caused some problems for some people. I'm ready to ditch
support for IE..
pull/23/merge
Zach Wise 13 years ago
parent
f515888281
commit
2c23477905
14 changed files with 23 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      locale/de.js
  2. 2
      locale/en.js
  3. 2
      locale/es.js
  4. 2
      locale/fr.js
  5. 2
      locale/it.js
  6. 2
      locale/kr.js
  7. 2
      locale/nl.js
  8. 2
      locale/pt-br.js
  9. 2
      locale/zh-ch.js
  10. 2
      locale/zh-tw.js
  11. 23
      source/js/VMM.Timeline.js
  12. 18
      source/js/VMM.js
  13. 2
      timeline-min.js
  14. 41
      timeline.js

2
locale/de.js
View File

File diff suppressed because one or more lines are too long

2
locale/en.js
View File

File diff suppressed because one or more lines are too long

2
locale/es.js
View File

File diff suppressed because one or more lines are too long

2
locale/fr.js
View File

File diff suppressed because one or more lines are too long

2
locale/it.js
View File

File diff suppressed because one or more lines are too long

2
locale/kr.js
View File

File diff suppressed because one or more lines are too long

2
locale/nl.js
View File

File diff suppressed because one or more lines are too long

2
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

2
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

2
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

23
source/js/VMM.Timeline.js
Unescape View File

@ -71,7 +71,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Language == 'undefined') {
contract_timeline: "Contract Timeline" contract_timeline: "Contract Timeline"
} }
} }
} };
if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') { if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
@ -2033,27 +2033,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var _key = VMM.Util.getUrlVars(raw_data)["key"]; var _key = VMM.Util.getUrlVars(raw_data)["key"];
var _url = "https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json"; var _url = "https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData); VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
/*
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 8 && window.XDomainRequest) {
// Use Microsoft XDR
// going to move this to VMM.getJSON
trace("it's ie");
var ie_xdr = new XDomainRequest();
var _url = "//spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
ie_xdr.open("get", _url);
ie_xdr.onload = function() {
var ie_j = {};
var ie_json = VMM.parseJSON(ie_xdr.responseText);
VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData(ie_json);
}
ie_xdr.send();
} else {
trace("not ie");
VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
}
*/
}, },

18
source/js/VMM.js
Unescape View File

@ -89,12 +89,7 @@ var global = (function () {
================================================== */ ================================================== */
if (typeof VMM == 'undefined') { if (typeof VMM == 'undefined') {
/* ENSURE jQuery is available as $
================================================== */
var $;
if( typeof( jQuery ) != 'undefined' ){
$ = jQuery;
}
/* Main Scope Container /* Main Scope Container
================================================== */ ================================================== */
@ -313,13 +308,13 @@ if (typeof VMM == 'undefined') {
/* CHECK FOR IE AND USE Use Microsoft XDR /* CHECK FOR IE AND USE Use Microsoft XDR
================================================== */ ================================================== */
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 8 && window.XDomainRequest) { if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
trace("it's ie"); trace("it's ie");
var ie_url = url; var ie_url = url;
if (ie_url.match('^http://')){ if (ie_url.match('^http://')){
trace("RUNNING GET JSON") trace("RUNNING GET JSON")
//ie_url = ie_url.replace("http://","//"); ie_url = ie_url.replace("http://","//");
return jQuery.getJSON(url, data, callback); return jQuery.getJSON(url, data, callback);
} else if (ie_url.match('^https://')) { } else if (ie_url.match('^https://')) {
trace("RUNNING XDR"); trace("RUNNING XDR");
@ -333,11 +328,7 @@ if (typeof VMM == 'undefined') {
trace("IE JSON ERROR") trace("IE JSON ERROR")
} else { } else {
return data(ie_json) return data(ie_json)
} }
//.error(function() { trace("IE ERROR")})
//.success(function() { trace("IE SUCCESS")});
} }
xdr.send(); xdr.send();
@ -346,6 +337,7 @@ if (typeof VMM == 'undefined') {
} }
} else { } else {
//$.getJSON(url, data); //$.getJSON(url, data);
trace("getJSON");
return jQuery.getJSON(url, data, callback); return jQuery.getJSON(url, data, callback);

2
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

41
timeline.js
Unescape View File

@ -89,12 +89,7 @@ var global = (function () {
================================================== */ ================================================== */
if (typeof VMM == 'undefined') { if (typeof VMM == 'undefined') {
/* ENSURE jQuery is available as $
================================================== */
var $;
if( typeof( jQuery ) != 'undefined' ){
$ = jQuery;
}
/* Main Scope Container /* Main Scope Container
================================================== */ ================================================== */
@ -313,13 +308,13 @@ if (typeof VMM == 'undefined') {
/* CHECK FOR IE AND USE Use Microsoft XDR /* CHECK FOR IE AND USE Use Microsoft XDR
================================================== */ ================================================== */
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 8 && window.XDomainRequest) { if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
trace("it's ie"); trace("it's ie");
var ie_url = url; var ie_url = url;
if (ie_url.match('^http://')){ if (ie_url.match('^http://')){
trace("RUNNING GET JSON") trace("RUNNING GET JSON")
//ie_url = ie_url.replace("http://","//"); ie_url = ie_url.replace("http://","//");
return jQuery.getJSON(url, data, callback); return jQuery.getJSON(url, data, callback);
} else if (ie_url.match('^https://')) { } else if (ie_url.match('^https://')) {
trace("RUNNING XDR"); trace("RUNNING XDR");
@ -333,11 +328,7 @@ if (typeof VMM == 'undefined') {
trace("IE JSON ERROR") trace("IE JSON ERROR")
} else { } else {
return data(ie_json) return data(ie_json)
} }
//.error(function() { trace("IE ERROR")})
//.success(function() { trace("IE SUCCESS")});
} }
xdr.send(); xdr.send();
@ -346,6 +337,7 @@ if (typeof VMM == 'undefined') {
} }
} else { } else {
//$.getJSON(url, data); //$.getJSON(url, data);
trace("getJSON");
return jQuery.getJSON(url, data, callback); return jQuery.getJSON(url, data, callback);
@ -4648,7 +4640,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Language == 'undefined') {
contract_timeline: "Contract Timeline" contract_timeline: "Contract Timeline"
} }
} }
} };
if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') { if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
@ -6610,27 +6602,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var _key = VMM.Util.getUrlVars(raw_data)["key"]; var _key = VMM.Util.getUrlVars(raw_data)["key"];
var _url = "https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json"; var _url = "https://spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData); VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
/*
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 8 && window.XDomainRequest) {
// Use Microsoft XDR
// going to move this to VMM.getJSON
trace("it's ie");
var ie_xdr = new XDomainRequest();
var _url = "//spreadsheets.google.com/feeds/list/" + _key + "/od6/public/values?alt=json";
ie_xdr.open("get", _url);
ie_xdr.onload = function() {
var ie_j = {};
var ie_json = VMM.parseJSON(ie_xdr.responseText);
VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData(ie_json);
}
ie_xdr.send();
} else {
trace("not ie");
VMM.getJSON(_url, VMM.Timeline.DataObj.model_GoogleSpreadsheet.buildData);
}
*/
}, },

Write Preview
Loading…
Cancel
Save