aboutsummaryrefslogtreecommitdiff
path: root/themes/classic/source/javascripts
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-06-24 17:17:35 -0400
committerBrandon Mathis <brandon@imathis.com>2011-06-24 17:17:35 -0400
commitef3ff431e5c3028b764d1938bb552a76c340799c (patch)
treeb6d606ab522422238063f41e3334b3d7492fe69d /themes/classic/source/javascripts
parenta128d4990b6a346076bb07892ecdab868fdce467 (diff)
downloadmy_new_personal_website-ef3ff431e5c3028b764d1938bb552a76c340799c.tar.xz
my_new_personal_website-ef3ff431e5c3028b764d1938bb552a76c340799c.zip
1. Added html5 video with flash fallback.
2. Added Rack support 3. Disqus support 4. Improved Readme 5. Improved Syntax flexibility and styling 6. Improved blockquote styling
Diffstat (limited to 'themes/classic/source/javascripts')
-rw-r--r--themes/classic/source/javascripts/octopress.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/themes/classic/source/javascripts/octopress.js b/themes/classic/source/javascripts/octopress.js
index 611357a9..680cb76b 100644
--- a/themes/classic/source/javascripts/octopress.js
+++ b/themes/classic/source/javascripts/octopress.js
@@ -74,7 +74,7 @@ function flashVideoFallback(){
id = 'video_'+Math.round(1 + Math.random()*(100000)),
width = video.attr('width'),
height = parseInt(video.attr('height')) + 30;
- video.after('<div class="flash-video" style="width: '+width+'px; height: '+height+'px;"><div><div id='+id+'>');
+ video.after('<div class="flash-video"><div><div id='+id+'>');
swfobject.embedSWF(flashplayerlocation, id, width, height + 30, "9.0.0",
{ file : src, image : video.attr('poster'), skin : flashplayerskin } ,
{ movie : src, wmode : "opaque", allowfullscreen : "true" });
@@ -101,8 +101,8 @@ function wrapFlashVideos(){
$.domReady(function(){
testFeatures();
- flashVideoFallback();
wrapFlashVideos();
+ flashVideoFallback();
addCodeLineNumbers();
getNav();
addSidebarToggler();
@@ -141,5 +141,3 @@ b=j.userAgent.toLowerCase(),d=j.platform.toLowerCase(),g=d?/win/.test(d):/win/.t
10),e[1]=parseInt(c.replace(/^.*\.(.*)\s.*$/,"$1"),10),e[2]=/[a-zA-Z]/.test(c)?parseInt(c.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}else if(typeof v.ActiveXObject!=l)try{var f=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");if(f&&(c=f.GetVariable("$version")))k=!0,c=c.split(" ")[1].split(","),e=[parseInt(c[0],10),parseInt(c[1],10),parseInt(c[2],10)]}catch(h){}return{w3:a,pv:e,wk:b,ie:k,win:g,mac:d}}();return{embedSWF:function(a,b,d,i,k,e,c,f,h){var j={success:!1,id:b};if(g.w3&&!(g.wk&&g.wk<312)&&
a&&b&&d&&i&&k){d+="";i+="";var p={};if(f&&typeof f===o)for(var m in f)p[m]=f[m];p.data=a;p.width=d;p.height=i;a={};if(c&&typeof c===o)for(var n in c)a[n]=c[n];if(e&&typeof e===o)for(var r in e)typeof a.flashvars!=l?a.flashvars+="&"+r+"="+e[r]:a.flashvars=r+"="+e[r];if(t(k))b=s(p,a,b),j.success=!0,j.ref=b}h&&h(j)},ua:g,getFlashPlayerVersion:function(){return{major:g.pv[0],minor:g.pv[1],release:g.pv[2]}},hasFlashPlayerVersion:t,createSWF:function(a,b,d){if(g.w3)return s(a,b,d)},getQueryParamValue:function(a){var b=
i.location.search||i.location.hash;if(b){/\?/.test(b)&&(b=b.split("?")[1]);if(a==null)return u(b);for(var b=b.split("&"),d=0;d<b.length;d++)if(b[d].substring(0,b[d].indexOf("="))==a)return u(b[d].substring(b[d].indexOf("=")+1))}return""}}}();
-
-