diff options
author | Brandon Mathis <brandon@imathis.com> | 2011-09-26 09:12:03 -0500 |
---|---|---|
committer | Brandon Mathis <brandon@imathis.com> | 2011-09-26 09:12:03 -0500 |
commit | 02433114c53d2fb95ebbda6179cd058c2057f142 (patch) | |
tree | f45705636a2d29fe3fce4632f3ed2eae18e30928 /.themes | |
parent | 7a7825f6679ec91df7df3993f58238e021f82675 (diff) | |
parent | fdf6af1d25ddc991c96dc3b4df5f7e913adcd7ef (diff) | |
download | my_new_personal_website-02433114c53d2fb95ebbda6179cd058c2057f142.tar.xz my_new_personal_website-02433114c53d2fb95ebbda6179cd058c2057f142.zip |
Merge branch 'master' of github.com:imathis/octopress
Diffstat (limited to '.themes')
-rw-r--r-- | .themes/classic/source/javascripts/github.js | 70 | ||||
-rw-r--r-- | .themes/classic/source/javascripts/octopress.js | 6 |
2 files changed, 36 insertions, 40 deletions
diff --git a/.themes/classic/source/javascripts/github.js b/.themes/classic/source/javascripts/github.js index 623d493f..01877435 100644 --- a/.themes/classic/source/javascripts/github.js +++ b/.themes/classic/source/javascripts/github.js @@ -1,43 +1,39 @@ -github = (function(){ - function render(target, repos){ - var i = 0, fragment = '', t = $(target)[0]; +var github = (function(){ + function render(target, repos){ + var i = 0, fragment = '', t = $(target)[0]; - for(i = 0; i < repos.length; i++) - fragment += '<li><a href="'+repos[i].url+'">'+repos[i].name+'</a><p>'+repos[i].description+'</p></li>'; - - t.innerHTML = fragment; + for(i = 0; i < repos.length; i++) { + fragment += '<li><a href="'+repos[i].url+'">'+repos[i].name+'</a><p>'+repos[i].description+'</p></li>'; } - return { - showRepos: function(options){ - var feed = new jXHR(); - feed.onerror = function (msg,url) { - $(options.target + ' li.loading').addClass('error').text("Error loading feed"); - } - feed.onreadystatechange = function(data){ - if (feed.readyState === 4) { - var repos = []; - var i; - for (i = 0; i < data.repositories.length; i++){ - if (options.skip_forks && data.repositories[i].fork) - continue; - repos.push(data.repositories[i]); - } - repos.sort(function(a, b){ - var a = new Date(a.pushed_at), - b = new Date(b.pushed_at); - - if (a.valueOf() == b.valueOf()) return 0; - return a.valueOf() > b.valueOf() ? -1 : 1; - }); + t.innerHTML = fragment; + } + return { + showRepos: function(options){ + var feed = new jXHR(); + feed.onerror = function (msg,url) { + $(options.target + ' li.loading').addClass('error').text("Error loading feed"); + }; + feed.onreadystatechange = function(data) { + if (feed.readyState === 4) { + var repos = []; + for (var i = 0; i < data.repositories.length; i++){ + if (options.skip_forks && data.repositories[i].fork) { continue; } + repos.push(data.repositories[i]); + } + repos.sort(function(a, b) { + var aDate = new Date(a.pushed_at).valueOf(), + bDate = new Date(b.pushed_at).valueOf(); - if (options.count) - repos.splice(options.count); + if (aDate === bDate) { return 0; } + return aDate > bDate ? -1 : 1; + }); - render(options.target, repos) - } - }; - feed.open("GET","http://github.com/api/v2/json/repos/show/"+options.user+"?callback=?"); - feed.send(); + if (options.count) { repos.splice(options.count); } + render(options.target, repos); } - }; + }; + feed.open("GET","http://github.com/api/v2/json/repos/show/"+options.user+"?callback=?"); + feed.send(); + } + }; })();
\ No newline at end of file diff --git a/.themes/classic/source/javascripts/octopress.js b/.themes/classic/source/javascripts/octopress.js index 35174fd8..c369625e 100644 --- a/.themes/classic/source/javascripts/octopress.js +++ b/.themes/classic/source/javascripts/octopress.js @@ -6,7 +6,7 @@ function getNav() { mobileNav.children('select').append('<option value="'+link.href+'">• '+link.text+'</option>'); }); mobileNav.children('select').bind('change', function(event) { - if (event.target.value) window.location.href = event.target.value; + if (event.target.value) { window.location.href = event.target.value; } }); } @@ -52,7 +52,7 @@ function testFeatures() { } function addCodeLineNumbers() { - if (navigator.appName == 'Microsoft Internet Explorer') { return; } + if (navigator.appName === 'Microsoft Internet Explorer') { return; } $('div.gist-highlight').each(function(code) { var tableStart = '<table><tbody><tr><td class="gutter">', lineNumbers = '<pre class="line-numbers">', @@ -72,7 +72,7 @@ function flashVideoFallback(){ flashplayerskin = "/assets/jwplayer/glow/glow.xml"; $('video').each(function(video){ video = $(video); - if (!Modernizr.video.h264 && swfobject.getFlashPlayerVersion() || window.location.hash.indexOf("flash-test") != -1){ + if (!Modernizr.video.h264 && swfobject.getFlashPlayerVersion() || window.location.hash.indexOf("flash-test") !== -1){ video.children('source[src$=mp4]').first().map(function(source){ var src = $(source).attr('src'), id = 'video_'+Math.round(1 + Math.random()*(100000)), |