Move external JS libs to their own directory.

r2/Makefile

@@ -21,7 +21,8 @@
 ################################################################################
 
 # Javascript files to be compressified
-js_sources           = jquery.json.js jquery.reddit.js reddit.js base.js ui.core.js ui.datepicker.js sponsored.js jquery.flot.js jquery.lazyload.js compact.js blogbutton.js flair.js analytics.js
+js_libs              = $(addprefix lib/,json2.js ui.core.js ui.datepicker.js jquery.flot.js jquery.lazyload.js)
+js_sources           = $(js_libs) jquery.reddit.js reddit.js base.js sponsored.js compact.js blogbutton.js flair.js analytics.js
 js_targets           = button.js jquery.flot.js sponsored.js
 localized_js_targets = reddit.js mobile.js
 localized_js_outputs = $(localized_js_targets:.js=.*.js)

r2/r2/lib/js.py

@@ -162,6 +162,7 @@ class LocalizedModule(Module):
 
 class JQuery(Module):
     def __init__(self, cdn_src=None):
+        Module.__init__(self, "jquery.js")
         self.cdn_src = cdn_src or "http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery"
     
     def build(self, closure):
@@ -170,7 +171,8 @@ class JQuery(Module):
     def use(self):
         from r2.lib.template_helpers import static
         if c.secure or c.user.pref_local_js:
-            return script_tag.format(src=static("jquery.js"))
+            path = os.path.join(g.static_path, self.name)
+            return script_tag.format(src=static(path))
         else:
             ext = ".js" if g.uncompressedJS else ".min.js"
             return script_tag.format(src=self.cdn_src+ext)
@@ -180,7 +182,7 @@ module = {}
 module["jquery"] = JQuery()
 
 module["reddit"] = LocalizedModule("reddit.js",
-    "jquery.json.js",
+    "lib/jquery.json.js",
     "jquery.reddit.js",
     "base.js",
     "analytics.js",
@@ -190,7 +192,7 @@ module["reddit"] = LocalizedModule("reddit.js",
 
 module["mobile"] = LocalizedModule("mobile.js",
     module["reddit"],
-    "jquery.lazyload.js",
+    "lib/jquery.lazyload.js",
     "compact.js"
 )
 
@@ -200,12 +202,14 @@ module["button"] = Module("button.js",
 )
 
 module["sponsored"] = Module("sponsored.js",
-    "ui.core.js",
-    "ui.datepicker.js",
+    "lib/ui.core.js",
+    "lib/ui.datepicker.js",
     "sponsored.js"
 )
 
-module["flot"] = Module("jquery.flot.js")
+module["flot"] = Module("jquery.flot.js",
+    "lib/jquery.flot.js"
+)
 
 def use(*names):
     return "\n".join(module[name].use() for name in names)

r2/r2/public/static/jquery.js

@@ -1 +1 @@
-js/jquery.js
+js/lib/jquery.js

r2/r2/public/static/js/autoresize.jquery.min.js

@@ -1,7 +0,0 @@
-/*
- * jQuery autoResize (textarea auto-resizer)
- * @copyright James Padolsey http://james.padolsey.com
- * @version 1.04
- */
-
-(function(a){a.fn.autoResize=function(j){var b=a.extend({onResize:function(){},animate:true,animateDuration:150,animateCallback:function(){},extraSpace:20,limit:1000},j);this.filter('textarea').each(function(){var c=a(this).css({resize:'none','overflow-y':'hidden'}),k=c.height(),f=(function(){var l=['height','width','lineHeight','textDecoration','letterSpacing'],h={};a.each(l,function(d,e){h[e]=c.css(e)});return c.clone().removeAttr('id').removeAttr('name').css({position:'absolute',top:0,left:-9999}).css(h).attr('tabIndex','-1').insertBefore(c)})(),i=null,g=function(){f.height(0).val(a(this).val()).scrollTop(10000);var d=Math.max(f.scrollTop(),k)+b.extraSpace,e=a(this).add(f);if(i===d){return}i=d;if(d>=b.limit){a(this).css('overflow-y','');return}b.onResize.call(this);b.animate&&c.css('display')==='block'?e.stop().animate({height:d},b.animateDuration,b.animateCallback):e.height(d)};c.unbind('.dynSiz').bind('keyup.dynSiz',g).bind('keydown.dynSiz',g).bind('change.dynSiz',g)});return this}})(jQuery);

r2/r2/templates/selfserveblurb.html

@@ -23,7 +23,7 @@
 from r2.lib.pages import Feedback
 %>
 <link rel="stylesheet" type="text/css" href="/static/selfserve_ads/style.css"/>
-<script src="/static/js/jquery.cycle.min.js" type="text/javascript"></script>
+<script src="/static/js/lib/jquery.cycle.min.js" type="text/javascript"></script>
 <script src="/static/selfserve_ads/script.js" type="text/javascript"></script>
 
 <div class="self-service instructions">