Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.

Gemfile.lock

@@ -39,10 +39,10 @@ GIT
 
 GIT
   remote: git://github.com/jnunemaker/mongomapper.git
-  revision: b24db29c236f239d6a5a821fb6a444430e89f9d6
+  revision: 9f22809a04f13b37db9078371a524aff67fafd70
   branch: rails3
   specs:
-    mongo_mapper (0.8.4)
+    mongo_mapper (0.8.6)
       activemodel (~> 3.0.0)
       activesupport (~> 3.0.0)
       plucky (~> 0.3.6)
@@ -108,7 +108,7 @@ GEM
     addressable (2.2.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    aws (2.3.24)
+    aws (2.3.25)
       activesupport
       http_connection
       uuidtools
@@ -148,7 +148,7 @@ GEM
       uuidtools
     childprocess (0.1.3)
       ffi (~> 0.6.3)
-    columnize (0.3.1)
+    columnize (0.3.2)
     configuration (1.1.0)
     crack (0.1.8)
     cucumber (0.9.3)
@@ -229,7 +229,7 @@ GEM
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
-    multi_json (0.0.4)
+    multi_json (0.0.5)
     multipart-post (1.0.1)
     net-ldap (0.1.1)
     net-scp (1.0.4)
@@ -323,10 +323,10 @@ GEM
       rspec-expectations (~> 2.0.1)
     rspec-rails (2.0.1)
       rspec (~> 2.0.0)
-    ruby-debug (0.10.3)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
+      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.3)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
@@ -348,7 +348,7 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.14.3)
+    thor (0.14.4)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     twitter (0.9.12)

app/views/js/_websocket_js.haml

@@ -2,9 +2,9 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
+= javascript_include_tag 'vendor/FABridge', 'vendor/swfobject', 'vendor/web_socket'
 :javascript
-  WebSocket.__swfLocation = "#{javascript_path 'WebSocketMain.swf'}";
+  WebSocket.__swfLocation = "#{javascript_path 'vendor/WebSocketMain.swf'}";
   $(document).ready(function(){
     function debug(str){ $("#debug").append("<p>" +  str); };
 

app/views/layouts/application.html.haml

@@ -14,20 +14,20 @@
     = stylesheet_link_tag "blueprint/print", :media => 'print'
 
     = stylesheet_link_tag "application", "ui"
-    = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1"
+    = stylesheet_link_tag "vendor/jquery.fancybox-1.3.1"
-    = stylesheet_link_tag "fileuploader"
+    = stylesheet_link_tag "vendor/fileuploader"
-    = stylesheet_link_tag "tipsy"
+    = stylesheet_link_tag "vendor/tipsy"
 
     - if current_user
       %link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"}
     
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery-1.4.2.min', 'rails'
+    = javascript_include_tag 'vendor/jquery-1.4.2.min', 'rails'
-    = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
+    = javascript_include_tag 'vendor/jquery.infieldlabel', 'vendor/jquery.cycle/jquery.cycle.min.js'
-    = javascript_include_tag 'jquery.tipsy'
+    = javascript_include_tag 'vendor/jquery.tipsy'
 
-    = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
+    = javascript_include_tag 'vendor/fancybox/jquery.fancybox-1.3.1.pack'
-    = javascript_include_tag 'fileuploader'
+    = javascript_include_tag 'vendor/fileuploader'
 
     = javascript_include_tag 'view', 'image_picker', 'stream'
 

spec/javascripts/support/jasmine.yml

@@ -11,8 +11,8 @@
 #   - dist/**/*.js
 #
 src_files:
-  - public/javascripts/jquery142.js
+  - public/javascripts/vendor/jquery142.js
-  - public/javascripts/jquery-ui-1.8.4.custom.min.js
+  - public/javascripts/vendor/jquery-ui-1.8.4.custom.min.js
   - public/javascripts/aspect-edit.js
 
 # stylesheets