Merge branch 'master' of github.com:imathis/octopress

This commit is contained in:
Brandon Mathis 2011-09-26 09:12:03 -05:00
commit 02433114c5
3 changed files with 38 additions and 42 deletions

View File

@ -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);
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 (a.valueOf() == b.valueOf()) return 0;
return a.valueOf() > b.valueOf() ? -1 : 1;
});
if (aDate === bDate) { return 0; }
return aDate > bDate ? -1 : 1;
});
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();
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();
}
};
})();

View File

@ -6,7 +6,7 @@ function getNav() {
mobileNav.children('select').append('<option value="'+link.href+'">&bull; '+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)),

View File

@ -30,9 +30,9 @@ module Jekyll
@img['title'] = title
@img['alt'] = alt
else
@img['alt'] = @img['title'].gsub!(/"/, '&#34;')
@img['alt'] = @img['title'].gsub!(/"/, '&#34;') if @img['title']
end
@img['class'].gsub!(/"/, '')
@img['class'].gsub!(/"/, '') if @img['class']
end
super
end