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

Fix for twitter protocol

pull/90/head
Zach Wise 13 years ago
parent
72f3b96d0d
commit
31f1cb60b8
14 changed files with 54 additions and 54 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. 8
      locale/de.js
  2. 8
      locale/en.js
  3. 8
      locale/es.js
  4. 8
      locale/fr.js
  5. 8
      locale/is.js
  6. 8
      locale/it.js
  7. 8
      locale/kr.js
  8. 8
      locale/nl.js
  9. 8
      locale/pt-br.js
  10. 8
      locale/zh-ch.js
  11. 8
      locale/zh-tw.js
  12. 6
      source/js/VMM.ExternalAPI.js
  13. 8
      timeline-min.js
  14. 6
      timeline.js

8
locale/de.js
View File

File diff suppressed because one or more lines are too long

8
locale/en.js
View File

File diff suppressed because one or more lines are too long

8
locale/es.js
View File

File diff suppressed because one or more lines are too long

8
locale/fr.js
View File

File diff suppressed because one or more lines are too long

8
locale/is.js
View File

File diff suppressed because one or more lines are too long

8
locale/it.js
View File

File diff suppressed because one or more lines are too long

8
locale/kr.js
View File

File diff suppressed because one or more lines are too long

8
locale/nl.js
View File

File diff suppressed because one or more lines are too long

8
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

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

@ -148,7 +148,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
trace("id " + id); trace("id " + id);
var twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.notFoundError, 4000, id); var twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.notFoundError, 4000, id);
VMM.getJSON(VMM.Util.correctProtocol(the_url), VMM.ExternalAPI.twitter.formatJSON) VMM.getJSON(the_url, VMM.ExternalAPI.twitter.formatJSON)
.error(function(jqXHR, textStatus, errorThrown) { .error(function(jqXHR, textStatus, errorThrown) {
trace("TWITTER error"); trace("TWITTER error");
trace("TWITTER ERROR: " + textStatus + " " + jqXHR.responseText); trace("TWITTER ERROR: " + textStatus + " " + jqXHR.responseText);
@ -481,9 +481,9 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
create: function(doc) { create: function(doc) {
var mediaElem = ""; var mediaElem = "";
if (doc.url.match(/docs.google.com/i)) { if (doc.url.match(/docs.google.com/i)) {
mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + VMM.Util.correctProtocol(doc.url) + "&amp;embedded=true'></iframe>"; mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + doc.url + "&amp;embedded=true'></iframe>";
} else { } else {
mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + VMM.Util.correctProtocol("http://docs.google.com/viewer?url=") + VMM.Util.correctProtocol(doc.url) + "&amp;embedded=true'></iframe>"; mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + "http://docs.google.com/viewer?url=" + doc.url + "&amp;embedded=true'></iframe>";
} }
VMM.attachElement("#"+doc.id, mediaElem); VMM.attachElement("#"+doc.id, mediaElem);
}, },

8
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

6
timeline.js
Unescape View File

@ -1624,7 +1624,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
trace("id " + id); trace("id " + id);
var twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.notFoundError, 4000, id); var twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.notFoundError, 4000, id);
VMM.getJSON(VMM.Util.correctProtocol(the_url), VMM.ExternalAPI.twitter.formatJSON) VMM.getJSON(the_url, VMM.ExternalAPI.twitter.formatJSON)
.error(function(jqXHR, textStatus, errorThrown) { .error(function(jqXHR, textStatus, errorThrown) {
trace("TWITTER error"); trace("TWITTER error");
trace("TWITTER ERROR: " + textStatus + " " + jqXHR.responseText); trace("TWITTER ERROR: " + textStatus + " " + jqXHR.responseText);
@ -1957,9 +1957,9 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
create: function(doc) { create: function(doc) {
var mediaElem = ""; var mediaElem = "";
if (doc.url.match(/docs.google.com/i)) { if (doc.url.match(/docs.google.com/i)) {
mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + VMM.Util.correctProtocol(doc.url) + "&amp;embedded=true'></iframe>"; mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + doc.url + "&amp;embedded=true'></iframe>";
} else { } else {
mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + VMM.Util.correctProtocol("http://docs.google.com/viewer?url=") + VMM.Util.correctProtocol(doc.url) + "&amp;embedded=true'></iframe>"; mediaElem = "<iframe class='doc' frameborder='0' width='100%' height='100%' src='" + "http://docs.google.com/viewer?url=" + doc.url + "&amp;embedded=true'></iframe>";
} }
VMM.attachElement("#"+doc.id, mediaElem); VMM.attachElement("#"+doc.id, mediaElem);
}, },

Write Preview
Loading…
Cancel
Save