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

Merge pull request #780 from alaasdk/master 

add secure calls to twitter API.
pull/782/head
Joe Germuska 10 years ago
parent
c1d3d44515 3703dfb542
commit
c1344af19f
3 changed files with 6 additions and 6 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
      build/js/timeline-min.js
  2. 4
      build/js/timeline.js
  3. 4
      source/js/Core/Media/VMM.ExternalAPI.js

2
build/js/timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

4
build/js/timeline.js
Unescape View File

@ -2923,7 +2923,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
getOEmbed: function(tweet, callback) { getOEmbed: function(tweet, callback) {
var the_url = "//api.twitter.com/1/statuses/oembed.json?id=" + tweet.mid + "&omit_script=true&include_entities=true&callback=?", var the_url = "https://api.twitter.com/1/statuses/oembed.json?id=" + tweet.mid + "&omit_script=true&include_entities=true&callback=?",
twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.errorTimeOutOembed, VMM.master_config.timers.api, tweet); twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.errorTimeOutOembed, VMM.master_config.timers.api, tweet);
//callback_timeout= setTimeout(callback, VMM.master_config.timers.api, tweet); //callback_timeout= setTimeout(callback, VMM.master_config.timers.api, tweet);
@ -2967,7 +2967,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
getHTML: function(id) { getHTML: function(id) {
//var the_url = document.location.protocol + "//api.twitter.com/1/statuses/oembed.json?id=" + id+ "&callback=?"; //var the_url = document.location.protocol + "//api.twitter.com/1/statuses/oembed.json?id=" + id+ "&callback=?";
var the_url = "//api.twitter.com/1/statuses/oembed.json?id=" + id+ "&omit_script=true&include_entities=true&callback=?"; var the_url = "https://api.twitter.com/1/statuses/oembed.json?id=" + id+ "&omit_script=true&include_entities=true&callback=?";
VMM.getJSON(the_url, VMM.ExternalAPI.twitter.onJSONLoaded); VMM.getJSON(the_url, VMM.ExternalAPI.twitter.onJSONLoaded);
}, },

4
source/js/Core/Media/VMM.ExternalAPI.js
Unescape View File

@ -166,7 +166,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
getOEmbed: function(tweet, callback) { getOEmbed: function(tweet, callback) {
var the_url = "//api.twitter.com/1/statuses/oembed.json?id=" + tweet.mid + "&omit_script=true&include_entities=true&callback=?", var the_url = "https://api.twitter.com/1/statuses/oembed.json?id=" + tweet.mid + "&omit_script=true&include_entities=true&callback=?",
twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.errorTimeOutOembed, VMM.master_config.timers.api, tweet); twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.errorTimeOutOembed, VMM.master_config.timers.api, tweet);
//callback_timeout= setTimeout(callback, VMM.master_config.timers.api, tweet); //callback_timeout= setTimeout(callback, VMM.master_config.timers.api, tweet);
@ -210,7 +210,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
getHTML: function(id) { getHTML: function(id) {
//var the_url = document.location.protocol + "//api.twitter.com/1/statuses/oembed.json?id=" + id+ "&callback=?"; //var the_url = document.location.protocol + "//api.twitter.com/1/statuses/oembed.json?id=" + id+ "&callback=?";
var the_url = "//api.twitter.com/1/statuses/oembed.json?id=" + id+ "&omit_script=true&include_entities=true&callback=?"; var the_url = "https://api.twitter.com/1/statuses/oembed.json?id=" + id+ "&omit_script=true&include_entities=true&callback=?";
VMM.getJSON(the_url, VMM.ExternalAPI.twitter.onJSONLoaded); VMM.getJSON(the_url, VMM.ExternalAPI.twitter.onJSONLoaded);
}, },

Write Preview
Loading…
Cancel
Save