nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
zhitomirskiyi 2011-01-13 15:11:33 -08:00
commit 560d9fe37f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/comment.rb
View file

@ -34,6 +34,7 @@ class Comment
belongs_to :person, :class_name => "Person" belongs_to :person, :class_name => "Person"
validates_presence_of :text, :diaspora_handle, :post validates_presence_of :text, :diaspora_handle, :post
validates_length_of :text, :maximum => 500
validates_with HandleValidator validates_with HandleValidator
before_save do before_save do

6
public/javascripts/vendor/facebox.js vendored
View file

@ -85,15 +85,15 @@
settings: { settings: {
opacity : 0.2, opacity : 0.2,
overlay : true, overlay : true,
loadingImage : '/facebox/loading.gif', loadingImage : '/images/facebox/loading.gif',
closeImage : '/facebox/closelabel.png', closeImage : '/images/facebox/closelabel.png',
imageTypes : [ 'png', 'jpg', 'jpeg', 'gif' ], imageTypes : [ 'png', 'jpg', 'jpeg', 'gif' ],
faceboxHtml : '\ faceboxHtml : '\
<div id="facebox" style="display:none;"> \ <div id="facebox" style="display:none;"> \
<div class="popup"> \ <div class="popup"> \
<div class="content"> \ <div class="content"> \
</div> \ </div> \
<a href="#" class="close"><img src="/facebox/closelabel.png" title="close" class="close_image" /></a> \ <a href="#" class="close"><img src="/images/facebox/closelabel.png" title="close" class="close_image" /></a> \
</div> \ </div> \
</div>' </div>'
}, },