paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error handling in watch_manual_resize().

Browse Source 
We now explicitly complain if a caller passes in a bad
selector to this function and return undefined.
This commit is contained in:
Steve Howell
2017-05-11 09:28:33 -07:00
committed by Tim Abbott
parent 35a5ca411a
commit d415d4cf11
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/message_edit.js
View File

@@ -223,7 +223,9 @@ function edit_message(row, raw_content) {
copy_message.remove(); copy_message.remove();
var edit_id = "#message_edit_content_" + rows.id(row); var edit_id = "#message_edit_content_" + rows.id(row);
var listeners = resize.watch_manual_resize(edit_id); var listeners = resize.watch_manual_resize(edit_id);
currently_editing_messages[rows.id(row)].listeners = listeners; if (listeners) {
currently_editing_messages[rows.id(row)].listeners = listeners;
}
composebox_typeahead.initialize_compose_typeahead(edit_id, {emoji: true, stream: true}); composebox_typeahead.initialize_compose_typeahead(edit_id, {emoji: true, stream: true});
} }

9
static/js/resize.js
View File

@@ -167,8 +167,15 @@ function left_userlist_get_new_heights() {
exports.watch_manual_resize = function (element) { exports.watch_manual_resize = function (element) {
return (function on_box_resize(cb) { return (function on_box_resize(cb) {
var box = document.querySelector(element);
if (!box) {
blueslip.error('Bad selector in watch_manual_resize: ' + element);
return;
}
var meta = { var meta = {
box: document.querySelector(element), box: box,
height: null, height: null,
mousedown: false, mousedown: false,
}; };