From eaec80f5a508d4c0eef69857b788aebcdb577337 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 31 Jan 2015 00:51:44 -0800
Subject: [PATCH] Merge from Appchan X: src/Menu

excluded: Labels.coffee
---
 src/Menu/ArchiveLink.coffee  | 2 +-
 src/Menu/DeleteLink.coffee   | 2 +-
 src/Menu/DownloadLink.coffee | 2 +-
 src/Menu/Menu.coffee         | 2 +-
 src/Menu/ReportLink.coffee   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Menu/ArchiveLink.coffee b/src/Menu/ArchiveLink.coffee
index 463549e73..f537d70c1 100755
--- a/src/Menu/ArchiveLink.coffee
+++ b/src/Menu/ArchiveLink.coffee
@@ -1,6 +1,6 @@
 ArchiveLink =
   init: ->
-    return if g.VIEW not in ['index', 'thread'] or !Conf['Menu'] or !Conf['Archive Link']
+    return unless g.VIEW in ['index', 'thread'] and Conf['Menu'] and Conf['Archive Link']
 
     div = $.el 'div',
       textContent: 'Archive'
diff --git a/src/Menu/DeleteLink.coffee b/src/Menu/DeleteLink.coffee
index dc90da6ce..8a15c6e2b 100755
--- a/src/Menu/DeleteLink.coffee
+++ b/src/Menu/DeleteLink.coffee
@@ -1,6 +1,6 @@
 DeleteLink =
   init: ->
-    return if g.VIEW not in ['index', 'thread'] or !Conf['Menu'] or !Conf['Delete Link']
+    return unless g.VIEW in ['index', 'thread'] and Conf['Menu'] and Conf['Delete Link']
 
     div = $.el 'div',
       className: 'delete-link'
diff --git a/src/Menu/DownloadLink.coffee b/src/Menu/DownloadLink.coffee
index 19743e3d8..d7c3f9411 100755
--- a/src/Menu/DownloadLink.coffee
+++ b/src/Menu/DownloadLink.coffee
@@ -1,6 +1,6 @@
 DownloadLink =
   init: ->
-    return if g.VIEW not in ['index', 'thread'] or !Conf['Menu'] or !Conf['Download Link']
+    return unless g.VIEW in ['index', 'thread'] and Conf['Menu'] and Conf['Download Link']
 
     a = $.el 'a',
       className: 'download-link'
diff --git a/src/Menu/Menu.coffee b/src/Menu/Menu.coffee
index 7f86d6f4e..6ca40d1f5 100755
--- a/src/Menu/Menu.coffee
+++ b/src/Menu/Menu.coffee
@@ -1,6 +1,6 @@
 Menu = 
   init: ->
-    return if g.VIEW not in ['index', 'thread'] or !Conf['Menu']
+    return unless g.VIEW in ['index', 'thread'] and Conf['Menu']
 
     @button = $.el 'a',
       className: 'menu-button'
diff --git a/src/Menu/ReportLink.coffee b/src/Menu/ReportLink.coffee
index 429374566..73b60a661 100755
--- a/src/Menu/ReportLink.coffee
+++ b/src/Menu/ReportLink.coffee
@@ -1,6 +1,6 @@
 ReportLink =
   init: ->
-    return if g.VIEW not in ['index', 'thread'] or !Conf['Menu'] or !Conf['Report Link']
+    return unless g.VIEW in ['index', 'thread'] and Conf['Menu'] and Conf['Report Link']
 
     a = $.el 'a',
       className: 'report-link'