From 59bc4143db5086cd943579247265dd438c79b82a Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 1 Oct 2016 21:02:26 -0700
Subject: [PATCH] Remove deferred thumbnail loading; no longer needed.

---
 src/General/Build.coffee      | 6 +++---
 src/General/Build/File.html   | 4 ++--
 src/General/Index.coffee      | 6 +-----
 src/Images/Gallery.coffee     | 4 ----
 src/Images/ImageLoader.coffee | 2 --
 src/classes/Post.Clone.coffee | 5 -----
 6 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index bde8ca75e..1dabf2e2f 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -95,11 +95,11 @@ Build =
     # Remove preceding and following new lines, trailing spaces.
     Build.parseComment(html).trim().replace(/\s+$/gm, '')
 
-  postFromObject: (data, boardID, suppressThumb) ->
+  postFromObject: (data, boardID) ->
     o = Build.parseJSON data, boardID
-    Build.post o, suppressThumb
+    Build.post o
 
-  post: (o, suppressThumb) ->
+  post: (o) ->
     {ID, threadID, boardID, file} = o
     {subject, email, name, tripcode, capcode, uniqueID, flagCode, flag, dateUTC, dateText, commentHTML} = o.info
     {staticPath, gifIcon} = Build
diff --git a/src/General/Build/File.html b/src/General/Build/File.html
index e91c85223..9fd68dff3 100644
--- a/src/General/Build/File.html
+++ b/src/General/Build/File.html
@@ -15,8 +15,8 @@
       (${file.size}, ${file.dimensions || "PDF"})
     </div>
     <a class="fileThumb?{file.isSpoiler}{ imgspoiler}{}" href="${fileURL}" target="_blank">
-      <img
-        ?{suppressThumb}{ data-src="${fileThumb}"}{ src="${fileThumb}"} 
+      <img 
+        src="${fileThumb}" 
         alt="${file.size}" 
         data-md5="${file.MD5}" 
         style="height: ${file.isSpoiler ? 100 : file.theight}px; width: ${file.isSpoiler ? 100 : file.twidth}px;"
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index e9f794b51..d7dd47d8f 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -632,7 +632,7 @@ Index =
 
         if not ((OP = thread.OP) and not OP.isFetchedQuote)
           obj = Index.parsedThreads[ID]
-          OP = new Post Build.post(obj, true), thread, g.BOARD
+          OP = new Post Build.post(obj), thread, g.BOARD
           OP.filterResults = obj.filterResults
           newPosts.push OP
         thread.setPage(Index.threadPosition[ID] // Index.threadsNumPerPage + 1)
@@ -789,10 +789,6 @@ Index =
         $.replace thread.nodes.placeholder, thread.OP.nodes.root
         thread.nodes.placeholder = null
         thread.OP.setCatalogOP false
-      if (file = thread.OP.file) and (thumb = thread.OP.file.thumb) and thumb.dataset.src
-        thumb.src = thumb.dataset.src
-        # XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289
-        thumb.removeAttribute 'data-src'
       nodes.push thread.nodes.root, $.el('hr')
     $.add Index.root, nodes
     if doc.contains Index.root
diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index a247ee793..c9af0a390 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -123,10 +123,6 @@ Gallery =
 
     thumbImg = post.file.thumb.cloneNode false
     thumbImg.style.cssText = ''
-    if thumbImg.dataset.src
-      thumbImg.src = thumbImg.dataset.src
-      # XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289
-      thumbImg.removeAttribute 'data-src'
     $.add thumb, thumbImg
 
     $.on thumb, 'click', Gallery.cb.open
diff --git a/src/Images/ImageLoader.coffee b/src/Images/ImageLoader.coffee
index a6c7dac91..22b6ae598 100644
--- a/src/Images/ImageLoader.coffee
+++ b/src/Images/ImageLoader.coffee
@@ -73,8 +73,6 @@ ImageLoader =
       $.on el, 'load', ->
         clone.file.thumb.src = url for clone in post.clones
         thumb.src = url
-        # XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289
-        thumb.removeAttribute 'data-src'
     el.src = url
 
   toggle: ->
diff --git a/src/classes/Post.Clone.coffee b/src/classes/Post.Clone.coffee
index c41d862c1..b627ad81d 100644
--- a/src/classes/Post.Clone.coffee
+++ b/src/classes/Post.Clone.coffee
@@ -54,11 +54,6 @@ Post.Clone = class extends Post
 
       @file.thumb.muted = true if @file.videoThumb
 
-      if @file.thumb?.dataset.src
-        @file.thumb.src = @file.thumb.dataset.src
-        # XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289
-        @file.thumb.removeAttribute 'data-src'
-
       # Contract thumbnails in quote preview
       ImageExpand.contract @ if @file.thumb and contractThumb