From 5ffc7f4bd4e1fcb485108cd6ab261d8ddfdf6f17 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Thu, 30 Jul 2015 21:52:44 -0700
Subject: [PATCH] Move existence check into $.rm.

---
 src/General/Index.coffee            | 2 +-
 src/General/lib/$.coffee            | 2 +-
 src/Images/ImageExpand.coffee       | 2 +-
 src/Posting/Captcha.noscript.coffee | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index b9c8a70f3..ed7a5e1f3 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -105,7 +105,7 @@ Index =
       d.implementation.createDocument(null, null, null).appendChild board
 
       $.rm el for el in $$ '.navLinks'
-      $.id('search-box')?.parentNode.remove()
+      $.rm $.id('search-box')?.parentNode
       topNavPos = $.id('delform').previousElementSibling
       $.before topNavPos, $.el 'hr'
       $.before topNavPos, Index.navLinks
diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee
index cac19413b..a7488849e 100755
--- a/src/General/lib/$.coffee
+++ b/src/General/lib/$.coffee
@@ -156,7 +156,7 @@ $.hasClass = (el, className) ->
   className in el.classList
 
 $.rm = (el) ->
-  el.remove()
+  el?.remove()
 
 $.rmAll = (root) ->
   # https://gist.github.com/MayhemYDG/8646194
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 10df149dc..844524606 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -121,7 +121,7 @@ ImageExpand =
 
     $.rmClass post.nodes.root, 'expanded-image'
     $.rmClass file.thumb,      'expanding'
-    $.rm file.videoControls if file.videoControls
+    $.rm file.videoControls
     file.thumb.parentNode.href   = file.url
     file.thumb.parentNode.target = '_blank'
     for x in ['isExpanding', 'isExpanded', 'videoControls', 'wasPlaying', 'scrollIntoView']
diff --git a/src/Posting/Captcha.noscript.coffee b/src/Posting/Captcha.noscript.coffee
index 70cef6409..9a2361331 100644
--- a/src/Posting/Captcha.noscript.coffee
+++ b/src/Posting/Captcha.noscript.coffee
@@ -117,9 +117,9 @@ Captcha.noscript =
 
   destroy: ->
     return unless @isEnabled
-    $.rm @nodes.img if @nodes.img
+    $.rm @nodes.img
     delete @nodes.img
-    $.rm @nodes.iframe if @nodes.iframe
+    $.rm @nodes.iframe
     delete @nodes.iframe
     delete @occupied
     @beforeSetup()