From fac47e92b0e5fb0a6baf492584cb53c85fb642d1 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 5 Dec 2011 20:46:32 +0100 Subject: [PATCH] Indicate if the settings require a feature to be enabled. Close #28 --- 4chan_x.user.js | 27 ++++++++++++++++++++++++--- changelog | 1 + script.coffee | 23 +++++++++++++++++++++-- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 559bc8bc2..a521350ce 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1244,7 +1244,7 @@ } }, dialog: function() { - var arr, back, checked, description, dialog, hiddenNum, hiddenThreads, input, key, li, obj, overlay, ta, time, ul, _i, _j, _len, _len2, _ref, _ref2, _ref3; + var arr, back, checked, description, dialog, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, ta, time, ul, _i, _j, _k, _len, _len2, _len3, _ref, _ref2, _ref3, _ref4; dialog = ui.dialog('options', '', '\
\
\ @@ -1264,9 +1264,13 @@ \
\ \ - \ +
\ +

Sauce is disabled.

\ + \ +
\ \
\ +

Filter is disabled.

\ Use regular expressions, one per line.
\ For example, /weeaboo/i will filter posts containing `weeaboo` case-insensitive.\

Name:

\ @@ -1280,10 +1284,12 @@
\ \
\ +

Quote Backlinks are disabled.

\
    \ Backlink formatting\
  • :
  • \
\ +

Time Formatting is disabled.

\
    \ Time formatting\
  • :
  • \ @@ -1297,6 +1303,7 @@
\ \
\ +

Keybinds are disabled.

\ \ \ \ @@ -1365,6 +1372,17 @@ input.value = conf[input.name]; $.on(input, 'keydown', options.keybind); } + indicators = {}; + _ref4 = $$('.error', dialog); + for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) { + indicator = _ref4[_k]; + key = indicator.firstChild.textContent; + indicator.hidden = conf[key]; + indicators[key] = indicator; + $.on($("[name='" + key + "']", dialog), 'click', function() { + return indicators[this.name].hidden = this.checked; + }); + } overlay = $.el('div', { id: 'overlay' }); @@ -3184,7 +3202,7 @@ #options [name=tab]:not(:checked) + * {\ display: none;\ }\ - #content > * {\ + #content > div {\ height: 450px;\ overflow: auto;\ }\ @@ -3194,6 +3212,9 @@ resize: vertical;\ width: 100%;\ }\ + #flavors {\ + height: 100%;\ + }\ \ #qr {\ position: fixed;\ diff --git a/changelog b/changelog index 41da7637e..819068c1f 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,6 @@ master - mayhem + indicate if the settings require a feature to be enabled fix obscure and continuous prompts to auto update 2.22.1 diff --git a/script.coffee b/script.coffee index ab0e97dd4..e6d93d4c6 100644 --- a/script.coffee +++ b/script.coffee @@ -913,9 +913,13 @@ options =
- +
+

Sauce is disabled.

+ +
+

Filter is disabled.

Use regular expressions, one per line.
For example, /weeaboo/i will filter posts containing `weeaboo` case-insensitive.

Name:

@@ -929,10 +933,12 @@ options =
+

Quote Backlinks are disabled.

    Backlink formatting
  • :
+

Time Formatting is disabled.

    Time formatting
  • :
  • @@ -946,6 +952,7 @@ options =
+

Keybinds are disabled.

ActionsKeybinds
Close Options or QR
@@ -1010,6 +1017,15 @@ options = input.value = conf[input.name] $.on input, 'keydown', options.keybind + #indicate if the settings require a feature to be enabled + indicators = {} + for indicator in $$ '.error', dialog + key = indicator.firstChild.textContent + indicator.hidden = conf[key] + indicators[key] = indicator + $.on $("[name='#{key}']", dialog), 'click', -> + indicators[@name].hidden = @checked + overlay = $.el 'div', id: 'overlay' $.on overlay, 'click', -> $.rm overlay $.on dialog, 'click', (e) -> e.stopPropagation() @@ -2549,7 +2565,7 @@ Main = #options [name=tab]:not(:checked) + * { display: none; } - #content > * { + #content > div { height: 450px; overflow: auto; } @@ -2559,6 +2575,9 @@ Main = resize: vertical; width: 100%; } + #flavors { + height: 100%; + } #qr { position: fixed;
ActionsKeybinds
Close Options or QR