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

js: Rename viewport.js to message_viewport.js.

Browse Source 
This fixes the mobile web experience for Chrome on iOS.

Apparently, Chrome-on-iOS silently has a `viewport` module that
overrides and user-defined module by that name, causing all of our
code that accesses the viewport module to not work on that platform.
We fix this by renaming it.
This commit is contained in:
Tim Abbott
2017-03-10 14:48:51 -08:00
parent b1f12133be
commit 5e39ccd642
21 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/message_list_view.js
View File

@@ -453,7 +453,7 @@ MessageListView.prototype = {
function restore_scroll_position() {
if (list === current_msg_list && orig_scrolltop_offset !== undefined) {
viewport.set_message_offset(orig_scrolltop_offset);
message_viewport.set_message_offset(orig_scrolltop_offset);
list.reselect_selected_id();
}
}
@@ -651,14 +651,14 @@ MessageListView.prototype = {
}
var selected_row_offset = selected_row.offset().top;
var info = viewport.message_viewport_info();
var info = message_viewport.message_viewport_info();
var available_space_for_scroll = selected_row_offset - info.visible_top;
var rows_offset = rows.last_visible().offset().top - this.list.selected_row().offset().top;
// autoscroll_forever: if we've sent a message, move pointer at least that far.
if (page_params.autoscroll_forever && id_of_last_message_sent_by_us > -1 &&
rows_offset < (viewport.height())) {
rows_offset < (message_viewport.height())) {
this.list.select_id(id_of_last_message_sent_by_us, {from_rendering: true});
navigate.scroll_to_selected();
return;
@@ -699,7 +699,7 @@ MessageListView.prototype = {
}
// Ok, we are finally ready to actually scroll.
viewport.system_initiated_animate_scroll(scroll_amount);
message_viewport.system_initiated_animate_scroll(scroll_amount);
},
@@ -780,8 +780,9 @@ MessageListView.prototype = {
this.list.select_id(this.list.selected_id(), {use_closest: true});
}
// Must get this.list.selected_row() again since it is now a new DOM element
viewport.scrollTop(
viewport.scrollTop() + this.selected_row().offset().top - scrolltop_offset);
message_viewport.scrollTop(
message_viewport.scrollTop() +
this.selected_row().offset().top - scrolltop_offset);
}
},