Skip to content

Commit 737bbfe

Browse files
Merge pull request #4446 from Fardin7798/fix/4444-in-menu-channel-prompt
fix(menu): ask for channel name inside the menu instead of window.prompt (Firefox cut-off)
2 parents 7c9d6fc + 8ae209a commit 737bbfe

2 files changed

Lines changed: 60 additions & 17 deletions

File tree

‎menu/functions.js‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,46 @@ extension.attributes = function () {
4444
}
4545
};
4646

47+
/*--------------------------------------------------------------
48+
# TEXT PROMPT
49+
--------------------------------------------------------------*/
50+
// In-menu replacement for window.prompt(). Firefox draws the native
51+
// prompt wider than the popup, so it gets cut off (#4444).
52+
extension.prompt = function (message, defaultValue, callback) {
53+
var field = {
54+
component: 'text-field',
55+
storage: false,
56+
rows: 1,
57+
lineNumbers: false
58+
};
59+
var modal = satus.render({
60+
component: 'modal',
61+
variant: 'confirm',
62+
content: {
63+
message: {
64+
component: 'span',
65+
text: message
66+
},
67+
field: field
68+
},
69+
ok: function () {
70+
callback(field.rendered.value);
71+
}
72+
}, extension.skeleton.rendered);
73+
74+
field.rendered.style.marginTop = '8px';
75+
field.rendered.value = defaultValue || '';
76+
field.rendered.pre.update();
77+
field.rendered.input.addEventListener('keydown', function (event) {
78+
if (event.key === 'Enter') {
79+
event.preventDefault();
80+
modal.close();
81+
callback(field.rendered.value);
82+
}
83+
});
84+
field.rendered.focus();
85+
};
86+
4787
/*--------------------------------------------------------------
4888
# EXPORT SETTINGS
4989
--------------------------------------------------------------*/

‎menu/skeleton-parts/player.js‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,18 @@ extension.skeleton.main.layers.section.player.on.click = {
329329
text: 'channelPlaybackSpeedAdd',
330330
on: {
331331
click: function() {
332-
let name = prompt(satus.locale.get('channelPlaybackSpeedPrompt'));
333-
if (name) {
334-
let speed = prompt(satus.locale.get('channelPlaybackSpeedSpeedPrompt'), '1.25');
335-
if (speed && !isNaN(parseFloat(speed))) {
336-
let freshState = Object.assign({}, satus.storage.get('channel_playback_speeds') || {});
337-
freshState[name] = parseFloat(speed);
338-
satus.storage.set('channel_playback_speeds', freshState);
339-
updateView();
332+
extension.prompt('channelPlaybackSpeedPrompt', '', function (name) {
333+
if (name) {
334+
extension.prompt('channelPlaybackSpeedSpeedPrompt', '1.25', function (speed) {
335+
if (speed && !isNaN(parseFloat(speed))) {
336+
let freshState = Object.assign({}, satus.storage.get('channel_playback_speeds') || {});
337+
freshState[name] = parseFloat(speed);
338+
satus.storage.set('channel_playback_speeds', freshState);
339+
updateView();
340+
}
341+
});
340342
}
341-
}
343+
});
342344
}
343345
}
344346
};
@@ -670,15 +672,16 @@ extension.skeleton.main.layers.section.player.on.click = {
670672
text: 'smartSpeedEnterAddChannelName',
671673
on: {
672674
click: function() {
673-
let name = prompt(satus.locale.get('smartSpeedChannelPrompt'));
674-
if (name) {
675-
let freshState = Object.assign({}, satus.storage.get('smart_speed_profiles') || {});
676-
let newObj = {};
677-
newObj[name] = { max: 2.0, min: 1.0, sens: 0.5, whitelist: false };
675+
extension.prompt('smartSpeedChannelPrompt', '', function (name) {
676+
if (name) {
677+
let freshState = Object.assign({}, satus.storage.get('smart_speed_profiles') || {});
678+
let newObj = {};
679+
newObj[name] = { max: 2.0, min: 1.0, sens: 0.5, whitelist: false };
678680

679-
satus.storage.set('smart_speed_profiles', Object.assign(newObj, freshState));
680-
updateView();
681-
}
681+
satus.storage.set('smart_speed_profiles', Object.assign(newObj, freshState));
682+
updateView();
683+
}
684+
});
682685
}
683686
}
684687
}

0 commit comments

Comments
 (0)