From 9c0c5a725819f2a020df025eda082dc5143acc51 Mon Sep 17 00:00:00 2001
From: Jason Robinson <jaywink@basshero.org>
Date: Sun, 7 Apr 2013 00:06:02 +0300
Subject: [PATCH] Include missing javascript in bookmarklet, regression
 introduced in commit ffc6c1102efdc5fa7d320a306d168d7feb3c191f. Fixes #4057

---
 Changelog.md                                    |  1 +
 app/views/status_messages/bookmarklet.html.haml |  2 ++
 spec/javascripts/bookmarklet-spec.js            | 12 +++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 667c8d3ad..5f87019e8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -115,6 +115,7 @@ by them self.
 * Remove unnecessary dotted CSS borders. [#2940](https://github.com/diaspora/diaspora/issues/2940)
 * Fix default image url in profiles table. [#3795](https://github.com/diaspora/diaspora/issues/3795)
 * Fix mobile buttons are only clickable when scrolled to the top. [#4102](https://github.com/diaspora/diaspora/issues/4102)
+* Fix regression in bookmarklet causing uneditable post contents. [#4057](https://github.com/diaspora/diaspora/issues/4057)
 
 ## Features
 
diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml
index fb626ee07..7a2951cd4 100644
--- a/app/views/status_messages/bookmarklet.html.haml
+++ b/app/views/status_messages/bookmarklet.html.haml
@@ -2,6 +2,8 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
+= javascript_include_tag :home
+
 #new_status_message_pane
   .span-15.last
     %h4
diff --git a/spec/javascripts/bookmarklet-spec.js b/spec/javascripts/bookmarklet-spec.js
index fee57d0e7..9e854760a 100644
--- a/spec/javascripts/bookmarklet-spec.js
+++ b/spec/javascripts/bookmarklet-spec.js
@@ -37,8 +37,18 @@ describe("bookmarklet", function() {
       });
     });
   });
+  
+  describe("modified prefilled bookmarklet", function(){
+    it('allows changing of post content', function(){
+      spec.loadFixture('prefilled_bookmarklet');
+      $('div.mentions > div').html('Foo Bar');
+      _.defer(function() {
+        expect($("#publisher #status_message_text").val()).toEqual("Foo Bar");
+      });
+    });
+  });
 
 
 
 
-});
\ No newline at end of file
+});