Don't prematurely initialize autocomplete

sections/collages/torrent_collage.php

@@ -561,7 +561,7 @@ if (!$LoggedUser['DisablePosting']) {
 if ($CollageCovers != 0) { ?>
     <div id="coverart" class="box">
       <div class="head" id="coverhead"><strong>Cover Art</strong></div>
-      <div class="collage_images" id="collage_page0">
+      <div class="collage_images" id="collage_page0" data-wall-child=".collage_image" data-wall-size="4" data-wall-min="2">
 <?
   $Page1 = array_slice($Collage, 0, $CollageCovers);
   foreach ($Page1 as $Group) {
@@ -570,16 +570,6 @@ if ($CollageCovers != 0) { ?>
 ?>
       </div>
     </div>
-    <script>
-      $('.collage_image img').load(function() {
-        var test = true
-        $('.collage_image img').toArray().forEach(function(el) {
-          if (!el.complete) test = false
-        })
-        if (test) wall('.collage_images', '.collage_image', 4, 2)
-      })
-      wall('.collage_images', '.collage_image', 4, 2)
-    </script>
 <?  if ($NumGroups > $CollageCovers) { ?>
     <div class="linkbox pager" style="clear: left;" id="pageslinksdiv">
       <span id="firstpage" class="invisible"><a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;"><strong>&lt;&lt; First</strong></a> | </span>
@@ -592,7 +582,7 @@ if ($CollageCovers != 0) { ?>
       <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) == 2 ? 'invisible' : '')?>"> | <a href="#" class="pageslink" onclick="collageShow.page(<?=ceil($NumGroups / $CollageCovers) - 1?>, this); return false;"><strong>Last &gt;&gt;</strong></a></span>
     </div>
     <script type="text/javascript">//<![CDATA[
-      collageShow.init(<?=json_encode($CollagePages)?>);
+      $(document).ready(function(){collageShow.init(<?=json_encode($CollagePages)?>)});
     //]]></script>
 <?
   }

sections/user/user.php

@@ -808,7 +808,7 @@ foreach ($Collages as $CollageInfo) {
         <a data-toggle-target="#collage<?=$CollageID?>_box .collage_images" data-toggle-replace="Show" class="brackets">Hide</a>
       </span>
     </div>
-    <div id="user_collage_images" class="collage_images">
+    <div id="user_collage_images" class="collage_images" data-wall-child=".collage_image" data-wall-size="5">
 <?  foreach ($Collage as $C) {
       $Group = Torrents::get_groups(array($C['GroupID']), true, true, false);
       extract(Torrents::array_group($Group[$C['GroupID']]));
@@ -828,16 +828,6 @@ foreach ($Collages as $CollageInfo) {
       </div>
 <?  } ?>
     </div>
-    <script>
-    $('#user_collage_images .collage_image img').load(function() {
-      var test = true
-      $('#user_collage_images .collage_image img').toArray().forEach(function(el) {
-        if (!el.complete) test = false
-      })
-      if (test) wall('#user_collage_images', '.collage_image', 5)
-    })
-    wall('#user_collage_images','.collage_image',5)
-    </script>
   </div>
 <?
 }

static/functions/autocomplete.js

@@ -4,6 +4,13 @@ var SELECTOR = '[data-gazelle-autocomplete="true"]';
 $(document).ready(initAutocomplete)
 
 function initAutocomplete() {
+  if (!$.Autocomplete) {
+    window.setTimeout(function() {
+      initAutocomplete();
+    }, 500)
+    return;
+  }
+
   var url = {
     path: window.location.pathname.split('/').reverse()[0].split(".")[0],
     query: window.location.search.slice(1).split('&').reduce((a,b)=>Object.assign(a,{[b.split('=')[0]]:b.split('=')[1]}),{})

static/functions/collage.js

@@ -87,18 +87,6 @@ var collageShow = {
       $(el.parentNode).add_class('selected');
     }
 
-/*
-    wall = new freewall(ul)
-    wall.reset({
-      selector: '.collage_image',
-      cellW: 150,
-      cellH: 'auto',
-      gutterX: 2,
-      gutterY: 2
-    })
-    var cells = wall.container.find('.collage_image')
-    cells.find('img').load(function(){wall.fitWidth()})
-*/
     $('.collage_image img').load(function() {
       var test = true;
       $('.collage_image img').toArray().forEach(function(el) {
@@ -106,7 +94,6 @@ var collageShow = {
       })
       if (test) wall('.collage_images', '.collage_image', 4)
     })
-    console.log('fired')
     wall('.collage_images', '.collage_image', 4)
 
     // Toggle the page number links

static/functions/wall.js

@@ -1,5 +1,5 @@
 function wall(parent, children, style, min) {
-  var min = min || 2
+  var min = +min || 2
   var b = $(parent+':not(.hidden)').raw()
   var bs = $(parent+':not(.hidden) '+children).toArray()
 
@@ -8,6 +8,7 @@ function wall(parent, children, style, min) {
   bs.forEach(function(el){el.style.width='';el.style.height=''})
 
   var rows = []
+  if (typeof(style) === 'string') { style = +style }
   if (typeof(style) === 'number') {
     for (var i=0; i<bs.length; i+=style)
       rows.push(bs.slice(i,i+style))
@@ -53,3 +54,17 @@ function wall(parent, children, style, min) {
     }
   }
 }
+
+if ($('[data-wall-child]').raw()) {
+  $('[data-wall-child]').each(function(i, el) {
+    wall('#'+el.id, el.attributes['data-wall-child'].value, el.attributes['data-wall-size'].value, el.attributes['data-wall-min']?el.attributes['data-wall-min']:false)
+    var sel = '#'+el.id+' '+el.attributes['data-wall-child'].value+' img'
+    $(sel).load(function() {
+      var test = true;
+      $(sel).each(function(j, img) {
+        if (!img.complete) test = false
+      })
+      if (test) wall('#'+el.id, el.attributes['data-wall-child'].value, el.attributes['data-wall-size'].value, el.attributes['data-wall-min']?el.attributes['data-wall-min']:false)
+    })
+  })
+}