Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Move dragresize-specific code out of converse-headline.js

Browse Source
This commit is contained in:
JC Brand 2016-12-19 07:46:48 +00:00
parent 647ee1ff04
commit 1620dad104
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/converse-dragresize.js
View File

@ -223,6 +223,24 @@
}
},
HeadlinesBoxView: {
events: {
'mousedown .dragresize-top': 'onStartVerticalResize',
'mousedown .dragresize-left': 'onStartHorizontalResize',
'mousedown .dragresize-topleft': 'onStartDiagonalResize'
},
initialize: function () {
$(window).on('resize', _.debounce(this.setDimensions.bind(this), 100));
return this.__super__.initialize.apply(this, arguments);
},
render: function () {
$(window).on('resize', _.debounce(this.setWidth.bind(this), 100));
return this.__super__.render.apply(this, arguments);
}
},
ControlBoxView: {
events: {
'mousedown .dragresize-top': 'onStartVerticalResize',

15
src/converse-headline.js
View File

@ -4,7 +4,7 @@
// Copyright (c) 2012-2016, Jan-Carel Brand <jc@opkode.com>
// Licensed under the Mozilla Public License (MPLv2)
//
/*global define, window */
/*global define */
(function (root, factory) {
define("converse-headline", [
@ -67,17 +67,10 @@
events: {
'click .close-chatbox-button': 'close',
'click .toggle-chatbox-button': 'minimize',
'keypress textarea.chat-textarea': 'keyPressed',
'mousedown .dragresize-top': 'onStartVerticalResize',
'mousedown .dragresize-left': 'onStartHorizontalResize',
'mousedown .dragresize-topleft': 'onStartDiagonalResize'
'keypress textarea.chat-textarea': 'keyPressed'
},
initialize: function () {
if (!_.isUndefined(this.setDimensions)) {
// setDimensions is defined for dragresize
window.addEventListener('resize', _.debounce(this.setDimensions.bind(this), 100));
}
this.disable_mam = true; // Don't do MAM queries for this box
this.model.messages.on('add', this.onMessageAdded, this);
this.model.on('show', this.show, this);
@ -101,10 +94,6 @@
)
)
);
if (!_.isUndefined(this.setWidth)) {
// setWidth is defined for dragresize
window.addEventListener('resize', _.debounce(this.setWidth.bind(this), 100));
}
this.$content = this.$el.find('.chat-content');
converse.emit('chatBoxOpened', this);
utils.refreshWebkit();

15
src/converse-register.js
View File

@ -268,9 +268,9 @@
this.giveFeedback(error, 'error');
} else {
this.giveFeedback(__(
'Something went wrong while establishing a connection with "%1$s". Are you sure it exists?',
this.domain
), 'error');
'Something went wrong while establishing a connection with "%1$s". Are you sure it exists?',
this.domain
), 'error');
}
} else if (status === Strophe.Status.REGISTERED) {
converse.log("Registered successfully.");
@ -286,12 +286,11 @@
converse.onConnectStatusChanged
);
converse.chatboxviews.get('controlbox')
.switchTab({target: that.$tabs.find('.current')})
.giveFeedback(__('Now logging you in'));
.switchTab({'target': that.$tabs.find('.current')});
converse.giveFeedback(__('Now logging you in'));
} else {
converse.chatboxviews.get('controlbox')
.renderLoginPanel()
.giveFeedback(__('Registered successfully'));
converse.chatboxviews.get('controlbox').renderLoginPanel();
converse.giveFeedback(__('Registered successfully'));
}
that.reset();
});