Additional cooldown -> custom cooldown.

src/General/Config.coffee

@@ -936,4 +936,4 @@ Config =
       ]
     'Interval': 30
 
-  additionalCooldown: 0
+  customCooldown: 0

src/General/Settings.coffee

@@ -315,7 +315,7 @@ Settings =
 
     items = {}
     inputs = {}
-    for name in ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss', 'additionalCooldown']
+    for name in ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss', 'customCooldown']
       input = $ "[name='#{name}']", section
       items[name]  = Conf[name]
       inputs[name] = input
@@ -339,7 +339,7 @@ Settings =
       for key, val of items
         input = inputs[key]
         input.value = val
-        continue if key in ['usercss', 'additionalCooldown']
+        continue if key in ['usercss', 'customCooldown']
         Settings[key].call input
       return
 

src/General/css/style.css

@@ -1321,10 +1321,10 @@ input#qr-filename:not(.edit) {
 #file-n-submit {
   height: 23px;
 }
-#file-n-submit.add-cooldown {
+#file-n-submit.custom-cooldown {
     height: 43px;
 }
-#file-n-submit:not(.add-cooldown) #add-cooldown-label {
+#file-n-submit:not(.custom-cooldown) #custom-cooldown-label {
     display: none;
 }
 #qr input[type="file"] {

src/General/html/Features/QuickReply.html

@@ -36,7 +36,7 @@
       <input type=checkbox id=qr-file-spoiler title='Spoiler image'>
     </label>
     <input type=submit>
-    <label id="add-cooldown-label"><input type=checkbox data-name=addCooldown title="Add Custom Cooldown">Enable Custom Cooldown</label>
+    <label id="custom-cooldown-label"><input type=checkbox data-name=customCooldown>Enable Custom Cooldown</label>
   </div>
   <input type=file multiple>
 </form>

src/General/html/Settings/Advanced.html

@@ -110,9 +110,9 @@
 </fieldset>
 
 <fieldset>
-    <legend>Additional Cooldown Time</legend>
+    <legend>Custom Cooldown Time</legend>
     <div>
-        Seconds: <input type=number name=additionalCooldown class=field min=0>
+        Seconds: <input type=number name=customCooldown class=field min=0>
     </div>
 </fieldset>
 

src/Posting/QR.coffee

@@ -166,11 +166,11 @@ QR =
     else
       QR.unhide()
 
-  toggleAddCooldown: ->
+  toggleCustomCooldown: ->
     if @checked
-      QR.cooldown.addCooldown = true
+      QR.cooldown.customCooldown = true
     else
-      QR.cooldown.addCooldown = false
+      QR.cooldown.customCooldown = false
 
   error: (err) ->
     QR.open()
@@ -491,7 +491,7 @@ QR =
     setNode 'spoilerPar',    '#qr-spoiler-label'
     setNode 'status',        '[type=submit]'
     setNode 'fileInput',     '[type=file]'
-    setNode 'addCooldown',   '[data-name=addCooldown]'
+    setNode 'customCooldown', '[data-name=customCooldown]'
 
     rules = $('ul.rules').textContent.trim()
     match_min = rules.match(/.+smaller than (\d+)x(\d+).+/)
@@ -529,10 +529,10 @@ QR =
     else
       nodes.spoiler.parentElement.hidden = true
 
-    if parseInt(Conf['additionalCooldown']) > 0
+    if parseInt(Conf['customCooldown']) > 0
-      $.addClass QR.nodes.fileSubmit, 'add-cooldown'
+      $.addClass QR.nodes.fileSubmit, 'custom-cooldown'
     else
-      $.rmClass QR.nodes.fileSubmit, 'add-cooldown'
+      $.rmClass QR.nodes.fileSubmit, 'custom-cooldown'
 
     if g.BOARD.ID is 'f' and g.VIEW isnt 'thread'
       nodes.flashTag = $.el 'select',
@@ -564,8 +564,8 @@ QR =
     $.on nodes.fileExtras, 'click',  (e) -> e.stopPropagation()
     $.on nodes.spoiler,    'change', -> QR.selected.nodes.spoiler.click()
     $.on nodes.fileInput,  'change', QR.handleFiles
-    if parseInt(Conf['additionalCooldown']) > 0
+    if parseInt(Conf['customCooldown']) > 0
-      $.on nodes.addCooldown,'change', QR.toggleAddCooldown
+      $.on nodes.customCooldown,'change', QR.toggleCustomCooldown
 
     # save selected post's data
     items = ['thread', 'name', 'email', 'sub', 'com', 'filename']

src/Posting/QR.cooldown.coffee

@@ -110,8 +110,8 @@ QR.cooldown =
           QR.cooldown.maxDelay
         else
           QR.cooldown.delays[if scope is 'global' then 'thread_global' else 'thread']
-        if QR.cooldown.addCooldown
+        if QR.cooldown.customCooldown
-          maxDelay += parseInt(Conf['additionalCooldown'])
+          maxDelay = Math.max maxDelay, parseInt(Conf['customCooldown'], 10)
         if maxDelay <= elapsed
           delete QR.cooldown[scope][start]
           save = true
@@ -130,8 +130,8 @@ QR.cooldown =
           seconds = Math.max seconds, QR.cooldown.delays[type + suffix] - elapsed
 
         # If additional cooldown is enabled, add the configured seconds to the count.
-        if QR.cooldown.addCooldown
+        if QR.cooldown.customCooldown
-          seconds = Math.max seconds, QR.cooldown.delays[type] + parseInt(Conf['additionalCooldown']) - elapsed
+          seconds = Math.max seconds, parseInt(Conf['customCooldown'], 10) - elapsed
 
       QR.cooldown.save scope if save