Permalink
Browse files

Remove trailing whitespace

  • Loading branch information...
shell committed Jan 1, 2012
1 parent e563c8c commit 78059095f7ca4de1ae3f8b01f825f9926c444645
Showing with 144 additions and 132 deletions.
  1. +1 −1 .gitignore
  2. +2 −1 Gemfile
  3. +11 −0 Gemfile.lock
  4. +1 −1 app/coffeescripts/app.coffee
  5. +1 −1 app/coffeescripts/routers/Welcome.coffee
  6. +1 −1 app/coffeescripts/views/welcome/Index.coffee
  7. +1 −1 app/controllers/admin/featured_videos_controller.rb
  8. +1 −1 app/controllers/admin/recent_videos_controller.rb
  9. +1 −1 app/controllers/application_controller.rb
  10. +1 −1 app/controllers/home_controller.rb
  11. +1 −1 app/controllers/invites_controller.rb
  12. +1 −1 app/controllers/playlists_controller.rb
  13. +1 −1 app/controllers/registrations_controller.rb
  14. +1 −1 app/controllers/sessions_controller.rb
  15. +1 −1 app/controllers/users_controller.rb
  16. +1 −1 app/controllers/videos_controller.rb
  17. +5 −5 app/helpers/layout_helper.rb
  18. +1 −1 app/helpers/playlist_helper.rb
  19. +2 −2 app/mailers/user_mailer.rb
  20. +1 −1 app/models/playlist.rb
  21. +8 −8 app/models/youtube.rb
  22. +1 −1 app/stylesheets/application.sass
  23. +1 −1 app/stylesheets/jquery-fallr-changes.sass
  24. +1 −1 app/stylesheets/layout.sass
  25. +1 −1 app/stylesheets/playlist.sass
  26. +1 −1 app/stylesheets/plugins.sass
  27. +3 −3 app/stylesheets/styles.sass
  28. +1 −1 app/views/admin/featured_videos/index.html.haml
  29. +2 −2 app/views/admin/recent_videos/index.html.haml
  30. +1 −1 app/views/devise/confirmations/new.html.erb
  31. +1 −1 app/views/devise/passwords/edit.html.erb
  32. +1 −1 app/views/devise/passwords/new.html.erb
  33. +1 −1 app/views/devise/sessions/new.html.erb
  34. +1 −1 app/views/devise/shared/_links.erb
  35. +1 −1 app/views/devise/unlocks/new.html.erb
  36. +2 −2 app/views/home/index.html.haml
  37. +1 −1 app/views/invites/accept.html.haml
  38. +5 −5 app/views/invites/create.js.erb
  39. +1 −1 app/views/invites/generate.js.erb
  40. +3 −3 app/views/jukeboxes/_form.html.haml
  41. +1 −1 app/views/jukeboxes/index.html.haml
  42. +1 −1 app/views/jukeboxes/show.html.haml
  43. +1 −1 app/views/layouts/_footer.html.haml
  44. +1 −1 app/views/layouts/_login.html.haml
  45. +1 −1 app/views/layouts/_signup_form.html.haml
  46. +1 −1 app/views/layouts/application.html.haml
  47. +1 −1 app/views/playlists/_add_playlist.html.haml
  48. +2 −2 app/views/playlists/_header.html.haml
  49. +2 −2 app/views/playlists/_invites_box.html.haml
  50. +3 −3 app/views/playlists/_options.html.haml
  51. +1 −1 app/views/playlists/_playlist.html.haml
  52. +1 −1 app/views/playlists/_playlist_invited.html.haml
  53. +1 −1 app/views/playlists/_playlist_queue.html.haml
  54. +1 −1 app/views/playlists/_search_youtube.html.haml
  55. +1 −1 app/views/playlists/_search_youtube_form.html.haml
  56. +1 −1 app/views/playlists/create.js.erb
  57. +1 −1 app/views/playlists/destroy.js.erb
  58. +2 −2 app/views/playlists/index.html.haml
  59. +1 −1 app/views/playlists/new.html.haml
  60. +5 −5 app/views/playlists/shared.html.haml
  61. +3 −3 app/views/playlists/show.html.haml
  62. +1 −1 app/views/playlists/update.js.erb
  63. +3 −3 app/views/registrations/create.js.erb
  64. +3 −3 app/views/user_mailer/collaboration_invite.html.haml
  65. +4 −4 app/views/users/_form.html.haml
  66. +1 −1 app/views/users/_settings.html.haml
  67. +1 −1 app/views/users/index.html.haml
  68. +2 −2 app/views/users/show.html.haml
  69. +1 −1 app/views/users/update.js.erb
  70. +1 −1 app/views/videos/_actions.html.haml
  71. +2 −2 app/views/videos/_video.html.haml
  72. +1 −1 app/views/videos/_yt_actions.html.haml
  73. +1 −1 app/views/videos/create.js.erb
  74. +1 −1 app/views/videos/hate.js.erb
  75. +1 −1 app/views/videos/love.js.erb
  76. +1 −1 app/views/videos/move.js.erb
  77. +3 −3 app/views/videos/reorder.js.erb
  78. +2 −2 app/views/videos/ytsearch.js.erb
  79. +1 −1 config/application.rb
  80. +1 −1 config/deploy.rb
  81. +1 −1 config/environments/development.rb
  82. +1 −1 config/environments/production.rb
  83. +1 −1 config/setup_load_paths.rb
  84. +1 −1 db/migrate/20110921123258_devise_create_users.rb
  85. +1 −1 db/migrate/20111006123246_add_description_to_playlist.rb
  86. +1 −1 db/migrate/20111015115619_add_avatar_columns_to_user.rb
  87. +1 −1 db/migrate/20111019121635_add_ask_for_promotion_field.rb
  88. +1 −1 lib/tasks/sass.rake
View
@@ -2,4 +2,4 @@
db/*.sqlite3
log/*.log
tmp/
-public/system
+public/system
View
@@ -28,7 +28,8 @@ gem 'unicorn'
gem 'capistrano'
group :development do
+ gem 'rails_best_practices'
gem 'rails-footnotes', '>= 3.7.5.rc4'
end
-# gem 'ruby-debug19', :require => 'ruby-debug'
+# gem 'ruby-debug19', :require => 'ruby-debug'
View
@@ -49,6 +49,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.1.2)
+ colored (1.2)
compass (0.11.5)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -106,6 +107,7 @@ GEM
cocaine (>= 0.0.2)
mime-types
polyglot (0.3.2)
+ progressbar (0.9.2)
rack (1.2.4)
rack-mount (0.6.14)
rack (>= 1.0.0)
@@ -121,6 +123,13 @@ GEM
railties (= 3.0.9)
rails-footnotes (3.7.5)
rails (>= 3.0.0)
+ rails_best_practices (1.7.2)
+ activesupport
+ colored
+ erubis
+ i18n
+ progressbar
+ sexp_processor
railties (3.0.9)
actionpack (= 3.0.9)
activesupport (= 3.0.9)
@@ -134,6 +143,7 @@ GEM
rest-client (1.6.7)
mime-types (>= 1.16)
sass (3.1.8)
+ sexp_processor (3.0.9)
therubyracer (0.9.4)
libv8 (~> 3.3.10)
thor (0.14.6)
@@ -173,6 +183,7 @@ DEPENDENCIES
paperclip (~> 2.4)
rails (= 3.0.9)
rails-footnotes (>= 3.7.5.rc4)
+ rails_best_practices
rest-client
sass
therubyracer
@@ -7,7 +7,7 @@ window.App =
init: ->
new window.App.Routers.Welcome()
Backbone.history.start()
-
+
$(->
window.App.init()
)
@@ -1,7 +1,7 @@
window.App.Routers.Welcome = Backbone.Router.extend
routes:
"": "index"
-
+
index: ->
new window.App.Views.Welcome()
@@ -5,7 +5,7 @@ window.App.Views.Index = Backbone.View.extend
initialize: ->
_.bindAll this, 'render'
@render()
-
+
render: ->
$(@el).html JST['welcome/index']()
@
@@ -31,4 +31,4 @@ def admin_only!
end
end
-end
+end
@@ -12,4 +12,4 @@ def admin_only!
redirect_to root_path
end
end
-end
+end
@@ -12,4 +12,4 @@ def has_access_to(user, playlist)
playlist && user && (playlist.user == user || playlist.members.include?(user) || playlist.invited_members.include?(user))
end
-end
+end
@@ -2,4 +2,4 @@ class HomeController < ApplicationController
def index
@featured_playlists = Playlist.includes(:user).featured
end
-end
+end
@@ -65,4 +65,4 @@ def generate_for_plisters
render :generate
end
-end
+end
@@ -55,4 +55,4 @@ def shared
@invited_me = PlaylistInvite.for_user(@user.id)
end
-end
+end
@@ -10,4 +10,4 @@ def after_sign_up_path_for(resource)
user_playlist_path(resource, resource.playlists.first)
end
-end
+end
@@ -9,4 +9,4 @@ def create
def new
redirect_to '/'
end
-end
+end
@@ -25,4 +25,4 @@ def update
end
end
-end
+end
@@ -86,4 +86,4 @@ def hate
end
-end
+end
@@ -1,20 +1,20 @@
module LayoutHelper
-
+
def title(page_title, show_title = true)
@content_for_title = page_title.to_s
@show_title = show_title
end
-
+
def show_title?
@show_title
end
-
+
def include_stylesheet(*args)
content_for(:head) { stylesheet_link_tag(*args.map(&:to_s)) }
end
-
+
def include_javascript(*args)
args = args.map { |arg| arg == :defaults ? arg : arg.to_s }
content_for(:head) { javascript_include_tag(*args) }
end
-end
+end
@@ -99,4 +99,4 @@ def shared_playlits
end
-end
+end
@@ -1,9 +1,9 @@
class UserMailer < ActionMailer::Base
default :from => "from@plist.tv"
-
+
def collaboration_invite(invite)
@invite = invite
- mail(:to => @invite.user.email,
+ mail(:to => @invite.user.email,
:subject => "you've been invited to collaborate on #{@invite.playlist.title}") do |format|
format.html
end
View
@@ -60,7 +60,7 @@ def has_member?(user)
def accessible_by(user)
self.user == user || self.has_member?(user)
end
-
+
def accessible_via(access_token)
link_invite && (link_invite.invite_token == access_token || link_invite('plisters').invite_token == access_token)
end
View
@@ -46,14 +46,14 @@ def search_youtube_videos(phrase, opts)
title = entry["title"]["$t"]
Video.new(:ytid => ytid, :title => title)
}
- end
-
+ end
+
def filter_user_videos(videos, user)
videos = filter_plisted_videos(videos, user) if !user.show_plisted
videos = filter_hated_videos(videos, user) if !user.show_filtered_videos
videos
end
-
+
def filter_plisted_videos(videos, user)
if !user.show_plisted
plisted = user.videos.collect(&:ytid)
@@ -69,18 +69,18 @@ def filter_hated_videos(videos, user)
end
videos
end
-
+
def get_properties(ytid)
yt_feed= RestClient.get("http://gdata.youtube.com/feeds/api/videos/#{ytid}?v=2&alt=json")
yt_video= JSON.parse(yt_feed)
yt_title= yt_video["entry"]["title"]["$t"]
{:title => yt_title}
end
-
+
def get_thumbnail_url(ytid)
"http://img.youtube.com/vi/#{ytid}/2.jpg"
end
end
-
-
-end
+
+
+end
@@ -5,4 +5,4 @@
@import "styles"
@import "playlist"
-@import "home"
+@import "home"
@@ -28,7 +28,7 @@
-moz-box-shadow: inset #bbb 0px 0px 5px
-webkit-box-shadow: inset #bbb 0px 0px 5px
input.invite_field
- width: 235px
+ width: 235px
#fallr-wrapper
.avatar-field
@@ -76,4 +76,4 @@ table.featured
padding: 5px 5px
border-bottom: 1px solid #e7e7e7
.promote
- background-color: rgba(0, 0, 255, 0.1)
+ background-color: rgba(0, 0, 255, 0.1)
@@ -278,4 +278,4 @@
.options-description
margin: 10px 0px 0px 0px
p
- width: 350px
+ width: 350px
@@ -4,4 +4,4 @@
@import "clickmenu-changes"
@import "jquery-fallr-changes"
-@import "minibutton"
+@import "minibutton"
@@ -525,7 +525,7 @@ a
background-color: #eee
padding: 0 0 5px
position: absolute
- right: 121px
+ right: 121px
top: 30px
width: auto
min-width: 130px
@@ -563,7 +563,7 @@ a
border-bottom: 1px solid #ddd
li:last-child
border-bottom: none
-
+
.my-playlists
#login-user-playlists
display: none
@@ -586,4 +586,4 @@ a
height: 15px
margin-left: 10px
color: white
- padding: 2px 7px
+ padding: 2px 7px
@@ -28,4 +28,4 @@ Highlighted - playlists which waiting to be featured
%strong published
- else
not published
- = f.submit "Update"
+ = f.submit "Update"
@@ -1,7 +1,7 @@
-.recent-playlists
+.recent-playlists
%h2 Recently Created pLists
- if @recent_playlists.size > 0
%ul
= render :partial => 'playlists/playlist', :collection => @recent_playlists
- else
- No Recent playlists for a moment
+ No Recent playlists for a moment
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
@@ -13,4 +13,4 @@
<div><%= f.submit "Change my password" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
@@ -9,4 +9,4 @@
<div><%= f.submit "Send me reset password instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
@@ -14,4 +14,4 @@
<div><%= f.submit "Sign in" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
@@ -22,4 +22,4 @@
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
-<% end -%>
+<% end -%>
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend unlock instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "devise/shared/links" %>
@@ -3,11 +3,11 @@
= link_to "Create your own pList", '#', :class => 'create-playlist create-playlist-btn'
- else
= link_to "Create your own pList", '#', :class => 'create-playlist', :id => "login-to-create"
-
+
.recent-playlists
%h2 Featured pLists
- if @featured_playlists.size > 0
%ul
= render :partial => 'playlists/playlist', :collection => @featured_playlists
- else
- No Special videos for a moment
+ No Special videos for a moment
Oops, something went wrong.

0 comments on commit 7805909

Please sign in to comment.