Skip to content
Extraits de code Groupes Projets
Valider 7ea2888c rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

Merge branch 'tsrivishnu-publisher_autoclose' into develop

parents 77c94bf4 f5c8ebcb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -22,6 +22,7 @@
* Made Unicorn timeout configurable and increased the default to 90 seconds
* Follow DiasporaHQ upon account creation is now configurable to another account [#4278](https://github.com/diaspora/diaspora/pull/4278)
* Use first header as title in the single post view, when possible [#4256](https://github.com/diaspora/diaspora/pull/4256)
* Close publisher when clicking on the page outside of it [#4282](https://github.com/diaspora/diaspora/pull/4282)
# 0.1.1.0
......
......@@ -20,7 +20,7 @@ var app = {
views: {},
pages: {},
forms: {},
user: function(userAttrs) {
if(userAttrs) { return this._user = new app.models.User(userAttrs) }
return this._user || false
......
......@@ -65,6 +65,15 @@ app.views.Publisher = Backbone.View.extend(_.extend(
// textchange event won't be called in Backbone...
this.el_input.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()
}
});
return this;
},
......@@ -249,6 +258,13 @@ app.views.Publisher = Backbone.View.extend(_.extend(
return this;
},
tryClose : function(){
// if it is not submittable, close it.
if( !this._submittable() ){
this.close()
}
},
open : function() {
// visually 'open' the publisher
this.$el.removeClass('closed');
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter