mirror of
https://github.com/zulip/zulip.git
synced 2025-11-06 06:53:25 +00:00
js: Convert static/js/scroll_bar.js to ES6 module.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
committed by
Tim Abbott
parent
5b647e3d72
commit
fb93be0d94
@@ -179,7 +179,6 @@
|
|||||||
"realm_night_logo": false,
|
"realm_night_logo": false,
|
||||||
"recent_topics": false,
|
"recent_topics": false,
|
||||||
"reminder": false,
|
"reminder": false,
|
||||||
"scroll_bar": false,
|
|
||||||
"search": false,
|
"search": false,
|
||||||
"search_pill_widget": false,
|
"search_pill_widget": false,
|
||||||
"search_suggestion": false,
|
"search_suggestion": false,
|
||||||
|
|||||||
@@ -46,7 +46,8 @@ const realm_icon = set_global("realm_icon", {});
|
|||||||
const realm_logo = set_global("realm_logo", {});
|
const realm_logo = set_global("realm_logo", {});
|
||||||
const reload = {__esModule: true};
|
const reload = {__esModule: true};
|
||||||
rewiremock("../../static/js/reload").with(reload);
|
rewiremock("../../static/js/reload").with(reload);
|
||||||
const scroll_bar = set_global("scroll_bar", {});
|
const scroll_bar = {__esModule: true};
|
||||||
|
rewiremock("../../static/js/scroll_bar").with(scroll_bar);
|
||||||
const settings_account = set_global("settings_account", {});
|
const settings_account = set_global("settings_account", {});
|
||||||
const settings_bots = set_global("settings_bots", {});
|
const settings_bots = set_global("settings_bots", {});
|
||||||
const settings_display = set_global("settings_display", {});
|
const settings_display = set_global("settings_display", {});
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ rewiremock("../../static/js/message_viewport").with(message_viewport);
|
|||||||
set_global("panels", {initialize() {}});
|
set_global("panels", {initialize() {}});
|
||||||
set_global("popovers", {initialize() {}});
|
set_global("popovers", {initialize() {}});
|
||||||
rewiremock("../../static/js/reload").with({initialize() {}});
|
rewiremock("../../static/js/reload").with({initialize() {}});
|
||||||
set_global("scroll_bar", {initialize() {}});
|
rewiremock("../../static/js/scroll_bar").with({initialize() {}});
|
||||||
const server_events = set_global("server_events", {initialize() {}});
|
const server_events = set_global("server_events", {initialize() {}});
|
||||||
set_global("settings_sections", {initialize() {}});
|
set_global("settings_sections", {initialize() {}});
|
||||||
rewiremock("../../static/js/settings_panel_menu").with({initialize() {}});
|
rewiremock("../../static/js/settings_panel_menu").with({initialize() {}});
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import "../reload";
|
|||||||
import "../compose_actions";
|
import "../compose_actions";
|
||||||
import "../subs";
|
import "../subs";
|
||||||
import "../ui";
|
import "../ui";
|
||||||
import "../scroll_bar";
|
|
||||||
import "../gear_menu";
|
import "../gear_menu";
|
||||||
import "../stream_popover";
|
import "../stream_popover";
|
||||||
import "../popovers";
|
import "../popovers";
|
||||||
|
|||||||
1
static/js/global.d.ts
vendored
1
static/js/global.d.ts
vendored
@@ -52,7 +52,6 @@ declare let realm_icon: any;
|
|||||||
declare let realm_logo: any;
|
declare let realm_logo: any;
|
||||||
declare let recent_topics: any;
|
declare let recent_topics: any;
|
||||||
declare let reminder: any;
|
declare let reminder: any;
|
||||||
declare let scroll_bar: any;
|
|
||||||
declare let search: any;
|
declare let search: any;
|
||||||
declare let search_pill_widget: any;
|
declare let search_pill_widget: any;
|
||||||
declare let search_suggestion: any;
|
declare let search_suggestion: any;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
"use strict";
|
import {media_breakpoints} from "./css_variables";
|
||||||
|
|
||||||
const {media_breakpoints} = require("./css_variables");
|
|
||||||
// A few of our width properties in Zulip depend on the width of the
|
// A few of our width properties in Zulip depend on the width of the
|
||||||
// browser scrollbar that is generated at the far right side of the
|
// browser scrollbar that is generated at the far right side of the
|
||||||
// page, which unfortunately varies depending on the browser and
|
// page, which unfortunately varies depending on the browser and
|
||||||
@@ -35,7 +34,7 @@ function getScrollbarWidth() {
|
|||||||
|
|
||||||
let sbWidth;
|
let sbWidth;
|
||||||
|
|
||||||
exports.initialize = function () {
|
export function initialize() {
|
||||||
// Workaround for browsers with fixed scrollbars
|
// Workaround for browsers with fixed scrollbars
|
||||||
sbWidth = getScrollbarWidth();
|
sbWidth = getScrollbarWidth();
|
||||||
|
|
||||||
@@ -71,10 +70,10 @@ exports.initialize = function () {
|
|||||||
"</style>",
|
"</style>",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
exports.set_layout_width();
|
set_layout_width();
|
||||||
};
|
}
|
||||||
|
|
||||||
exports.set_layout_width = function () {
|
export function set_layout_width() {
|
||||||
// This logic unfortunately leads to a flash of mispositioned
|
// This logic unfortunately leads to a flash of mispositioned
|
||||||
// content when reloading a Zulip browser window. More details
|
// content when reloading a Zulip browser window. More details
|
||||||
// are available in the comments on the max-width of 1400px in
|
// are available in the comments on the max-width of 1400px in
|
||||||
@@ -90,6 +89,4 @@ exports.set_layout_width = function () {
|
|||||||
$(".fixed-app .app-main").css("max-width", 1400 + sbWidth + "px");
|
$(".fixed-app .app-main").css("max-width", 1400 + sbWidth + "px");
|
||||||
$("#compose-container").css("max-width", 1400 + sbWidth + "px");
|
$("#compose-container").css("max-width", 1400 + sbWidth + "px");
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
window.scroll_bar = exports;
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import * as night_mode from "./night_mode";
|
|||||||
import * as peer_data from "./peer_data";
|
import * as peer_data from "./peer_data";
|
||||||
import * as people from "./people";
|
import * as people from "./people";
|
||||||
import * as reload from "./reload";
|
import * as reload from "./reload";
|
||||||
|
import * as scroll_bar from "./scroll_bar";
|
||||||
import * as settings_config from "./settings_config";
|
import * as settings_config from "./settings_config";
|
||||||
import * as stream_data from "./stream_data";
|
import * as stream_data from "./stream_data";
|
||||||
import * as stream_events from "./stream_events";
|
import * as stream_events from "./stream_events";
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ const pm_list = require("./pm_list");
|
|||||||
const reload = require("./reload");
|
const reload = require("./reload");
|
||||||
const resize = require("./resize");
|
const resize = require("./resize");
|
||||||
const rows = require("./rows");
|
const rows = require("./rows");
|
||||||
|
const scroll_bar = require("./scroll_bar");
|
||||||
const sent_messages = require("./sent_messages");
|
const sent_messages = require("./sent_messages");
|
||||||
const settings_panel_menu = require("./settings_panel_menu");
|
const settings_panel_menu = require("./settings_panel_menu");
|
||||||
const settings_toggle = require("./settings_toggle");
|
const settings_toggle = require("./settings_toggle");
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import * as channel from "./channel";
|
|||||||
import * as common from "./common";
|
import * as common from "./common";
|
||||||
import * as feedback_widget from "./feedback_widget";
|
import * as feedback_widget from "./feedback_widget";
|
||||||
import * as night_mode from "./night_mode";
|
import * as night_mode from "./night_mode";
|
||||||
|
import * as scroll_bar from "./scroll_bar";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user