From 188144f8c24a8be817d4ac0a9ab14f69be76ed53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 6 Jul 2015 23:47:27 +0200
Subject: [PATCH] Renamed files to please nicolas

---
 php/controller.php                              |  2 +-
 php/footer.php                                  |  2 +-
 php/nochan.php                                  |  2 +-
 server/gulpfile.js                              | 17 +++--------------
 .../dist/{frontpage-min.js => frontpage.min.js} |  0
 static/dist/{main-min.js => main.min.js}        |  0
 static/dist/{remote-min.js => remote.min.js}    |  0
 7 files changed, 6 insertions(+), 17 deletions(-)
 rename static/dist/{frontpage-min.js => frontpage.min.js} (100%)
 rename static/dist/{main-min.js => main.min.js} (100%)
 rename static/dist/{remote-min.js => remote.min.js} (100%)

diff --git a/php/controller.php b/php/controller.php
index 02cc80ca..8f93ed37 100755
--- a/php/controller.php
+++ b/php/controller.php
@@ -160,6 +160,6 @@
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
     <script type="text/javascript" src="//cdn.socket.io/socket.io-1.2.0.js"></script>
     <script type="text/javascript" src="/static/dist/lib/materialize.min.js"></script>
-    <script type="text/javascript" src="/static/dist/remote-min.js"></script>
+    <script type="text/javascript" src="/static/dist/remote.min.js"></script>
 	</body>
 </html>
diff --git a/php/footer.php b/php/footer.php
index 6de5f344..341e3a39 100755
--- a/php/footer.php
+++ b/php/footer.php
@@ -65,4 +65,4 @@
 <script type="text/javascript" src="/static/dist/lib/color-thief.js"></script>
 <script type="text/javascript" src="//cdn.socket.io/socket.io-1.3.5.js"></script>
 <script type="text/javascript" src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha256.js"></script>
-<script type="text/javascript" src="/static/dist/main-min.js"></script>
+<script type="text/javascript" src="/static/dist/main.min.js"></script>
diff --git a/php/nochan.php b/php/nochan.php
index 3dff50da..9fd0fe48 100755
--- a/php/nochan.php
+++ b/php/nochan.php
@@ -175,6 +175,6 @@ if(isset($_GET['chan'])){
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script type="text/javascript" src="https://cdn.socket.io/socket.io-1.2.0.js"></script>
     <script type="text/javascript" src="static/dist/lib/materialize.min.js"></script>
-    <script type="text/javascript" src="static/dist/frontpage-min.js"></script>
+    <script type="text/javascript" src="static/dist/frontpage.min.js"></script>
 	</body>
 </html>
diff --git a/server/gulpfile.js b/server/gulpfile.js
index 1c458afc..1fbe62fe 100755
--- a/server/gulpfile.js
+++ b/server/gulpfile.js
@@ -10,7 +10,7 @@ gulp.task('js', function () {
         	compress: true,
         	enclose: true
         }))
-        .pipe(concat('main-min.js'))
+        .pipe(concat('main.min.js'))
         .pipe(gulp.dest('../static/dist'));
 });
 
@@ -21,18 +21,7 @@ gulp.task('nochan', function () {
             compress: true,
             enclose: true
         }))
-        .pipe(concat('frontpage-min.js'))
-        .pipe(gulp.dest('../static/dist'));
-});
-
-gulp.task('lazyload', function () {
-    gulp.src(['../static/dist/jquery.lazyload.js'])
-        .pipe(uglify({
-            mangle: true,
-            compress: true,
-            enclose: true
-        }))
-        .pipe(concat('frontpage-min.js'))
+        .pipe(concat('frontpage.min.js'))
         .pipe(gulp.dest('../static/dist'));
 });
 
@@ -43,7 +32,7 @@ gulp.task('remotecontroller', function () {
             compress: true,
             enclose: true
         }))
-        .pipe(concat('remote-min.js'))
+        .pipe(concat('remote.min.js'))
         .pipe(gulp.dest('../static/dist'));
 });
 
diff --git a/static/dist/frontpage-min.js b/static/dist/frontpage.min.js
similarity index 100%
rename from static/dist/frontpage-min.js
rename to static/dist/frontpage.min.js
diff --git a/static/dist/main-min.js b/static/dist/main.min.js
similarity index 100%
rename from static/dist/main-min.js
rename to static/dist/main.min.js
diff --git a/static/dist/remote-min.js b/static/dist/remote.min.js
similarity index 100%
rename from static/dist/remote-min.js
rename to static/dist/remote.min.js