From 3fd7d9a604fa11d2412f45f4a87bc5f9d150cbc2 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Mon, 7 Oct 2013 16:56:20 -0400
Subject: [PATCH] moved jquery.form.js into appropriate location

---
 public/templates/install/header.tpl             | 2 +-
 public/{src => vendor/jquery/js}/jquery.form.js | 0
 src/meta.js                                     | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename public/{src => vendor/jquery/js}/jquery.form.js (100%)

diff --git a/public/templates/install/header.tpl b/public/templates/install/header.tpl
index a1f8004f37..0002cbb025 100644
--- a/public/templates/install/header.tpl
+++ b/public/templates/install/header.tpl
@@ -10,12 +10,12 @@
 	<link rel="stylesheet" href="/vendor/fontawesome/css/font-awesome.min.css">
 	<script type="text/javascript" src="http://code.jquery.com/jquery.js"></script>
 	<script type="text/javascript" src="/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js"></script>
+	<script type="text/javascript" src="/vendor/jquery/js/jquery.form.js"></script>
 	<script type="text/javascript" src="/vendor/bootstrap/js/bootstrap.min.js"></script>
 	<script type="text/javascript" src="/socket.io/socket.io.js"></script>
 	<script type="text/javascript" src="/src/app.js"></script>
 	<script type="text/javascript" src="/src/templates.js"></script>
 	<script type="text/javascript" src="/src/ajaxify.js"></script>
-	<script type="text/javascript" src="/src/jquery.form.js"></script>
 	<script type="text/javascript" src="/src/utils.js"></script>
 
 	<link rel="stylesheet" type="text/css" href="/css/style.css" />
diff --git a/public/src/jquery.form.js b/public/vendor/jquery/js/jquery.form.js
similarity index 100%
rename from public/src/jquery.form.js
rename to public/vendor/jquery/js/jquery.form.js
diff --git a/src/meta.js b/src/meta.js
index 32d30ec12f..4cd20ccca5 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -157,6 +157,7 @@ var utils = require('./../public/src/utils.js'),
 			'vendor/jquery/js/jquery.js',
 			'vendor/jquery/js/jquery-ui-1.10.3.custom.min.js',
 			'vendor/jquery/js/jquery.timeago.js',
+			'vendor/jquery/js/jquery.form.js',
 			'vendor/bootstrap/js/bootstrap.min.js',
 			'src/app.js',
 			'vendor/requirejs/require.js',
@@ -164,7 +165,6 @@ var utils = require('./../public/src/utils.js'),
 			'src/templates.js',
 			'src/ajaxify.js',
 			'src/translator.js',
-			'src/jquery.form.js',
 			'src/utils.js'
 		],
 		minFile: path.join(__dirname, '..', 'public/src/nodebb.min.js'),