Migrate some inline JS

classes/mediainfo.class.php

@@ -88,7 +88,7 @@ class ParseManager {
         if (!isset($this->parsers['general'])) return $string;
 
         $midiv_start = '<div class="spoilerContainer hideContainer">
-            <input type="button" class="spoilerButton" onclick="BBCode.spoiler(this);" value="Show '.
+            <input type="button" class="spoilerButton" value="Show '.
             $this->parsers['general'][0]->filename.
             '" /><blockquote class="spoiler hidden">';
         $midiv_end = "</blockquote></div>";

classes/text.class.php

@@ -4,7 +4,7 @@ class Text {
    * Array of valid tags; tag => max number of attributes
    * @var array $ValidTags
    */
-  private static $ValidTags = array('b'=>0, 'u'=>0, 'i'=>0, 's'=>0, '*'=>0, '#'=>0, 'ch'=>0, 'uch'=>0, 'artist'=>0, 'user'=>0, 'n'=>0, 'inlineurl'=>0, 'inlinesize'=>1, 'headline'=>1, 'align'=>1, 'color'=>1, 'colour'=>1, 'size'=>1, 'url'=>1, 'img'=>1, 'quote'=>1, 'pre'=>1, 'code'=>1, 'tex'=>0, 'hide'=>1, 'spoiler' => 1, 'plain'=>0, 'important'=>0, 'torrent'=>0, 'rule'=>0, 'mature'=>1, 'embed'=>0,
+  private static $ValidTags = array('b'=>0, 'u'=>0, 'i'=>0, 's'=>0, '*'=>0, '#'=>0, 'ch'=>0, 'uch'=>0, 'artist'=>0, 'user'=>0, 'n'=>0, 'inlineurl'=>0, 'inlinesize'=>1, 'headline'=>1, 'align'=>1, 'color'=>1, 'colour'=>1, 'size'=>1, 'url'=>1, 'img'=>1, 'quote'=>1, 'pre'=>1, 'code'=>1, 'tex'=>0, 'hide'=>1, 'spoiler' => 1, 'plain'=>0, 'important'=>0, 'torrent'=>0, 'rule'=>0, 'embed'=>0,
   );
 
   /**
@@ -563,9 +563,6 @@ class Text {
         case 'hide':
           $Array[$ArrayPos] = array('Type'=>'hide', 'Attr'=>$Attrib, 'Val'=>self::parse($Block));
           break;
-        case 'mature':
-          $Array[$ArrayPos] = array('Type'=>'mature', 'Attr'=>$Attrib, 'Val'=>self::parse($Block));
-          break;
         case 'embed':
           $Array[$ArrayPos] = array('Type'=>'embed', 'Val'=>$Block);
           break;
@@ -820,7 +817,7 @@ class Text {
           self::$NoImg++; // No images inside quote tags
           self::$InQuotes++;
           if (self::$InQuotes == self::$NestsBeforeHide) { //Put quotes that are nested beyond the specified limit in [hide] tags.
-            $Str .= '<strong>Older quotes</strong>: <a href="javascript:void(0);" onclick="BBCode.spoiler(this);">Show</a>';
+            $Str .= '<strong>Older quotes</strong>: <a class="spoilerButton">Show</a>';
             $Str .= '<blockquote class="hidden spoiler">';
           }
           if (!empty($Block['Attr'])) {
@@ -842,18 +839,9 @@ class Text {
           self::$InQuotes--;
           break;
         case 'hide':
-          $Str .= '<strong>'.(($Block['Attr']) ? $Block['Attr'] : 'Hidden text').'</strong>: <a href="javascript:void(0);" onclick="BBCode.spoiler(this);">Show</a>';
+          $Str .= '<strong>'.(($Block['Attr']) ? $Block['Attr'] : 'Hidden text').'</strong>: <a class="spoilerButton">Show</a>';
           $Str .= '<blockquote class="hidden spoiler">'.self::to_html($Block['Val']).'</blockquote>';
           break;
-        case 'mature':
-          if (!empty($Block['Attr'])) {
-            $Str .= '<strong class="mature" style="font-size: 1.2em;">Mature content:</strong><strong> ' . $Block['Attr'] . '</strong><br /> <a href="javascript:void(0);" onclick="BBCode.spoiler(this);">Show</a>';
-            $Str .= '<blockquote class="hidden spoiler">'.self::to_html($Block['Val']).'</blockquote>';
-          }
-          else {
-            $Str .= '<strong>Use of the [mature] tag requires a description.</strong> The correct format is as follows: <strong>[mature=description] ...content... [/mature]</strong>, where "description" is a mandatory description of the post. Misleading descriptions will be penalized. For further information on our mature content policies, please refer to this <a href="wiki.php?action=article&amp;id=1063">wiki</a>.';
-          }
-          break;
         case 'img':
           if (self::$NoImg > 0 && self::valid_url($Block['Val'])) {
             $Str .= '<a rel="noreferrer" target="_blank" href="'.$Block['Val'].'">'.$Block['Val'].'</a> (image)';

classes/torrent_form.class.php

@@ -234,12 +234,12 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
           foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
             <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?>/>
             <? if ($Num == 0) { ?>
-              <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+              <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
             <? }
             }
           } else { ?>
             <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?> />
-            <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <?        } ?>
         </td>
       </tr>
@@ -496,12 +496,12 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
           foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
             <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?> />
             <? if ($Num == 0) { ?>
-              <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+              <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
             <? }
             }
           } else { ?>
             <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?> />
-            <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <?        } ?>
         </td>
       </tr>
@@ -749,12 +749,12 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
           foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
             <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?> />
             <? if ($Num == 0) { ?>
-              <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+              <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
             <? }
             }
           } else { ?>
             <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?> />
-            <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <?        } ?>
         </td>
       </tr>
@@ -995,12 +995,12 @@ new TEXTAREA_PREVIEW('album_desc', 'album_desc', display_str($Torrent['GroupDesc
           foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
             <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?> />
             <? if ($Num == 0) { ?>
-              <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+              <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
             <? }
             }
           } else { ?>
             <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?> />
-            <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <?        } ?>
         </td>
       </tr>

sections/requests/new_edit.php

@@ -155,14 +155,14 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
       foreach ($ArtistForm as $Artist) {
 ?>
             <input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" value="<?=display_str($Artist['name']) ?>" <?=$Disabled?>/>
-            <? if (empty($Disabled)) { if ($First) { ?><a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a><? } $First = false; } ?>
+            <? if (empty($Disabled)) { if ($First) { ?><a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a><? } $First = false; } ?>
             <br />
 <?
       }
     } else {
 ?>            <input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" onblur="CheckVA();" <?=$Disabled?>/>
 <? if (empty($Disabled)) { ?>
-            <a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+            <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <? } ?>
 <?
     }

sections/torrents/details.php

@@ -598,7 +598,7 @@ foreach ($TorrentList as $Torrent) {
       } else {
 ?>
   <div class="spoilerContainer hideContainer">
-    <input type="button" class="spoilerButton" onclick="BBCode.spoiler(this);" value="Show MediaInfo" /><blockquote class="spoiler hidden">
+    <input type="button" class="spoilerButton" value="Show MediaInfo" /><blockquote class="spoiler hidden">
 <?
         echo Text::full_format($MediaInfo);
 ?>

sections/torrents/editgroup.php

@@ -200,7 +200,7 @@ if ($CategoryID == 1) {
         </td>
         <td id="idolfields">
           <input type="text" id="idol_0" name="idols[]" size="45" value="<?=$Artists[0]['name']?>"/>
-          <a onclick="AddArtistField()" class="brackets">+</a> <a onclick="RemoveArtistField()" class="brackets">&minus;</a>
+          <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <?
   for ($i = 1; $i < count($Artists); $i++) {
     print '<br><input type="text" id="idol_'.$i.'" name="idols[]" size="45" value="'.$Artists[$i]['name'].'"/>';

static/functions/bbcode.js

@@ -1,27 +1,25 @@
-var BBCode = {
-  spoiler: function(link) {
-    if ($(link.nextSibling).has_class('hidden')) {
-      $(link.nextSibling).gshow();
-      $(link).html('Hide');
-      if ($(link).attr("value")) {
-        $(link).attr("value", "Hide" + $(link).attr("value").substring(4))
-      }
-    } else {
-      $(link.nextSibling).ghide();
-      $(link).html('Show');
-      if ($(link).attr("value")) {
-        $(link).attr("value", "Show" + $(link).attr("value").substring(4))
-      }
+function BBSpoiler(link) {
+  if ($(link.nextSibling).has_class('hidden')) {
+    $(link.nextSibling).gshow();
+    $(link).html('Hide');
+    if ($(link).attr("value")) {
+      $(link).attr("value", "Hide" + $(link).attr("value").substring(4))
+    }
+  } else {
+    $(link.nextSibling).ghide();
+    $(link).html('Show');
+    if ($(link).attr("value")) {
+      $(link).attr("value", "Show" + $(link).attr("value").substring(4))
     }
   }
-};
+}
 
 function wrapSelected(box, wrap, offset) {
   if (!Array.isArray(wrap)) wrap = [wrap, wrap]
   if (wrap.length < 2) wrap[1] = wrap[0]
-  let s = box.selectionStart
-  let e = box.selectionEnd
-  let v = box.value
+  var s = box.selectionStart
+  var e = box.selectionEnd
+  var v = box.value
   box.value = v.slice(0,s)+wrap[0]+v.slice(s,e)+wrap[1]+v.slice(e)
   box.focus()
   box.selectionEnd = (offset!==undefined?s+offset:e+wrap[0].length)
@@ -71,10 +69,9 @@ function BBEditor(box) {
   box.parentNode.insertBefore(bar, box)
 }
 
-if (document.readyState == 'complete') {
+$(function() {
   $('.bbcode_editor').each(function(i, el) { BBEditor(el) })
-} else {
-  document.addEventListener("DOMContentLoaded", function() {
-    $('.bbcode_editor').each(function(i, el) { BBEditor(el) })
+  $('.spoilerButton').each(function(i, el) {
+    el.addEventListener("click", ()=>BBSpoiler(el))
   })
-}
+})

static/functions/browse.js

@@ -317,4 +317,6 @@ $(function() {
     var a = $('a[data-cover]')[0]
     if (a) preload(a.attributes['data-cover'].value)
   }
+  $('.add_artist_button').each(function(i, el) {el.addEventListener('click', AddArtistField)})
+  $('.remove_artist_button').each(function(i, el) {el.addEventListener('click', RemoveArtistField)})
 })

static/functions/reportsv2.js

@@ -232,7 +232,7 @@ function ReportSelectorInit() {
   }
 }
 
-if (document.readyState == 'complete') {
+if (document.readyState != 'loading') {
   ReportSelectorInit();
 } else {
   document.addEventListener("DOMContentLoaded", ReportSelectorInit);

static/functions/requests.js

@@ -239,4 +239,6 @@ $(function() {
       ({'jav':JavAutofill})[el.attributes['autofill'].value]()
     })
   })
+  $('.add_artist_button').each(function(i, el) {el.addEventListener('click', AddArtistField)})
+  $('.remove_artist_button').each(function(i, el) {el.addEventListener('click', RemoveArtistField)})
 })

static/functions/upload.js

@@ -517,12 +517,12 @@ function MediaInfoExtract() {
   })
 }
 
-function initAutofill() {
-  document.querySelectorAll('[autofill]').forEach(function(el) {
+$(function() {
+  $('[autofill]').each(function(i, el) {
     el.addEventListener('click', function(event) {
       ({'douj':DoujAutofill, 'anime':AnidbAutofill, 'jav':JavAutofill})[el.attributes['autofill'].value]()
     })
   })
-}
-
-$(initAutofill)
+  $('.add_artist_button').each(function(i, el) {el.addEventListener('click', AddArtistField)})
+  $('.remove_artist_button').each(function(i, el) {el.addEventListener('click', RemoveArtistField)})
+})

static/styles/global.css

@@ -125,6 +125,7 @@ button, input[type=button], input[type=submit] {
 }
 
 .spoilerButton {
+  cursor: pointer;
   overflow: hidden;
   text-overflow: ellipsis;
 }