Fix 'Delete messages'

Replaces window.confirm with generic promise-based confirmation dialog
functionality available to all views.

// FREEBIE
This commit is contained in:
lilia 2015-05-26 16:54:21 -07:00
parent a2abfe38a4
commit e2eff893d4
7 changed files with 92 additions and 4 deletions

View file

@ -0,0 +1,45 @@
/* vim: ts=4:sw=4:expandtab
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
(function () {
'use strict';
window.Whisper = window.Whisper || {};
Whisper.ConfirmationDialogView = Whisper.View.extend({
className: 'confirmation-dialog',
template: $('#confirmation-dialog').html(),
initialize: function(options) {
this.message = options.message;
this.resolve = options.resolve;
this.reject = options.reject;
this.render();
},
events: {
'click .ok': 'ok',
'click .cancel': 'cancel',
},
render_attributes: function() {
return { message: this.message };
},
ok: function() {
this.remove();
this.resolve();
},
cancel: function() {
this.remove();
this.reject();
}
});
})();

View file

@ -143,9 +143,9 @@
},
destroyMessages: function(e) {
if (confirm("Permanently delete this conversation?")) {
this.confirm("Permanently delete this conversation?").then(function() {
this.model.destroyMessages();
}
}.bind(this));
this.$('.menu-list').hide();
},

View file

@ -37,6 +37,16 @@
this.$el.html(Mustache.render(template, attrs, partials));
return this;
},
avatar_template: $('#avatar').html()
avatar_template: $('#avatar').html(),
confirm: function(message) {
return new Promise(function(resolve, reject) {
var dialog = new Whisper.ConfirmationDialogView({
message: message,
resolve: resolve,
reject: reject
});
this.$el.append(dialog.el);
}.bind(this));
}
});
})();