Skip to content

Commit

Permalink
Include missing javascript in bookmarklet, regression introduced in c…
Browse files Browse the repository at this point in the history
…ommit ffc6c11. Fixes diaspora#4057
  • Loading branch information
jaywink committed Apr 6, 2013
1 parent 0149dbf commit 9c0c5a7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions app/views/status_messages/bookmarklet.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion spec/javascripts/bookmarklet-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});
});
});




});
});

0 comments on commit 9c0c5a7

Please sign in to comment.