From 7b803cbace97a72b5bbca7b48b1f9a0cb007036d Mon Sep 17 00:00:00 2001 From: Arkerthan <arkerthan@gmail.com> Date: Fri, 15 May 2020 21:25:21 +0200 Subject: [PATCH] make reload() global --- src/gui/options.js | 12 +++--------- src/js/utilsSC.js | 9 +++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/gui/options.js b/src/gui/options.js index 01035bf3f33..ce2ac0d11c8 100644 --- a/src/gui/options.js +++ b/src/gui/options.js @@ -225,7 +225,7 @@ App.UI.OptionsGroup = (function() { if (value.value) { Engine.play(value.value); } else { - reload(); + App.UI.reload(); } }; } else { @@ -253,7 +253,7 @@ App.UI.OptionsGroup = (function() { if (value.callback) { value.callback(); } - reload(); + App.UI.reload(); }; } buttonGroup.append(button); @@ -262,7 +262,7 @@ App.UI.OptionsGroup = (function() { const isNumber = typeof currentValue === "number"; const textbox = App.UI.DOM.makeTextBox(currentValue, input => { option.object[option.property] = input; - reload(); + App.UI.reload(); }, isNumber); if (isNumber) { textbox.classList.add("number"); @@ -283,12 +283,6 @@ App.UI.OptionsGroup = (function() { return container; - function reload() { - const position = window.pageYOffset; - Engine.play(passage()); - window.scrollTo(0, position); - } - function inRange(mode, compareValue, value) { if (mode === "<") { return value < compareValue; diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js index e6931d4c235..3c21c2f6295 100644 --- a/src/js/utilsSC.js +++ b/src/js/utilsSC.js @@ -304,3 +304,12 @@ App.UI.slaveDescriptionDialog = function(slave) { App.UI.DOM.slaveDescriptionDialog = function(slave) { return App.UI.DOM.link(SlaveFullName(slave), App.UI._showDescriptionDialog, [slave]); }; + +/** + * Reloads the passage and stays at the same height. + */ +App.UI.reload = function() { + const position = window.pageYOffset; + Engine.play(passage()); + window.scrollTo(0, position); +}; -- GitLab