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

Fixed IE8 bug with Wikipedia (8hrs)! Woo Hoo! closes #107

pull/127/head
Zach Wise 13 years ago
parent
4b0bcfebdd
commit
7e0e20b1a1
18 changed files with 185 additions and 399 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      compiled/js/locale/de.js
  2. 8
      compiled/js/locale/en.js
  3. 8
      compiled/js/locale/es.js
  4. 8
      compiled/js/locale/fr.js
  5. 8
      compiled/js/locale/is.js
  6. 8
      compiled/js/locale/it.js
  7. 8
      compiled/js/locale/kr.js
  8. 8
      compiled/js/locale/nl.js
  9. 8
      compiled/js/locale/pt-br.js
  10. 8
      compiled/js/locale/zh-ch.js
  11. 8
      compiled/js/locale/zh-tw.js
  12. 8
      compiled/js/timeline-min.js
  13. 157
      compiled/js/timeline.js
  14. 8
      source/js/VMM.ExternalAPI.js
  15. 121
      source/js/VMM.Library.js
  16. 1
      source/js/VMM.MediaType.js
  17. 11
      source/js/VMM.Timeline.js
  18. 12
      source/js/VMM.Util.js

8
compiled/js/locale/de.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/en.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/es.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/fr.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/is.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/it.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/kr.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/nl.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

8
compiled/js/timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

157
compiled/js/timeline.js
Unescape View File

@ -459,128 +459,19 @@ if(typeof VMM != 'undefined') {
};
VMM.getJSONnoP = function(url, data, callback) {
if( typeof( jQuery ) != 'undefined' ){
/* CHECK FOR IE AND USE Use Microsoft XDR
================================================== */
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
trace("it's ie");
var ie_url = url;
if (ie_url.match('^http://')){
trace("RUNNING getJSONnoP XDR2");
var xdr = new XDomainRequest();
xdr.open("get", ie_url);
xdr.onload = function() {
var ie_json = VMM.parseJSON(xdr.responseText);
trace(xdr.responseText);
if (type.of(ie_json) == "null" || type.of(ie_json) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(ie_json)
}
}
xdr.send();
/*
jQuery.ajax({
url: ie_url,
dataType: 'json',
type: "GET",
})
.done(function(d) {
trace("AJAX GOT IT");
trace(d);
if (type.of(d) == "null" || type.of(d) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(d)
}
})
.fail(function(jqXHR, textStatus) {
trace(" getJSONnoP error " + textStatus);
})
.always(function() {
trace(" getJSONnoP complete");
});
*/
} else if (ie_url.match('^https://')) {
trace("RUNNING XDR");
ie_url = ie_url.replace("https://","http://");
jQuery.ajax({
url: ie_url,
dataType: 'json',
type: "GET",
})
.done(function(d) {
trace("AJAX GOT IT");
trace(d);
if (type.of(d) == "null" || type.of(d) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(d)
}
})
.fail(function(jqXHR, textStatus) {
trace(" getJSONnoP error " + textStatus);
})
.always(function() {
trace(" getJSONnoP complete");
});
} else {
return jQuery.getJSON(url, data, callback);
}
} else {
return jQuery.getJSON(url, data, callback);
}
}
};
VMM.getJSON = function(url, data, callback) {
if( typeof( jQuery ) != 'undefined' ){
/* CHECK FOR IE AND USE Use Microsoft XDR
/* CHECK FOR IE
================================================== */
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
trace("it's ie");
trace("IE JSON");
var ie_url = url;
if (ie_url.match('^http://')){
trace("RUNNING GET JSON");
return jQuery.getJSON(ie_url, data, callback);
} else if (ie_url.match('^https://')) {
trace("RUNNING XDR");
ie_url = ie_url.replace("https://","http://");
return jQuery.getJSON(ie_url, data, callback);
/*
trace("RUNNING XDR");
ie_url = ie_url.replace("https://","http://");
var xdr = new XDomainRequest();
xdr.open("get", ie_url);
xdr.onload = function() {
var ie_json = VMM.parseJSON(xdr.responseText);
trace(xdr.responseText);
if (type.of(ie_json) == "null" || type.of(ie_json) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(ie_json)
}
}
xdr.send();
*/
} else {
return jQuery.getJSON(url, data, callback);
}
@ -933,14 +824,13 @@ if(typeof VMM != 'undefined') {
}
if( typeof( jQuery ) != 'undefined' ){
// XDR
// https://github.com/jaubourg/ajaxHooks/blob/master/src/ajax/xdr.js
/* XDR AJAX EXTENTION FOR jQuery
https://github.com/jaubourg/ajaxHooks/blob/master/src/ajax/xdr.js
================================================== */
(function( jQuery ) {
trace("AJAX CROSS DOMAIN");
if ( window.XDomainRequest ) {
jQuery.ajaxTransport(function( s ) {
trace("USING AJAX CROSS DOMAIN");
if ( s.crossDomain && s.async ) {
if ( s.timeout ) {
s.xdrTimeout = s.timeout;
@ -982,7 +872,6 @@ if( typeof( jQuery ) != 'undefined' ){
}
})( jQuery );
/* jQuery Easing v1.3
http://gsgd.co.uk/sandbox/jquery/easing/
================================================== */
@ -1436,7 +1325,6 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
//media.id = d.split("wiki\/")[1];
var wiki_id = d.split("wiki\/")[1].split("#")[0].replace("_", " ");
media.id = VMM.Util.toTitleCase(wiki_id).replace(" ", "%20");
trace("WIKIPEDIA " + media.id);
success = true;
} else if (d.indexOf('http://') == 0) {
media.type = "website";
@ -2256,7 +2144,6 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
wikipedia: {
get: function(url, id) {
trace("WIKIPEDIA GET");
var api_obj = {url: url, id: id};
VMM.master_config.wikipedia.que.push(api_obj);
VMM.master_config.wikipedia.active = true;
@ -2266,7 +2153,10 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
var the_url = "http://en.wikipedia.org/w/api.php?action=query&prop=extracts&redirects=&titles=" + api_obj.url + "&exintro=1&format=json&callback=?";
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
VMM.attachElement("#"+api_obj.id, "<p>Wikipedia entry unable to load using Internet Explorer 8 or below.</p>" );
var temp_text = "<h4><a href='http://en.wikipedia.org/wiki/" + api_obj.url + "' target='_blank'>" + api_obj.url + "</a></h4>";
temp_text += "<div class='wiki-source'>From Wikipedia, the free encyclopedia</span>";
temp_text += "<p>Wikipedia entry unable to load using Internet Explorer 8 or below.</p>";
VMM.attachElement("#"+api_obj.id, temp_text );
}
VMM.getJSON(the_url, function(d) {
@ -2293,8 +2183,6 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
} else {
VMM.attachElement("#"+api_obj.id, _wiki );
}
} else {
VMM.attachElement("#"+api_obj.id, "<p>Wikipedia entry unable to load using Internet Explorer 8 or below.</p>" );
}
});
@ -2973,8 +2861,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Lib.css(navigation.nextBtn, "left", (current_width - config.slider.nav.width));
VMM.Lib.height(navigation.prevBtn, config.slider.height);
VMM.Lib.height(navigation.nextBtn, config.slider.height);
VMM.Lib.css(navigation.nextBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) );
VMM.Lib.css(navigation.prevBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) );
VMM.Lib.css(navigation.nextBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) + 10 );
VMM.Lib.css(navigation.prevBtnContainer, "top", ( (config.slider.height/2) - (config.slider.nav.height/2) ) + 10 );
// Animate Changes
VMM.Lib.height($slider_mask, config.slider.height);
@ -4206,7 +4094,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
/* Transform text to Title Case
================================================== */
toTitleCase: function(t){
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7) {
return t.replace("_", "%20");
} else {
var __TitleCase = {
__smallWords: ['a', 'an', 'and', 'as', 'at', 'but','by', 'en', 'for', 'if', 'in', 'of', 'on', 'or','the', 'to', 'v[.]?', 'via', 'vs[.]?'],
@ -4259,11 +4149,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
var split = w.split(/(^[^a-zA-Z0-9]*[a-zA-Z0-9])(.*)$/);
if (split[1]) {
split[1] = split[1].toUpperCase();
}
return split.join('');
} else {
return "";
}
},
};
@ -4274,6 +4163,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
t = __TitleCase.toTitleCase(t);
return t;
}
},
}).init();
@ -5805,7 +5697,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline";
}
version = "1.30";
version = "1.35";
trace("TIMELINE VERSION " + version);
@ -5817,7 +5709,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
data_ready: "DATAREADY",
messege: "MESSEGE",
headline: "TIMELINE_HEADLINE",
slide_change: "SLIDE_CHANGE"
slide_change: "SLIDE_CHANGE",
resize: "resize"
},
id: timeline_id,
type: "timeline",
@ -6062,8 +5955,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", VMM.Timeline.Config.language.messages.loading_timeline);
VMM.bindEvent(global, onDataReady, "DATAREADY");
VMM.bindEvent(global, showMessege, "MESSEGE");
VMM.bindEvent(global, onDataReady, config.events.data_ready);
VMM.bindEvent(global, showMessege, config.events.messege);
/* GET DATA
================================================== */
@ -6140,7 +6033,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timenav.init(_dates, data.era);
// RESIZE EVENT LISTENERS
VMM.bindEvent(global, reSize, "resize");
VMM.bindEvent(global, reSize, config.events.resize);
//VMM.bindEvent(global, function(e) {e.preventDefault()}, "touchmove");
};

8
source/js/VMM.ExternalAPI.js
Unescape View File

@ -591,7 +591,6 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
wikipedia: {
get: function(url, id) {
trace("WIKIPEDIA GET");
var api_obj = {url: url, id: id};
VMM.master_config.wikipedia.que.push(api_obj);
VMM.master_config.wikipedia.active = true;
@ -601,7 +600,10 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
var the_url = "http://en.wikipedia.org/w/api.php?action=query&prop=extracts&redirects=&titles=" + api_obj.url + "&exintro=1&format=json&callback=?";
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
VMM.attachElement("#"+api_obj.id, "<p>Wikipedia entry unable to load using Internet Explorer 8 or below.</p>" );
var temp_text = "<h4><a href='http://en.wikipedia.org/wiki/" + api_obj.url + "' target='_blank'>" + api_obj.url + "</a></h4>";
temp_text += "<div class='wiki-source'>From Wikipedia, the free encyclopedia</span>";
temp_text += "<p>Wikipedia entry unable to load using Internet Explorer 8 or below.</p>";
VMM.attachElement("#"+api_obj.id, temp_text );
}
VMM.getJSON(the_url, function(d) {
@ -628,8 +630,6 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
} else {
VMM.attachElement("#"+api_obj.id, _wiki );
}
} else {
VMM.attachElement("#"+api_obj.id, "<p>Wikipedia entry unable to load using Internet Explorer 8 or below.</p>" );
}
});

121
source/js/VMM.Library.js
Unescape View File

@ -98,128 +98,19 @@ if(typeof VMM != 'undefined') {
};
VMM.getJSONnoP = function(url, data, callback) {
if( typeof( jQuery ) != 'undefined' ){
/* CHECK FOR IE AND USE Use Microsoft XDR
================================================== */
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
trace("it's ie");
var ie_url = url;
if (ie_url.match('^http://')){
trace("RUNNING getJSONnoP XDR2");
var xdr = new XDomainRequest();
xdr.open("get", ie_url);
xdr.onload = function() {
var ie_json = VMM.parseJSON(xdr.responseText);
trace(xdr.responseText);
if (type.of(ie_json) == "null" || type.of(ie_json) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(ie_json)
}
}
xdr.send();
/*
jQuery.ajax({
url: ie_url,
dataType: 'json',
type: "GET",
})
.done(function(d) {
trace("AJAX GOT IT");
trace(d);
if (type.of(d) == "null" || type.of(d) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(d)
}
})
.fail(function(jqXHR, textStatus) {
trace(" getJSONnoP error " + textStatus);
})
.always(function() {
trace(" getJSONnoP complete");
});
*/
} else if (ie_url.match('^https://')) {
trace("RUNNING XDR");
ie_url = ie_url.replace("https://","http://");
jQuery.ajax({
url: ie_url,
dataType: 'json',
type: "GET",
})
.done(function(d) {
trace("AJAX GOT IT");
trace(d);
if (type.of(d) == "null" || type.of(d) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(d)
}
})
.fail(function(jqXHR, textStatus) {
trace(" getJSONnoP error " + textStatus);
})
.always(function() {
trace(" getJSONnoP complete");
});
} else {
return jQuery.getJSON(url, data, callback);
}
} else {
return jQuery.getJSON(url, data, callback);
}
}
};
VMM.getJSON = function(url, data, callback) {
if( typeof( jQuery ) != 'undefined' ){
/* CHECK FOR IE AND USE Use Microsoft XDR
/* CHECK FOR IE
================================================== */
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
trace("it's ie");
trace("IE JSON");
var ie_url = url;
if (ie_url.match('^http://')){
trace("RUNNING GET JSON");
return jQuery.getJSON(ie_url, data, callback);
} else if (ie_url.match('^https://')) {
trace("RUNNING XDR");
ie_url = ie_url.replace("https://","http://");
return jQuery.getJSON(ie_url, data, callback);
/*
trace("RUNNING XDR");
ie_url = ie_url.replace("https://","http://");
var xdr = new XDomainRequest();
xdr.open("get", ie_url);
xdr.onload = function() {
var ie_json = VMM.parseJSON(xdr.responseText);
trace(xdr.responseText);
if (type.of(ie_json) == "null" || type.of(ie_json) == "undefined") {
trace("IE JSON ERROR")
} else {
return data(ie_json)
}
}
xdr.send();
*/
} else {
return jQuery.getJSON(url, data, callback);
}
@ -572,14 +463,13 @@ if(typeof VMM != 'undefined') {
}
if( typeof( jQuery ) != 'undefined' ){
// XDR
// https://github.com/jaubourg/ajaxHooks/blob/master/src/ajax/xdr.js
/* XDR AJAX EXTENTION FOR jQuery
https://github.com/jaubourg/ajaxHooks/blob/master/src/ajax/xdr.js
================================================== */
(function( jQuery ) {
trace("AJAX CROSS DOMAIN");
if ( window.XDomainRequest ) {
jQuery.ajaxTransport(function( s ) {
trace("USING AJAX CROSS DOMAIN");
if ( s.crossDomain && s.async ) {
if ( s.timeout ) {
s.xdrTimeout = s.timeout;
@ -621,7 +511,6 @@ if( typeof( jQuery ) != 'undefined' ){
}
})( jQuery );
/* jQuery Easing v1.3
http://gsgd.co.uk/sandbox/jquery/easing/
================================================== */

1
source/js/VMM.MediaType.js
Unescape View File

@ -65,7 +65,6 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
//media.id = d.split("wiki\/")[1];
var wiki_id = d.split("wiki\/")[1].split("#")[0].replace("_", " ");
media.id = VMM.Util.toTitleCase(wiki_id).replace(" ", "%20");
trace("WIKIPEDIA " + media.id);
success = true;
} else if (d.indexOf('http://') == 0) {
media.type = "website";

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

@ -62,7 +62,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline";
}
version = "1.30";
version = "1.35";
trace("TIMELINE VERSION " + version);
@ -74,7 +74,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
data_ready: "DATAREADY",
messege: "MESSEGE",
headline: "TIMELINE_HEADLINE",
slide_change: "SLIDE_CHANGE"
slide_change: "SLIDE_CHANGE",
resize: "resize"
},
id: timeline_id,
type: "timeline",
@ -319,8 +320,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", VMM.Timeline.Config.language.messages.loading_timeline);
VMM.bindEvent(global, onDataReady, "DATAREADY");
VMM.bindEvent(global, showMessege, "MESSEGE");
VMM.bindEvent(global, onDataReady, config.events.data_ready);
VMM.bindEvent(global, showMessege, config.events.messege);
/* GET DATA
================================================== */
@ -397,7 +398,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timenav.init(_dates, data.era);
// RESIZE EVENT LISTENERS
VMM.bindEvent(global, reSize, "resize");
VMM.bindEvent(global, reSize, config.events.resize);
//VMM.bindEvent(global, function(e) {e.preventDefault()}, "touchmove");
};

12
source/js/VMM.Util.js
Unescape View File

@ -566,7 +566,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
/* Transform text to Title Case
================================================== */
toTitleCase: function(t){
if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7) {
return t.replace("_", "%20");
} else {
var __TitleCase = {
__smallWords: ['a', 'an', 'and', 'as', 'at', 'but','by', 'en', 'for', 'if', 'in', 'of', 'on', 'or','the', 'to', 'v[.]?', 'via', 'vs[.]?'],
@ -619,11 +621,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
var split = w.split(/(^[^a-zA-Z0-9]*[a-zA-Z0-9])(.*)$/);
if (split[1]) {
split[1] = split[1].toUpperCase();
}
return split.join('');
} else {
return "";
}
},
};
@ -634,6 +635,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
t = __TitleCase.toTitleCase(t);
return t;
}
},
}).init();

Write Preview
Loading…
Cancel
Save