From 503de3efe1fcd77c33458859a8f2fa7c2d652b9a Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Sat, 28 May 2011 18:18:22 -0700
Subject: [PATCH] Fix facebox close button and loading gif

---
 config/assets.yml                                        | 2 +-
 .../javascripts/{vendor/facebox.js => facebox-custom.js} | 2 +-
 public/javascripts/view.js                               | 4 +---
 public/stylesheets/sass/application.sass                 | 9 ++++-----
 spec/javascripts/support/jasmine.yml                     | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)
 rename public/javascripts/{vendor/facebox.js => facebox-custom.js} (99%)

diff --git a/config/assets.yml b/config/assets.yml
index e0d5b438f..d354dd0e8 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -16,13 +16,13 @@ javascripts:
     - public/javascripts/vendor/jquery.autoresize.min.js
     - public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js
     - public/javascripts/vendor/jquery.expander.js
-    - public/javascripts/vendor/facebox.js
     - public/javascripts/vendor/timeago.js
     - public/javascripts/vendor/Mustache.js
     - public/javascripts/vendor/charCount.js
     - public/javascripts/jquery.infinitescroll-custom.js
     - public/javascripts/jquery.autocomplete-custom.js
     - public/javascripts/jquery.infieldlabel-custom.js
+    - public/javascripts/facebox-custom.js
     - public/javascripts/keycodes.js
     - public/javascripts/fileuploader-custom.js
     - public/javascripts/diaspora.js
diff --git a/public/javascripts/vendor/facebox.js b/public/javascripts/facebox-custom.js
similarity index 99%
rename from public/javascripts/vendor/facebox.js
rename to public/javascripts/facebox-custom.js
index e0906f000..5927a1ce2 100755
--- a/public/javascripts/vendor/facebox.js
+++ b/public/javascripts/facebox-custom.js
@@ -104,7 +104,7 @@
       showOverlay()
 
       $('#facebox .content').empty()
-      $('#facebox .body').children().hide().end().
+      $('#facebox .content').children().hide().end().
         append('<div class="loading"><img src="'+$.facebox.settings.loadingImage+'"/></div>')
 
       $('#facebox').css({
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 26cd67927..aead3e5fb 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -45,7 +45,7 @@ var View = {
     /* User menu */
     $(this.userMenu.selector)
       .click(this.userMenu.click);
-      
+
     /* Dropdowns */
     $(this.dropdowns.selector)
       .live('click', this.dropdowns.click);
@@ -71,8 +71,6 @@ var View = {
       .click(this.reshareButton.removeFocus);
 
     /* facebox */
-    $.facebox.settings.closeImage = '/images/facebox/closelabel.png';
-    $.facebox.settings.loadingImage = '/images/facebox/loading.gif';
     $('a[rel*=facebox]').facebox();
     $(document).bind('reveal.facebox', function() {
       Diaspora.widgets.directionDetector.updateBinds();
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index dd0dca431..1d55ff81d 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2407,11 +2407,6 @@ ul.show_comments,
       :size 11px
       :weight normal
 
-#facebox
-  .close
-    :display none
-  .diaspora_alert~.close
-    :display block
 
 #aspect_edit_controls
   :margin
@@ -2897,3 +2892,7 @@ h1.tag
 
   &:active
     @include linear-gradient(darken(#D9FFA9,20%),darken(#B9E68A,20%))
+
+#facebox
+  input[type='text'], input.text
+    :width 98%
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index db177e801..347b3537c 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -20,8 +20,8 @@ src_files:
   - public/javascripts/vendor/Mustache.js
   - public/javascripts/vendor/charCount.js
   - public/javascripts/vendor/timeago.js
-  - public/javascripts/vendor/facebox.js
   - public/javascripts/jquery.autocomplete-custom.js
+  - public/javascripts/vendor/facebox-custom.js
   - public/javascripts/diaspora.js
   - public/javascripts/keycodes.js
   - public/javascripts/widgets/alert.js