Merge pull request #6 from jjgod/master

Fix loading moment.min.js from non-root path
hexojs · Jan 21, 2013 · 323e61a · 323e61a
2 parents 52d86ef + f20393b
commit 323e61a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/layout/_widget/twitter.ejs b/layout/_widget/twitter.ejs
@@ -6,6 +6,7 @@
 
 <script type="text/javascript">
 var twitter_stream = ['<%= theme.twitter.username %>', <%= theme.twitter.tweet_count %>, <%= theme.twitter.show_replies %>];
+var moment_js_path = '<%- config.root %>js/moment.min.js';
 </script>
 <script src="<%- config.root %>js/twitter.js"></script>
-<% } %>
+<% } %>
diff --git a/source/js/twitter.js b/source/js/twitter.js
@@ -1,5 +1,5 @@
 (function($){
-  $.getScript('/js/moment.min.js', function(){
+  $.getScript(moment_js_path, function(){
     var url = 'https://api.twitter.com/1/statuses/user_timeline/' + twitter_stream[0] + '.json?count=' + twitter_stream[1] + '&exclude_replies=' + (twitter_stream[2] ? 0 : 1) + '&trim_user=true&callback=?';
 
     var linkify = function(text){
@@ -22,4 +22,4 @@
       $('#tweets').html(result);
     });
   });
-})(jQuery);
+})(jQuery);