From f0d2dfb38b5c13437ebfd803a8ee7bdd92e00e7e Mon Sep 17 00:00:00 2001
From: lone-cloud <lonecloud604@pm.me>
Date: Sun, 21 Feb 2016 22:21:39 -0800
Subject: [PATCH] updating ember-cli to v2

---
 app/app.js                                 |  4 ++--
 app/pods/components/music-tab/component.js |  1 +
 app/pods/components/music-tab/template.hbs |  2 +-
 app/resolver.js                            |  3 +++
 bower.json                                 | 20 +++-----------------
 config/environment.js                      | 13 -------------
 package.json                               | 18 ++++++++++--------
 7 files changed, 20 insertions(+), 41 deletions(-)
 create mode 100644 app/resolver.js

diff --git a/app/app.js b/app/app.js
index 8b234d6..831ad61 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;
diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js
index 638a3b5..c61cd61 100644
--- a/app/pods/components/music-tab/component.js
+++ b/app/pods/components/music-tab/component.js
@@ -861,6 +861,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
      // demo tracks
     if(this.get('firstVisit')){
       this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/candyland-speechless-feat-rkcb');
+      this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/vallis-alps-young-feki-remix');
       this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/andrew-luce-when-to-love-you-feat-chelsea-cutler');
       this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/ahh-ooh-carefree-with-me');
       this.send('handleNewSoundCloudURL', 'https://soundcloud.com/odesza/light-feat-little-dragon');
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 9df40b1..aec2b29 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -183,7 +183,7 @@
 
 </div>
 
-<div id="beatContainer" class="col-sm-5 col-xs-12">
+<div id="beatContainer" class="col-sm-5 hidden-xs">
 <div class="bezel">
   <div class="rivet1"></div>
   <div class="rivet2"></div>
diff --git a/app/resolver.js b/app/resolver.js
new file mode 100644
index 0000000..2fb563d
--- /dev/null
+++ b/app/resolver.js
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;
diff --git a/bower.json b/bower.json
index ced5b37..bab6844 100644
--- a/bower.json
+++ b/bower.json
@@ -2,32 +2,18 @@
   "name": "huegasm",
   "dependencies": {
     "bootstrap-sass": "~3.3.5",
-    "ember": "~2.3.0",
+    "ember": "~2.3.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.1",
-    "ember-load-initializers": "0.1.7",
-    "ember-qunit": "0.4.16",
+    "ember-load-initializers": "0.5.1",
     "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "~0.1.20",
     "hammerjs": "~2.0.4",
     "intro.js": "~1.1.1",
     "JavaScript-ID3-Reader": "https://github.com/aadsm/JavaScript-ID3-Reader.git",
-    "jquery": "~2.2.0",
     "jquery-mousewheel": "~3.1.13",
-    "loader.js": "ember-cli/loader.js#3.4.0",
     "locallyjs": "~0.3.2",
     "matchMedia": "~0.2.0",
-    "nouislider": "^8.0.1",
-    "qunit": "~1.20.0",
+    "nouislider": "^8.3.0",
     "HackTimer": "https://github.com/turuslan/HackTimer.git#~1.0.0"
-  },
-  "resolutions": {
-    "ember-cli-test-loader": "0.2.1",
-    "ember-load-initializers": "0.1.7",
-    "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "~0.1.20",
-    "jquery": "~2.2.0",
-    "qunit-notifications": "~0.1.0",
-    "qunit": "~1.20.0"
   }
 }
diff --git a/config/environment.js b/config/environment.js
index 084ae7d..d502f2d 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -17,19 +17,6 @@ module.exports = function(environment) {
     APP: {
       // Here you can pass flags/options to your application instance
       // when it is created
-    },
-
-    contentSecurityPolicy: {
-      'child-src': "blob:",
-      'default-src': "'none'",
-      'script-src': "'self' 'unsafe-inline' connect.soundcloud.com www.google-analytics.com data:",
-      'font-src': "'self' fonts.gstatic.com",
-      'connect-src': "'self' *",
-      'img-src': "'self' *.sndcdn.com  www.google-analytics.com data:",
-      'media-src': "'self' api.soundcloud.com *.sndcdn.com blob:",
-      'style-src': "'self' 'unsafe-inline' fonts.googleapis.com",
-      'object-src': "'self' connect.soundcloud.com",
-      'frame-src': "'self' www.youtube.com"
     }
   };
 
diff --git a/package.json b/package.json
index a34293f..0c05f76 100644
--- a/package.json
+++ b/package.json
@@ -20,28 +20,30 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
-    "ember-cli": "^1.13.15",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "^2.3.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.5",
-    "ember-cli-content-security-policy": "0.5.0",
-    "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars": "^1.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-nouislider": "0.7.0",
     "ember-cli-qunit": "^1.2.1",
-    "ember-cli-release": "1.0.0-beta.1",
+    "ember-cli-release": "0.2.8",
     "ember-cli-sass": "5.2.1",
     "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-cli-windows-addon": "^1.2.2",
-    "ember-data": "~2.3.0",
+    "ember-data": "^2.3.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
+    "ember-load-initializers": "^0.5.0",
     "ember-modal-dialog": "0.8.3",
     "ember-notify": "^4.0.1",
-    "ember-paper": "^0.2.10",
-    "ember-truth-helpers": "1.2.0"
+    "ember-paper": "^0.2.11",
+    "ember-resolver": "^2.0.3",
+    "ember-truth-helpers": "1.2.0",
+    "loader.js": "^4.0.0"
   }
 }