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

Merge pull request #6981 from AugierLe42e/fix-6979

Browse source 
Fixes #6979
This commit is contained in:
Steffen van Bergerem 2016-08-15 23:00:16 +02:00
commit e5c5490932
No known key found for this signature in database
GPG key ID: 2F08F75F9525C7E0
2 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/app/views/publisher_view.js
View file

@ -65,13 +65,12 @@ app.views.Publisher = Backbone.View.extend({
// textchange event won't be called in Backbone...
this.inputEl.bind("textchange", $.noop);
var _this = this;
$("body").on("click", function(event){
// if the click event is happened outside the publisher view, then try to close the box
if( _this.el && $(event.target).closest("#publisher").attr("id") !== _this.el.id){
_this.tryClose();
$("body").click(function(event) {
var $target = $(event.target);
if ($target.closest("#publisher").length === 0 && !$target.hasClass("dropdown-backdrop")) {
this.tryClose();
}
});
}.bind(this));
// close publisher on post
this.on("publisher:add", function() {

28
spec/javascripts/app/views/publisher_view_spec.js
View file

@ -101,6 +101,34 @@ describe("app.views.Publisher", function() {
expect(this.view.$el.find(".publisher-textarea-wrapper")).toHaveClass("with-poll");
expect(this.view.$el.find(".poll-creator-container")).toBeVisible();
});
it("should close the publisher when clicking outside", function() {
expect("#publisher").not.toHaveClass("closed");
$("body").click();
expect("#publisher").toHaveClass("closed");
});
it("should not close the publisher when clicking inside", function() {
expect("#publisher").not.toHaveClass("closed");
$("#publisher").find(".publisher-textarea-wrapper").click();
expect("#publisher").not.toHaveClass("closed");
$("#publisher").find(".aspect_dropdown button").click();
expect("#publisher").not.toHaveClass("closed");
});
it("should not close the publisher when clicking inside on a mobile", function() {
// Bootstrap inserts a .dropdown-backdrop next to the dropdown menu
// that take the whole page when it detects a mobile.
// Clicking on this element should not close the publisher.
// See https://github.com/diaspora/diaspora/issues/6979.
$("#publisher").find(".aspect_dropdown").append("<div class='dropdown-backdrop'></div>")
.css({position: "fixed", left: 0, right: 0, bottom: 0, top: 0, "z-index": 990});
expect("#publisher").not.toHaveClass("closed");
$("#publisher").find(".aspect_dropdown button").click();
expect("#publisher").not.toHaveClass("closed");
$("#publisher").find(".dropdown-backdrop").click();
expect("#publisher").not.toHaveClass("closed");
});
});
describe("#clear", function() {