oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-21 05:20:54 +00:00
Code Wiki Activity

3.5.182. I forgot to commit a bit again. D: Removed FFZ from two-factor auth dialogs / pages. Added option to always expand the player volume slider. Revamped ban notices to be nicer. Status indicator for emoteonly-mode. Fixed /ffz reload command. Update to the latest FileSaver.js. Make high contrast compatible with BTTV. Conversations fixes. Better BTTV dark theme detection.

Browse source
This commit is contained in:
SirStendec 2016-05-20 17:30:34 -04:00
parent 6cf5ddc734
commit 4af0c3480c
19 changed files with 378 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/settings.js
View file

@ -72,15 +72,6 @@ FFZ.prototype.load_settings = function() {
// Backup and Restore
// --------------------
FFZ.prototype._settings_open_http_window = function() {
window.open("http://www.twitch.tv/crossdomain/transfer#ffz-settings-transfer", "_ffz_settings");
}
FFZ.msg_commands.http_settings = function(data) {
this._load_settings_file(data);
}
FFZ.prototype.reset_settings = function() {
if ( ! confirm(this.tr('Are you sure you wish to reset FrankerFaceZ?\n\nThis will force the tab to refresh.')) )
return;
@ -472,10 +463,6 @@ FFZ.menu_pages.settings = {
backup_link = createElement('a'),
backup_help = createElement('span'),
http_para = createElement('p'),
http_link = createElement('a'),
http_help = createElement('span'),
restore_para = createElement('p'),
restore_input = createElement('input'),
restore_link = createElement('a'),
@ -526,20 +513,6 @@ FFZ.menu_pages.settings = {
restore_para.appendChild(restore_help);
restore_cont.appendChild(restore_para);
http_para.className = 'clearfix option';
http_link.href = '#';
http_link.innerHTML = 'Import from HTTP';
http_link.addEventListener('click', this._settings_open_http_window.bind(this));
http_help.className = 'help';
http_help.innerHTML = 'Load your settings from HTTP into HTTPS. (This briefly opens a new window.)';
http_para.appendChild(http_link);
http_para.appendChild(http_help);
if ( location.protocol === "https:" )
restore_cont.appendChild(http_para);
reset_cont.className = 'chat-menu-content';
reset_head.className = 'heading';
reset_head.innerHTML = this.tr('Reset Settings');