diff --git a/source/js/VMM.js b/source/js/VMM.js index 4a62d8d..88ecd8a 100644 --- a/source/js/VMM.js +++ b/source/js/VMM.js @@ -1277,8 +1277,8 @@ if (typeof VMM == 'undefined') { mediaElem = ""; return mediaElem; } else if (m.type == "website") { - //mediaElem = "
"; - mediaElem = ""; + mediaElem = ""; + //mediaElem = ""; return mediaElem; } else { @@ -1367,8 +1367,8 @@ if (typeof VMM == 'undefined') { trace("NO KNOWN MEDIA TYPE FOUND TRYING TO JUST PLACE THE HTML"); mediaElem = VMM.Util.properQuotes(m.id); } else if (m.type == "website") { - //mediaElem = ""; - mediaElem = "" + ""; + mediaElem = ""; + //mediaElem = "" + ""; } else { trace("NO KNOWN MEDIA TYPE FOUND"); trace(m.type); diff --git a/source/js/timeline.js b/source/js/timeline.js index 0030fab..144bde1 100755 --- a/source/js/timeline.js +++ b/source/js/timeline.js @@ -1,5 +1,5 @@ /*! - Open Timeline 0.89 + Timeline 0.90 Designed and built by Zach Wise digitalartwork.net Date: April 8, 2012 @@ -49,8 +49,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') { VMM.Timeline = function(w, h, conf) { - var version = "0.89"; - trace("OPEN TIMELINE VERSION " + version); + var version = "0.90"; + trace("TIMELINE VERSION " + version); var $timeline = VMM.getElement("#timeline"); // expecting name only for parent var $feedback; diff --git a/timeline-min.js b/timeline-min.js index 06dc858..06d4e4c 100644 --- a/timeline-min.js +++ b/timeline-min.js @@ -1,14 +1 @@ -/* Verite - * Verite JS Master - * Version: 0.5 - * Date: April 5, 2012 - * Copyright 2012 Verite unless part of Verite Timeline, - * if part of Timeline then it inherits Timeline's license. - * Designed and built by Zach Wise digitalartwork.net - * ----------------------------------------------------- *//* CodeKit Import -================================================== *//* Simple JavaScript Inheritance - * By John Resig http://ejohn.org/ - * MIT Licensed. -================================================== */function trace(a){window.console?console.log(a):typeof jsTrace!="undefined"&&jsTrace.send(a)}function onYouTubePlayerAPIReady(){trace("GLOBAL YOUTUBE API CALLED");VMM.ExternalAPI.youtube.onAPIReady()}(function(){var a=!1,b=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(c){function g(){!a&&this.init&&this.init.apply(this,arguments)}var d=this.prototype;a=!0;var e=new this;a=!1;for(var f in c)e[f]=typeof c[f]=="function"&&typeof d[f]=="function"&&b.test(c[f])?function(a,b){return function(){var c=this._super;this._super=d[a];var e=b.apply(this,arguments);this._super=c;return e}}(f,c[f]):c[f];g.prototype=e;g.prototype.constructor=g;g.extend=arguments.callee;return g}})();var global=function(){return this||(1,eval)("this")}();if(typeof VMM=="undefined"){var VMM=Class.extend({});VMM.master_config={init:function(){return this},vp:"Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo",keys:{flickr:"RAIvxHY4hE/Elm5cieh4X5ptMyDpj7MYIxziGxi0WGCcy1s+yr7rKQ==",google:"jwNGnYw4hE9lmAez4ll0QD+jo6SKBJFknkopLS4FrSAuGfIwyj57AusuR0s8dAo="},youtube:{active:!1,array:[],api_loaded:!1,que:[]},googlemaps:{active:!1,map_active:!1,places_active:!1,array:[],api_loaded:!1,que:[]}}.init();VMM.createElement=function(a,b,c,d,e){var f="";if(a!=null&&a!=""){f+="<"+a;c!=null&&c!=""&&(f+=" class='"+c+"'");d!=null&&d!=""&&(f+=" "+d);e!=null&&e!=""&&(f+=" "+e);f+=">";b!=null&&b!=""&&(f+=b);f=f+""+a+">"}return f};VMM.createMediaElement=function(a,b,c){var d="",e=!1;d+="";d.content=e;d.raw=a;b.push(d);if(b.length==c){var g={tweetdata:b};VMM.fireEvent(global,"TWEETSLOADED",g)}}).success(function(){trace("second success")}).error(function(){trace("error")}).complete(function(){trace("complete")})}},getTweetSearch:function(a,b){var c=40;b!=null&&b!=""&&(c=b);var d="http://search.twitter.com/search.json?q="+a+"&rpp="+c+"&include_entities=true&result_type=mixed",e=[];VMM.getJSON(d,function(a){for(var b=0;b",f=VMM.Util.linkify_with_twitter(a.text,"_blank");e+=f;e+="
";e+="— "+a.user.name+" (@"+a.user.screen_name+") "+VMM.ExternalAPI.twitter.prettyParseTwitterDate(a.created_at)+"
";c.content=d;c.raw=a.results[b];e.push(c)}var g={tweetdata:e};VMM.fireEvent(global,"TWEETSLOADED",g)})},prettyHTML:function(a){var a=a.toString(),b={twitterid:a},c="http://api.twitter.com/1/statuses/show.json?id="+a+"&include_entities=true&callback=?";trace("id "+a);var d=setTimeout(VMM.ExternalAPI.twitter.notFoundError,4e3,a);VMM.getJSON(c,VMM.ExternalAPI.twitter.formatJSON).error(function(b,c,d){trace("TWITTER error");trace("TWITTER ERROR: "+c+" "+b.responseText);VMM.attachElement("#twitter_"+a,"",f=VMM.Util.linkify_with_twitter(a.results[b].text,"_blank");d+=f;d+="
";d+="— "+a.results[b].from_user_name+" (@"+a.results[b].from_user+") "+VMM.ExternalAPI.twitter.prettyParseTwitterDate(a.results[b].created_at)+"
ERROR LOADING TWEET "+a+"
")}).success(function(){clearTimeout(d)})},notFoundError:function(a){trace("TWITTER JSON ERROR TIMEOUT "+a);VMM.attachElement("#twitter_"+a,"TWEET NOT FOUND "+a+"
")},formatJSON:function(a){trace("TWITTER JSON LOADED F");trace(a);var b=a.id_str,c="";c+=" "+""+" ";c+=" ";VMM.attachElement("#twitter_"+b.toString(),c)}},googlemaps:{getMap:function(a,b){var c=VMM.Util.getUrlVars(a);trace(c);var d="http://maps.googleapis.com/maps/api/js?key="+Aes.Ctr.decrypt(VMM.master_config.keys.google,VMM.master_config.vp,256)+"&libraries=places&sensor=false&callback=VMM.ExternalAPI.googlemaps.onMapAPIReady",e={url:a,vars:c,id:b};if(VMM.master_config.googlemaps.active)VMM.master_config.googlemaps.createMap(e);else{VMM.master_config.googlemaps.que.push(e);VMM.master_config.googlemaps.api_loaded||VMM.LoadLib.js(d,function(){trace("Google Maps API Library Loaded")})}},onMapAPIReady:function(){VMM.master_config.googlemaps.map_active=!0;VMM.master_config.googlemaps.places_active=!0;VMM.ExternalAPI.googlemaps.onAPIReady()},onPlacesAPIReady:function(){VMM.master_config.googlemaps.places_active=!0;VMM.ExternalAPI.googlemaps.onAPIReady()},onAPIReady:function(){if(!VMM.master_config.googlemaps.active&&VMM.master_config.googlemaps.map_active&&VMM.master_config.googlemaps.places_active){VMM.master_config.googlemaps.active=!0;for(var a=0;a",d=VMM.Util.linkify_with_twitter(a.text,"_blank");c+=d;c+="