diff options
| author | Tommy Chen <tommy351@gmail.com> | 2012-06-03 04:35:21 +0200 |
|---|---|---|
| committer | Tommy Chen <tommy351@gmail.com> | 2012-06-03 04:40:55 +0200 |
| commit | 94270a6ab47692520b18fd136342f05c496deaeb (patch) | |
| tree | c5703af62bfa7d9d9bcc20d2167d1541ded8b307 /source | |
| parent | e3cc2b2ff5d96ed69c982c100692a1745bc261ef (diff) | |
| download | octopress-theme-jeyzu-94270a6ab47692520b18fd136342f05c496deaeb.zip octopress-theme-jeyzu-94270a6ab47692520b18fd136342f05c496deaeb.tar.gz | |
rewrite caption.js & isolate fancybox
Diffstat (limited to 'source')
| -rw-r--r-- | source/_includes/after_footer.html | 2 | ||||
| -rw-r--r-- | source/_includes/fancybox.html | 6 | ||||
| -rw-r--r-- | source/javascripts/caption.js | 15 | ||||
| -rw-r--r-- | source/javascripts/slash.js | 30 |
4 files changed, 24 insertions, 29 deletions
diff --git a/source/_includes/after_footer.html b/source/_includes/after_footer.html index b7beed2..c49811f 100644 --- a/source/_includes/after_footer.html +++ b/source/_includes/after_footer.html @@ -1,4 +1,4 @@ -<script src="{{ root_url }}/javascripts/jquery.fancybox.pack.js"></script> <script src="{{ root_url }}/javascripts/slash.js"></script> +{% include fancybox.html %} <!-- Delete or comment this line to disable Fancybox --> {% include disqus.html %} {% include custom/after_footer.html %}
\ No newline at end of file diff --git a/source/_includes/fancybox.html b/source/_includes/fancybox.html new file mode 100644 index 0000000..fd5bcfd --- /dev/null +++ b/source/_includes/fancybox.html @@ -0,0 +1,6 @@ +<script src="{{ root_url }}/javascripts/jquery.fancybox.pack.js"></script> +<script type="text/javascript"> +(function($){ + $('.fancybox').fancybox(); +})(jQuery); +</script>
\ No newline at end of file diff --git a/source/javascripts/caption.js b/source/javascripts/caption.js deleted file mode 100644 index 8dc3856..0000000 --- a/source/javascripts/caption.js +++ /dev/null @@ -1,15 +0,0 @@ -(function($){ - $('.entry').each(function(i){ - var _i = i; - $(this).find('img').each(function(){ - var alt = $(this).attr('alt'); - - if (alt == '' || typeof alt == 'undefined'){ - $(this).wrap('<a href="'+$(this).attr('src')+'" class="fancybox" rel="gallery'+_i+'" />'); - } else { - $(this).after('<span class="caption">'+alt+'</span>').wrap('<a href="'+$(this).attr('src')+'" class="fancybox" title="'+alt+'" rel="gallery'+_i+'" />'); - } - }); - }); - $('.fancybox').fancybox(); -})(jQuery);
\ No newline at end of file diff --git a/source/javascripts/slash.js b/source/javascripts/slash.js index 0105d69..1e2649d 100644 --- a/source/javascripts/slash.js +++ b/source/javascripts/slash.js @@ -7,7 +7,7 @@ var href = this.href, link = href.replace(/https?:\/\/([^\/]+)(.*)/, '$1'); - if (link != host){ + if (link != '' && link != host && !$(this).hasClass('fancybox')){ window.open(href); e.preventDefault(); } @@ -49,19 +49,23 @@ }); }; - /* caption.js */ - $('.entry').each(function(i){ - var _i = i; - $(this).find('img').each(function(){ - var alt = $(this).attr('alt'); + // Append caption after pictures + var appendCaption = function(){ + $('.entry').each(function(i){ + var _i = i; + $(this).find('img').each(function(){ + var alt = this.alt; - if (alt == '' || typeof alt == 'undefined'){ - $(this).wrap('<a href="'+$(this).attr('src')+'" class="fancybox" rel="gallery'+_i+'" />'); - } else { - $(this).after('<span class="caption">'+alt+'</span>').wrap('<a href="'+$(this).attr('src')+'" class="fancybox" title="'+alt+'" rel="gallery'+_i+'" />'); - } + if (alt != ''){ + $(this).after('<span class="caption">'+alt+'</span>'); + } + + $(this).wrap('<a href="'+this.src+'" title="'+alt+'" class="fancybox" rel="gallery'+_i+'" />'); + }); }); - }); - $('.fancybox').fancybox(); + }; + externalLinks(); // Delete or comment this line to disable opening external links in new window + navigationMenu(); // Delete or comment this line to disable menu for mobile device + appendCaption(); // Delete or comment this line to disable caption })(jQuery);
\ No newline at end of file |