From bf1ff113a7d36a8d49def8e6d60d7153d33a5453 Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Wed, 28 Sep 2011 21:33:39 -0700 Subject: [PATCH] Move external JS libs to their own directory. --- r2/Makefile | 3 ++- r2/r2/lib/js.py | 16 ++++++++++------ r2/r2/public/static/jquery.js | 2 +- r2/r2/public/static/js/autoresize.jquery.min.js | 7 ------- .../static/js/{ => lib}/jquery-1.6.1.min.js | 0 .../static/js/{ => lib}/jquery.cycle.min.js | 0 r2/r2/public/static/js/{ => lib}/jquery.flot.js | 0 r2/r2/public/static/js/{ => lib}/jquery.js | 0 .../static/js/{ => lib}/jquery.json-1.3.js | 0 r2/r2/public/static/js/{ => lib}/jquery.json.js | 0 .../static/js/{ => lib}/jquery.lazyload.js | 0 r2/r2/public/static/js/{ => lib}/ui.core.js | 0 .../public/static/js/{ => lib}/ui.datepicker.js | 0 r2/r2/templates/selfserveblurb.html | 2 +- 14 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 r2/r2/public/static/js/autoresize.jquery.min.js rename r2/r2/public/static/js/{ => lib}/jquery-1.6.1.min.js (100%) rename r2/r2/public/static/js/{ => lib}/jquery.cycle.min.js (100%) rename r2/r2/public/static/js/{ => lib}/jquery.flot.js (100%) rename r2/r2/public/static/js/{ => lib}/jquery.js (100%) rename r2/r2/public/static/js/{ => lib}/jquery.json-1.3.js (100%) rename r2/r2/public/static/js/{ => lib}/jquery.json.js (100%) rename r2/r2/public/static/js/{ => lib}/jquery.lazyload.js (100%) rename r2/r2/public/static/js/{ => lib}/ui.core.js (100%) rename r2/r2/public/static/js/{ => lib}/ui.datepicker.js (100%) diff --git a/r2/Makefile b/r2/Makefile index f12986dca..4c5f3ad20 100644 --- a/r2/Makefile +++ b/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) diff --git a/r2/r2/lib/js.py b/r2/r2/lib/js.py index 58d018088..fe759496c 100755 --- a/r2/r2/lib/js.py +++ b/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) diff --git a/r2/r2/public/static/jquery.js b/r2/r2/public/static/jquery.js index d6f931991..474fd0b3f 120000 --- a/r2/r2/public/static/jquery.js +++ b/r2/r2/public/static/jquery.js @@ -1 +1 @@ -js/jquery.js \ No newline at end of file +js/lib/jquery.js \ No newline at end of file diff --git a/r2/r2/public/static/js/autoresize.jquery.min.js b/r2/r2/public/static/js/autoresize.jquery.min.js deleted file mode 100644 index 5f94833a9..000000000 --- a/r2/r2/public/static/js/autoresize.jquery.min.js +++ /dev/null @@ -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); \ No newline at end of file diff --git a/r2/r2/public/static/js/jquery-1.6.1.min.js b/r2/r2/public/static/js/lib/jquery-1.6.1.min.js similarity index 100% rename from r2/r2/public/static/js/jquery-1.6.1.min.js rename to r2/r2/public/static/js/lib/jquery-1.6.1.min.js diff --git a/r2/r2/public/static/js/jquery.cycle.min.js b/r2/r2/public/static/js/lib/jquery.cycle.min.js similarity index 100% rename from r2/r2/public/static/js/jquery.cycle.min.js rename to r2/r2/public/static/js/lib/jquery.cycle.min.js diff --git a/r2/r2/public/static/js/jquery.flot.js b/r2/r2/public/static/js/lib/jquery.flot.js similarity index 100% rename from r2/r2/public/static/js/jquery.flot.js rename to r2/r2/public/static/js/lib/jquery.flot.js diff --git a/r2/r2/public/static/js/jquery.js b/r2/r2/public/static/js/lib/jquery.js similarity index 100% rename from r2/r2/public/static/js/jquery.js rename to r2/r2/public/static/js/lib/jquery.js diff --git a/r2/r2/public/static/js/jquery.json-1.3.js b/r2/r2/public/static/js/lib/jquery.json-1.3.js similarity index 100% rename from r2/r2/public/static/js/jquery.json-1.3.js rename to r2/r2/public/static/js/lib/jquery.json-1.3.js diff --git a/r2/r2/public/static/js/jquery.json.js b/r2/r2/public/static/js/lib/jquery.json.js similarity index 100% rename from r2/r2/public/static/js/jquery.json.js rename to r2/r2/public/static/js/lib/jquery.json.js diff --git a/r2/r2/public/static/js/jquery.lazyload.js b/r2/r2/public/static/js/lib/jquery.lazyload.js similarity index 100% rename from r2/r2/public/static/js/jquery.lazyload.js rename to r2/r2/public/static/js/lib/jquery.lazyload.js diff --git a/r2/r2/public/static/js/ui.core.js b/r2/r2/public/static/js/lib/ui.core.js similarity index 100% rename from r2/r2/public/static/js/ui.core.js rename to r2/r2/public/static/js/lib/ui.core.js diff --git a/r2/r2/public/static/js/ui.datepicker.js b/r2/r2/public/static/js/lib/ui.datepicker.js similarity index 100% rename from r2/r2/public/static/js/ui.datepicker.js rename to r2/r2/public/static/js/lib/ui.datepicker.js diff --git a/r2/r2/templates/selfserveblurb.html b/r2/r2/templates/selfserveblurb.html index 505d2ac40..c47e6c2bf 100644 --- a/r2/r2/templates/selfserveblurb.html +++ b/r2/r2/templates/selfserveblurb.html @@ -23,7 +23,7 @@ from r2.lib.pages import Feedback %> - +