From f82ad879f06f8f4c730e169ea2eced64a7845e41 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Thu, 19 Mar 2015 20:22:17 -0700
Subject: [PATCH] Make file selector work, add to config

---
 inc/instance-config.php  | 2 +-
 js/file-selector.js      | 4 ++--
 templates/post_form.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index ef456aab..cfcb62de 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -142,7 +142,7 @@
 	$config['additional_javascript'][] = 'js/image-hover.js';
 	$config['additional_javascript'][] = 'js/auto-scroll.js';
 	$config['additional_javascript'][] = 'js/twemoji/twemoji.js';
-	$config['additional_javascript'][] = 'js/multi-image.js';
+	$config['additional_javascript'][] = 'js/file-selector.js';
 	// Oekaki (now depends on config.oekaki so can be in all scripts)
 	$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
 	$config['additional_javascript'][] = 'js/wPaint/lib/wColorPicker.min.js';
diff --git a/js/file-selector.js b/js/file-selector.js
index b4589706..42a726c1 100644
--- a/js/file-selector.js
+++ b/js/file-selector.js
@@ -5,7 +5,7 @@
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/file-selector.js';
  */
-function init_file_selector() {
+function init_file_selector(max_images) {
 
 $(document).ready(function () {
 	// add options panel item
@@ -20,7 +20,7 @@ $(document).ready(function () {
 			}
 		});
 
-		if (localStorage.file_dragdrop === 'undefined') localStorage.file_dragdrop = 'true';
+		if (typeof localStorage.file_dragdrop === 'undefined') localStorage.file_dragdrop = 'true';
 		if (localStorage.file_dragdrop === 'true') $('#file-drag-drop>input').prop('checked', true);
 	}
 });
diff --git a/templates/post_form.html b/templates/post_form.html
index 6db2ae13..0d02dc4e 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -97,7 +97,7 @@
 						<div class="file-thumbs"></div>
 					</div>
 				</div>
-				<script type="text/javascript">init_file_selector();</script>
+				<script type="text/javascript">init_file_selector({{ config.max_images }});</script>
 				{% if config.allow_upload_by_url %}
 					<div style="float:none;text-align:left" id="upload_url">
 						<label for="file_url">{% trans %}Or URL{% endtrans %}</label>: