Skip to content

Commit

Permalink
Update timeline.js
Browse files Browse the repository at this point in the history
replace the protocol-relative twitter API URL.. with explicit secured protocol (https) for twitter calls, as it doesn't accept non-SSL calls.
  • Loading branch information
alaasdk committed Apr 21, 2015
1 parent 5aa103b commit fb4b9a9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build/js/timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -2923,7 +2923,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {

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);
//callback_timeout= setTimeout(callback, VMM.master_config.timers.api, tweet);

Expand Down Expand Up @@ -2967,7 +2967,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {

getHTML: function(id) {
//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);
},

Expand Down

0 comments on commit fb4b9a9

Please sign in to comment.