lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updating ember-cli to v2

Browse source
This commit is contained in:
Egor 2016-02-21 22:21:39 -08:00
parent 669571fa31
commit f77f0c92e0
7 changed files with 20 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/app.js
View file

@ -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;

1
app/pods/components/music-tab/component.js
View file

@ -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');

2
app/pods/components/music-tab/template.hbs
View file

@ -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>

3
app/resolver.js Normal file
View file

@ -0,0 +1,3 @@
import Resolver from 'ember-resolver';
export default Resolver;

20
bower.json
View file

@ -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"
}
}

13
config/environment.js
View file

@ -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"
}
};

18
package.json
View file

@ -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"
}
}