Browse Source

Fix for IE8 bug

Also added a incompatibility message for IE7 users
pull/20/merge
Zach Wise 13 years ago
parent
commit
6bf230ab71
  1. 43
      source/js/timeline.js
  2. 14
      timeline-min.js

43
source/js/timeline.js

@ -1,8 +1,7 @@
/*! /*!
Verite Timeline 0.82 Verite Timeline 0.85
Copyright 2011 Verite.co
Designed and built by Zach Wise digitalartwork.net Designed and built by Zach Wise digitalartwork.net
Date: February 7, 2012 Date: March 30, 2012
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -20,11 +19,12 @@
/*! /*!
TODO TODO
- Better Flags -
- Google Spreadsheets support -
FUTURE PLANS FUTURE PLANS
- Better iPhone usability - Better iPhone usability
- Support feeds from popular sources - Support feeds from popular sources
- Storify integration
- Code optimization - Code optimization
- Clean up config flow - Clean up config flow
- Possible tagging of events (depends on usability factors) - Possible tagging of events (depends on usability factors)
@ -116,11 +116,20 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
config.feature_height = config.height - config.nav_height; config.feature_height = config.height - config.nav_height;
} }
/* CHECK FOR IE7
================================================== */
var ie7 = false;
if ( $.browser.msie ) {
if ( parseInt($.browser.version, 10) == 7) {
ie7 = true;
}
}
/* VER /* VER
================================================== */ ================================================== */
this.ver = "0.5"; this.ver = "0.85";
/* ON EVENT /* ON EVENT
@ -187,17 +196,23 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
/* GET DATA /* GET DATA
================================================== */ ================================================== */
if (type.of(d) == "string") { if (ie7) {
VMM.Timeline.DataObj.getData(d); $feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", "Internet Explorer 7 is not supported by Timeline.");
} else { } else {
VMM.Timeline.DataObj.getData(html_string); if (type.of(d) == "string") {
//VMM.attachElement(element, content); VMM.Timeline.DataObj.getData(d);
} else {
VMM.Timeline.DataObj.getData(html_string);
//VMM.attachElement(element, content);
}
//VMM.attachElement($timeline, "");
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", "Loading Timeline");
} }
//VMM.attachElement($timeline, "");
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", "Loading Timeline");
}; };

14
timeline-min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save