Skip to content

Commit

Permalink
Big clean up: delete trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorian authored and mrmemes-eth committed Sep 26, 2010
1 parent fd69f02 commit 6ffc03a
Show file tree
Hide file tree
Showing 60 changed files with 273 additions and 273 deletions.
6 changes: 3 additions & 3 deletions COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ including the two.

You must obey the GNU Affero General Public License V3 or later in all respects
for all of the code used other than OpenSSL or the components mentioned
above. If you modify file(s) with this exception, you may extend this
exception to your version of the file(s), but you are not obligated to
above. If you modify file(s) with this exception, you may extend this
exception to your version of the file(s), but you are not obligated to
do so. If you do not wish to do so, delete this exception statement from your
version. If you delete this exception statement from all source files in the
version. If you delete this exception statement from all source files in the
program, then also delete it here.
2 changes: 1 addition & 1 deletion app/controllers/aspects_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def destroy
begin
current_user.drop_aspect @aspect
flash[:notice] = i18n.t 'aspects.destroy.success',:name => @aspect.name
rescue RuntimeError => e
rescue RuntimeError => e
flash[:error] = e.message
end

Expand Down
6 changes: 3 additions & 3 deletions app/models/person.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def exported_key= new_key
def self.by_webfinger( identifier, opts = {})
#need to check if this is a valid email structure, maybe should do in JS
local_person = Person.first(:diaspora_handle => identifier.gsub('acct:', '').to_s.downcase)

if local_person
Rails.logger.info("Do not need to webfinger, found a local person #{local_person.real_name}")
local_person
Expand All @@ -100,9 +100,9 @@ def self.from_webfinger_profile( identifier, profile)
new_person = Person.new

public_key_entry = profile.links.select{|x| x.rel == 'diaspora-public-key'}

return nil unless public_key_entry

pubkey = public_key_entry.first.href
new_person.exported_key = Base64.decode64 pubkey

Expand Down
10 changes: 5 additions & 5 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def aspect( opts = {} )
def drop_aspect( aspect )
if aspect.people.size == 0
aspect.destroy
else
else
raise "Aspect not empty"
end
end
Expand Down Expand Up @@ -106,11 +106,11 @@ def post(class_name, options = {})
intitial_post(class_name, aspect_ids, options)
end

def intitial_post(class_name, aspect_ids, options = {})
def intitial_post(class_name, aspect_ids, options = {})
post = build_post(class_name, options)
post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
push_to_aspects(post, aspect_ids)
post
post
end

def repost( post, options = {} )
Expand All @@ -137,9 +137,9 @@ def validate_aspect_permissions(aspect_ids)
end

aspect_ids.each do |aspect_id|
unless self.aspects.find(aspect_id)
unless self.aspects.find(aspect_id)
raise ArgumentError.new("Cannot post to an aspect you do not own.")
end
end
end

aspect_ids
Expand Down
2 changes: 1 addition & 1 deletion app/views/albums/_album.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
%div.image_cycle
- for photo in post.photos[0..3]
= link_to (image_tag photo.url(:thumb_large)), album_path(post, :aspect => @aspect)

2 changes: 1 addition & 1 deletion app/views/aspects/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- content_for :page_title do
= link_to t('.photos'), albums_path(:aspect => @aspect)


- content_for :left_pane do
= render "shared/aspect_friends"
Expand Down
8 changes: 4 additions & 4 deletions app/views/aspects/manage.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-# the COPYRIGHT file.
- content_for :head do
- content_for :head do
= javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
= javascript_include_tag 'aspect-edit.js'

Expand Down Expand Up @@ -34,7 +34,7 @@
%ul#aspect_list
- for aspect in @aspects
%li.aspect

.aspect_name
%span.edit_name_field
%h1{:contenteditable => true}= aspect.name
Expand All @@ -44,9 +44,9 @@
%li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
%li= link_to t('.show'), aspect_path(aspect)
%li!= remove_link(aspect)

%ul.dropzone{:id => aspect.id}

-if aspect.people.size < 1
%li.grey Drag to add people

Expand Down
2 changes: 1 addition & 1 deletion app/views/comments/_comment.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-# the COPYRIGHT file.
%li.comment{:id => post.id}
%li.comment{:id => post.id}
= person_image_tag(post.person)
%span.from
= link_to post.person.real_name, post.person
Expand Down
2 changes: 1 addition & 1 deletion app/views/comments/_comments.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
= render 'comments/comment', :post => comment
%li.comment.show
= render 'comments/new_comment', :post => post

4 changes: 2 additions & 2 deletions app/views/devise/sessions/new.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%h1
This is a technology preview, do not provide any private information.
%h3
your account may be deleted until we move into a more stable development period.
%h3
your account may be deleted until we move into a more stable development period.
%h3
USE AT YOUR OWN RISK!!
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
Expand Down
20 changes: 10 additions & 10 deletions app/views/js/_websocket_js.haml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@

if (obj['class']=="retractions"){
processRetraction(obj['post_id']);

}else if (obj['class']=="comments"){
processComment(obj['post_id'], obj['html'])
processComment(obj['post_id'], obj['html'])

}else if (obj['class']=='photos' && onPageForClass('albums')){
processPhotoInAlbum(obj['photo_hash'])
}else{
processPost(obj['class'], obj['html'], obj['aspect_ids'])
}

};

};
ws.onclose = function() { debug("socket closed"); };
ws.onopen = function() {
ws.send(location.pathname);
Expand Down Expand Up @@ -66,7 +66,7 @@
$(html).fadeIn("fast", function(){
$("#stream label:first").inFieldLabels();
})
);
);
}
}

Expand All @@ -77,13 +77,13 @@
html = "<div class=\'image_thumb\' id=\'"+photoHash['id']+"\' style=\'padding-right:3px;\'> \
<a href=\"/photos/"+ photoHash['id'] +"\"> \
<img alt=\"New thumbnail\" src=\""+ photoHash['thumb_url'] +"\" /> \
</a> </div>"
</a> </div>"
$("#thumbnails").append( $(html) )
$("#"+ photoHash['id'] + " img").load( function() {
$(this).fadeIn("slow");
});
}

function onPageForClass(className){
return (location.href.indexOf(className) != -1 );
}
Expand All @@ -100,9 +100,9 @@
}

function onPageForAspect(aspectId){
return (location.href.indexOf(aspectId) != -1 )
return (location.href.indexOf(aspectId) != -1 )
}

function onPageOne() {
var c = document.location.search.charAt(document.location.search.length-1);
return ((c =='') || (c== '1'));
Expand Down
10 changes: 5 additions & 5 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@
= "#{current_user.real_name} | diaspora" if current_user

%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "application", "ui"
= stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1"
= stylesheet_link_tag "fileuploader"
= stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1"
= stylesheet_link_tag "fileuploader"
/= 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 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
= javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
= javascript_include_tag 'fileuploader'
= javascript_include_tag 'view', 'image_picker', 'stream'
= render 'js/websocket_js'
= csrf_meta_tag
= yield(:head)
Expand Down
10 changes: 5 additions & 5 deletions app/views/layouts/session_wall.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
DIASPORA | login
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
%meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" }
= stylesheet_link_tag "sessions"
/= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
= javascript_include_tag 'jquery142'
= javascript_include_tag 'jquery.infieldlabel'
:javascript
$(document).ready(function(){
$("#user_username").focus();
$("#user_username").focus();
$("label").inFieldLabels();
});

= csrf_meta_tag
= yield(:head)

Expand All @@ -44,11 +44,11 @@
</div>
</div>
<![endif]-->

- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
%div#huge_text
DIASPORA*
= yield

/= link_to "signup", "/signup"
2 changes: 1 addition & 1 deletion app/views/people/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
%ul#stream
- for person in @people
= render 'people/person', :person => person

= will_paginate @people
4 changes: 2 additions & 2 deletions app/views/people/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
= f.label :url
%br
= f.text_field :url

=f.fields_for :profile do |p|
%p
= p.label :first_name
%br
= p.text_field :first_name

%p
= p.label :last_name
%br
Expand Down
2 changes: 1 addition & 1 deletion app/views/people/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
= link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button"

.span-20.last

.span-19.last
- if @posts
%ul#stream
Expand Down
6 changes: 3 additions & 3 deletions app/views/photos/_new_photo.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
:javascript
function createUploader(){
function createUploader(){
var uploader = new qq.FileUploader({
element: document.getElementById('file-upload'),
params: {'album_id' : "#{@album.id}"},
allowedExtensions: ['jpg', 'jpeg', 'png', 'gif'],
action: "#{photos_path}"
});
});
}
window.onload = createUploader;
window.onload = createUploader;

#file-upload
4 changes: 2 additions & 2 deletions app/views/photos/_photo.haml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
%br
= render "albums/album", :post => post.album, :current_user => current_user
= link_to (image_tag post.url(:thumb_medium)), object_path(post)

.info
= link_to(how_long_ago(post), photo_path(post))
\--
= link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
= render "comments/comments", :post => post
= render "comments/comments", :post => post
2 changes: 1 addition & 1 deletion app/views/photos/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@
%h4{:class => "show_post_comments"}
= "#{t('.comments')} (#{@photo.comments.count})"
= render "comments/comments", :post => @photo

4 changes: 2 additions & 2 deletions app/views/posts/_post.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
%ul
%h3= link_to post.class, object_path(post)
%h3= link_to post.class, object_path(post)
- for field in object_fields(post)
%li= "#{field}: #{post.attributes[field]}"
%li= "#{field}: #{post.attributes[field]}"
Loading

0 comments on commit 6ffc03a

Please sign in to comment.