From 484f80c21c7ec9d765f3cfa6d67bf1184c3c16fc Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordaneldredge@gmail.com>
Date: Tue, 14 Apr 2015 22:18:09 -0700
Subject: [PATCH] Ensure file names match module names used

---
 css/{main.css => main-window.css} | 0
 css/winamp.css                    | 2 +-
 js/context.js                     | 6 +++++-
 js/main-window.js                 | 8 +++++++-
 js/{file.js => my-file.js}        | 0
 js/winamp.js                      | 6 +++---
 6 files changed, 16 insertions(+), 6 deletions(-)
 rename css/{main.css => main-window.css} (100%)
 rename js/{file.js => my-file.js} (100%)

diff --git a/css/main.css b/css/main-window.css
similarity index 100%
rename from css/main.css
rename to css/main-window.css
diff --git a/css/winamp.css b/css/winamp.css
index 9e715c8b..198914df 100644
--- a/css/winamp.css
+++ b/css/winamp.css
@@ -1,4 +1,4 @@
-@import url("main.css");
+@import url("main-window.css");
 @import url("context-menu.css");
 
 /* Rules used by all windows */
diff --git a/js/context.js b/js/context.js
index acdd1ad1..1fafa9e2 100644
--- a/js/context.js
+++ b/js/context.js
@@ -1,4 +1,8 @@
-define(['file'], function(MyFile) {
+define([
+    'my-file'
+], function(
+    MyFile
+) {
 return {
     init: function(winamp) {
         this.winamp = winamp;
diff --git a/js/main-window.js b/js/main-window.js
index 2a55d5ca..38f294ff 100644
--- a/js/main-window.js
+++ b/js/main-window.js
@@ -1,4 +1,10 @@
-define(['multi-display', 'font'], function(MultiDisplay, Font) {
+define([
+    'multi-display',
+    'font'
+], function(
+    MultiDisplay,
+    Font
+) {
 return {
     init: function(winamp) {
         this.winamp = winamp;
diff --git a/js/file.js b/js/my-file.js
similarity index 100%
rename from js/file.js
rename to js/my-file.js
diff --git a/js/winamp.js b/js/winamp.js
index 4909d5d7..9508b9a9 100755
--- a/js/winamp.js
+++ b/js/winamp.js
@@ -4,11 +4,11 @@ define([
     'window-manager',
     'skin',
     'media',
-    'file'
+    'my-file'
 ], function(
     MainWindow,
     WindowManager,
-    SkinManager,
+    Skin,
     Media,
     MyFile
 ) {
@@ -20,7 +20,7 @@ return {
 
         this.windowManager = WindowManager;
         this.media = Media.init();
-        this.skin = SkinManager.init(document.getElementById('visualizer'), this.media._analyser);
+        this.skin = Skin.init(document.getElementById('visualizer'), this.media._analyser);
         this.state = '';
 
         this.mainWindow = MainWindow.init(this);