"; + + // TWEET MEDIA + if (typeof d.entities.media != 'undefined') { + if (d.entities.media[0].type == "photo") { + twit += "", + td = VMM.Util.linkify_with_twitter(d.text, "_blank"); + + // TWEET CONTENT + twit += td; + twit += "
ERROR LOADING TWEET " + tweet.mid + "
" ); + }) + .success(function(d) { + clearTimeout(twitter_timeout); + clearTimeout(callback_timeout); + callback(); + }); + + }, + + errorTimeOut: function(tweet) { + trace("TWITTER JSON ERROR TIMEOUT " + tweet.mid); + VMM.attachElement("#tweet_" + tweet.id, "Still waiting on Twitter: " + tweet.mid + "
" ); + + // CHECK RATE STATUS + VMM.getJSON("http://api.twitter.com/1/account/rate_limit_status.json", function(d) { + trace("REMAINING TWITTER API CALLS " + d.remaining_hits); + trace("TWITTER RATE LIMIT WILL RESET AT " + d.reset_time); + var mes = ""; + if (d.remaining_hits == 0) { + mes = "You've reached the maximum number of tweets you can load in an hour.
"; + mes += "You can view tweets again starting at:
" + d.reset_time + "
Still waiting on Twitter. " + id + "
"; + //mes = "Tweet " + id + " was not found.
"; + } + VMM.attachElement("#twitter_" + id, "" + mes + "" ); + }); + + }, + + pushQue: function() { + if (VMM.master_config.twitter.que.length > 0) { + VMM.ExternalAPI.twitter.create(VMM.master_config.twitter.que[0], VMM.ExternalAPI.twitter.pushQue); + VMM.master_config.twitter.que.remove(0); + } + }, + + + getHTML: function(id) { //var the_url = document.location.protocol + "//api.twitter.com/1/statuses/oembed.json?id=" + id+ "&callback=?"; var the_url = "http://api.twitter.com/1/statuses/oembed.json?id=" + id+ "&callback=?"; @@ -152,7 +247,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { twitterid: id }; var the_url = "http://api.twitter.com/1/statuses/show.json?id=" + id + "&include_entities=true&callback=?"; - var twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.notFoundError, 4000, id); + var twitter_timeout = setTimeout(VMM.ExternalAPI.twitter.errorTimeOut, VMM.master_config.timers.api, id); VMM.getJSON(the_url, VMM.ExternalAPI.twitter.formatJSON) .error(function(jqXHR, textStatus, errorThrown) { @@ -168,25 +263,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { }); }, - notFoundError: function(id) { - trace("TWITTER JSON ERROR TIMEOUT " + id); - VMM.attachElement("#twitter_" + id, "Error loading tweet: " + id + "
" ); - - // CHECK RATE STATUS - VMM.getJSON("http://api.twitter.com/1/account/rate_limit_status.json", function(d) { - trace("REMAINING TWITTER API CALLS " + d.remaining_hits); - trace("TWITTER RATE LIMIT WILL RESET AT " + d.reset_time); - var mes = ""; - if (d.remaining_hits == 0) { - mes = "You've reached the maximum number of tweets you can load in an hour.
"; - mes += "You can view tweets again starting at:
" + d.reset_time + "
Tweet " + id + " was not found.
"; - } - VMM.attachElement("#twitter_" + id, "" + mes + "" ); - }); - - }, + formatJSON: function(d) { var id = d.id_str; @@ -486,16 +563,24 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { googleplus: { get: function(user, activity) { - var api_key, gplus; - - + var api_key; var gplus = {user: user, activity: activity}; + VMM.master_config.googleplus.que.push(gplus); VMM.master_config.googleplus.active = true; }, - create: function(gplus) { - var mediaElem = "", api_key = "", gperson_api_url, gactivity_api_url, g_activity = "", g_content = "", g_attachments = ""; + create: function(gplus, callback) { + var mediaElem = "", + api_key = "", + g_activity = "", + g_content = "", + g_attachments = "", + gperson_api_url, + gactivity_api_url; + googleplus_timeout = setTimeout(VMM.ExternalAPI.googleplus.errorTimeOut, VMM.master_config.timers.api, gplus), + callback_timeout = setTimeout(callback, VMM.master_config.timers.api, gplus); + if (VMM.master_config.Timeline.api_keys.google != "") { api_key = VMM.master_config.Timeline.api_keys.google; @@ -584,16 +669,39 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { + }) + .error(function(jqXHR, textStatus, errorThrown) { + var error_obj = VMM.parseJSON(jqXHR.responseText); + trace(error_obj.error.message); + VMM.attachElement("#googleplus_" + gplus.activity, "ERROR LOADING GOOGLE+
" + error_obj.error.message + "
"); + }) + .success(function(d) { + clearTimeout(googleplus_timeout); + clearTimeout(callback_timeout); + callback(); }); + }, pushQue: function() { + if (VMM.master_config.googleplus.que.length > 0) { + VMM.ExternalAPI.googleplus.create(VMM.master_config.googleplus.que[0], VMM.ExternalAPI.googleplus.pushQue); + VMM.master_config.googleplus.que.remove(0); + } + /* for(var i = 0; i < VMM.master_config.googleplus.que.length; i++) { VMM.ExternalAPI.googleplus.create(VMM.master_config.googleplus.que[i]); } VMM.master_config.googleplus.que = []; + */ + }, + + errorTimeOut: function(gplus) { + trace("GOOGLE+ JSON ERROR TIMEOUT " + gplus.activity); + VMM.attachElement("#googleplus_" + gplus.activity, "Still waiting on GOOGLE+
" + gplus.activity + "
"); + } }, @@ -617,6 +725,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { }, pushQue: function() { + for(var i = 0; i < VMM.master_config.googledocs.que.length; i++) { VMM.ExternalAPI.googledocs.create(VMM.master_config.googledocs.que[i]); } @@ -628,39 +737,67 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { flickr: { get: function(mid, id) { - var api_key; + var flick = {mid: mid, id: id}; + VMM.master_config.flickr.que.push(flick); + VMM.master_config.flickr.active = true; + }, + + create: function(flick, callback) { + var api_key, + callback_timeout= setTimeout(callback, VMM.master_config.timers.api, flick); + if (VMM.master_config.Timeline.api_keys.flickr != "") { api_key = VMM.master_config.Timeline.api_keys.flickr; } else { api_key = Aes.Ctr.decrypt(VMM.master_config.api_keys_master.flickr, VMM.master_config.vp, 256) } - var the_url = "http://api.flickr.com/services/rest/?method=flickr.photos.getSizes&api_key=" + api_key + "&photo_id=" + mid + "&format=json&jsoncallback=?"; - VMM.getJSON(the_url, VMM.ExternalAPI.flickr.create); - }, - - create: function(d) { - var flickr_id = d.sizes.size[0].url.split("photos\/")[1].split("/")[1]; - var id = "flickr_" + flickr_id; - var flickr_large_id = id + "_large"; - var flickr_thumb_id = id + "_thumb"; - var flickr_img_size, flickr_img_thumb, flickr_size_found = false; - var flickr_best_size = "Large"; + var the_url = "http://api.flickr.com/services/rest/?method=flickr.photos.getSizes&api_key=" + api_key + "&photo_id=" + flick.mid + "&format=json&jsoncallback=?"; + + VMM.getJSON(the_url, function(d) { + var flickr_id = d.sizes.size[0].url.split("photos\/")[1].split("/")[1]; + + var flickr_large_id = "flickr_" + flick.id + "_large", + flickr_thumb_id = "flickr_" + flick.id + "_thumb"; + //flickr_thumb_id = "flickr_" + uid + "_thumb"; - flickr_best_size = VMM.ExternalAPI.flickr.sizes(VMM.master_config.sizes.api.height); + var flickr_img_size, + flickr_img_thumb, + flickr_size_found = false, + flickr_best_size = "Large"; - for(var i = 0; i < d.sizes.size.length; i++) { - if (d.sizes.size[i].label == flickr_best_size) { - flickr_size_found = true; - flickr_img_size = d.sizes.size[i].source; + flickr_best_size = VMM.ExternalAPI.flickr.sizes(VMM.master_config.sizes.api.height); + + for(var i = 0; i < d.sizes.size.length; i++) { + if (d.sizes.size[i].label == flickr_best_size) { + flickr_size_found = true; + flickr_img_size = d.sizes.size[i].source; + } } - } - if (!flickr_size_found) { - flickr_img_size = d.sizes.size[d.sizes.size.length - 1].source; - } + if (!flickr_size_found) { + flickr_img_size = d.sizes.size[d.sizes.size.length - 1].source; + } + + flickr_img_thumb = d.sizes.size[0].source; + VMM.Lib.attr("#"+flickr_large_id, "src", flickr_img_size); + VMM.attachElement("#"+flickr_thumb_id, "Wikipedia is not responding
" + "" ); + // TRY AGAIN? + clearTimeout(callback_timeout); + if (VMM.master_config.wikipedia.tries < 4) { + trace("WIKIPEDIA ATTEMPT " + VMM.master_config.wikipedia.tries); + trace(api_obj); + VMM.master_config.wikipedia.tries++; + VMM.ExternalAPI.wikipedia.create(api_obj, callback); + } else { + callback(); + } + + }) + .success(function(d) { + VMM.master_config.wikipedia.tries = 0; + clearTimeout(callback_timeout); + callback(); }); + }, pushQue: function() { - trace("WIKIPEDIA PUSH QUE"); - for(var i = 0; i < VMM.master_config.wikipedia.que.length; i++) { - VMM.ExternalAPI.wikipedia.create(VMM.master_config.wikipedia.que[i]); + + if (VMM.master_config.wikipedia.que.length > 0) { + trace("WIKIPEDIA PUSH QUE " + VMM.master_config.wikipedia.que.length); + VMM.ExternalAPI.wikipedia.create(VMM.master_config.wikipedia.que[0], VMM.ExternalAPI.wikipedia.pushQue); + VMM.master_config.wikipedia.que.remove(0); } - VMM.master_config.wikipedia.que = []; + }, }, @@ -903,11 +1068,15 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { VMM.master_config.vimeo.active = true; }, - create: function(d) { + create: function(d, callback) { trace("VIMEO CREATE"); // THUMBNAIL var url = "http://vimeo.com/api/v2/video/" + d + ".json"; - VMM.getJSON(url, VMM.ExternalAPI.vimeo.createThumb); + VMM.getJSON(url, function(d) { + VMM.ExternalAPI.vimeo.createThumb(d); + callback(); + }); + }, createThumb: function(d) { @@ -917,10 +1086,16 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { }, pushQue: function() { + if (VMM.master_config.vimeo.que.length > 0) { + VMM.ExternalAPI.vimeo.create(VMM.master_config.vimeo.que[0], VMM.ExternalAPI.vimeo.pushQue); + VMM.master_config.vimeo.que.remove(0); + } + /* for(var i = 0; i < VMM.master_config.vimeo.que.length; i++) { VMM.ExternalAPI.vimeo.create(VMM.master_config.vimeo.que[i]); } VMM.master_config.vimeo.que = []; + */ } } diff --git a/source/js/Media/VMM.MediaElement.js b/source/js/Media/VMM.MediaElement.js index 936ad30..837e992 100644 --- a/source/js/Media/VMM.MediaElement.js +++ b/source/js/Media/VMM.MediaElement.js @@ -27,7 +27,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') { mediaElem = ""; return mediaElem; } else if (m.type == "flickr") { - mediaElem = ""; + mediaElem = ""; return mediaElem; } else if (m.type == "instagram") { mediaElem = "![](" + VMM.ExternalAPI.instagram.get(m.id, true) + ")
" + VMM.master_config.language.messages.loading + "
"; @@ -108,18 +108,16 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') { mediaElem = "![](" + VMM.ExternalAPI.instagram.get(m.id) + ")