classes/torrent_form.class.php

@@ -242,13 +242,13 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td id="idolfields">
 <?      if (!empty($Torrent['Artists'])) {
           foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
-            <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?>/>
+            <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?><? Users::has_autocomplete_enabled('other'); ?>/>
             <? if ($Num == 0) { ?>
               <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?> />
+            <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?><? Users::has_autocomplete_enabled('other'); ?>/>
             <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <?        } ?>
         </td>

sections/torrents/browse.php

@@ -166,7 +166,7 @@ View::show_header('Browse Torrents', 'browse');
         <tr id="artist_name" class="ftr_advanced<?=$HideAdvanced?>">
           <td class="label"><!--Artist name:--></td>
           <td class="ft_artistname">
-            <input type="search" spellcheck="false" size="65" name="artistname" class="inputtext smaller fti_advanced" placeholder="Artist name" value="<?Format::form('artistname')?>" />
+            <input type="search" spellcheck="false" size="65" id="artist" name="artistname" class="inputtext smaller fti_advanced" placeholder="Artist name" value="<?Format::form('artistname')?>"<? Users::has_autocomplete_enabled('other'); ?>/>
           </td>
         </tr>
         <tr id="album_torrent_name" class="ftr_advanced<?=$HideAdvanced?>">

sections/torrents/editgroup.php

@@ -173,7 +173,7 @@ if ($CategoryID == 1) {
 ?>
         </td>
         <td id="idolfields">
-          <input type="text" id="idol_0" name="idols[]" size="45" value="<?=$Artists[0]['name']?>"/>
+          <input type="text" id="idols_0" name="idols[]" size="45" value="<?=$Artists[0]['name']?>"<? Users::has_autocomplete_enabled('other'); ?>/>
           <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <?
   for ($i = 1; $i < count($Artists); $i++) {

static/functions/autocomplete.js

@@ -24,15 +24,11 @@ function initAutocomplete() {
     serviceUrl : ARTIST_AUTOCOMPLETE_URL,
   });
 
-  if (url.path == 'torrents' || url.path == 'upload' || url.path == 'artist' || (url.path == 'requests' && url.query['action'] == 'new') || url.path == 'collages') {
+  if (url.path == 'torrents' || url.path == 'upload' || url.path == 'artist' || (url.path == 'requests' && url.query['action'] == 'new')) {
     $("#artist" + SELECTOR).autocomplete({
       deferRequestBy: 300,
       serviceUrl : ARTIST_AUTOCOMPLETE_URL
     });
-    $("#artistsimilar" + SELECTOR).autocomplete({
-      deferRequestBy: 300,
-      serviceUrl : ARTIST_AUTOCOMPLETE_URL
-    });
   }
   if (url.path == 'torrents' || url.path == 'upload' || url.path == 'collages' || url.path == 'requests' || url.path == 'top10' || (url.path == 'requests' && url.query['action'] == 'new')) {
     $("#tags" + SELECTOR).autocomplete({
@@ -46,5 +42,17 @@ function initAutocomplete() {
       serviceUrl : TAGS_AUTOCOMPLETE_URL
     });
   }
+  if (url.path == 'upload' || (url.path == 'torrents' && url.query['action'] == 'editgroup')) {
+    $("#idols_0" + SELECTOR).autocomplete({
+      deferRequestBy: 300,
+      serviceUrl : ARTIST_AUTOCOMPLETE_URL
+    });
+  }
+  if (url.path == 'requests' && url.query['action'] == 'new') {
+    $("#artist_0" + SELECTOR).autocomplete({
+      deferRequestBy: 300,
+      serviceUrl : ARTIST_AUTOCOMPLETE_URL
+    });
+  }
 
 };

static/functions/requests.js

@@ -95,10 +95,11 @@ function AddArtistField() {
     x.appendChild(document.createElement("br"));
     x.appendChild(ArtistField);
 
-    if ($("#artist").data("gazelle-autocomplete")) {
-      $(ArtistField).live('focus', function() {
+    if ($("#artist_0").data("gazelle-autocomplete")) {
+      $(ArtistField).on('focus', function() {
         $(ArtistField).autocomplete({
-          serviceUrl : 'artist.php?action=autocomplete'
+          deferRequestBy: 300,
+          serviceUrl : ARTIST_AUTOCOMPLETE_URL
         });
       });
     }

static/functions/upload.js

@@ -307,10 +307,11 @@ function AddArtistField() {
   x.appendChild(ArtistField);
   x.appendChild(document.createTextNode('\n'));
 
-  if ($("#idol").data("gazelle-autocomplete")) {
-    $(ArtistField).live('focus', function() {
+  if ($("#idols_0").data("gazelle-autocomplete")) {
+    $(ArtistField).on('focus', function() {
       $(ArtistField).autocomplete({
-        serviceUrl : 'artist.php?action=autocomplete'
+        deferRequestBy: 300,
+        serviceUrl : ARTIST_AUTOCOMPLETE_URL
       });
     });
   }