updating libraries, small things

This commit is contained in:
Egor 2016-01-30 14:17:31 -08:00
parent 6458c6eba4
commit 0164912e24
3 changed files with 18 additions and 14 deletions

View file

@ -199,7 +199,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
if(!Em.isNone(track) && !Em.isNone(track.offset())) {
playListArea.animate({
scrollTop: track.offset().top - playListArea.offset().top + playListArea.scrollTop() - 30
scrollTop: track.offset().top - playListArea.offset().top + playListArea.scrollTop()
});
}
}, 1000);
@ -348,7 +348,6 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
this.send('goToSong', nextSong, true, true);
}
},
fullscreen() {},
seekChanged(position) {
var dancer = this.get('dancer');

View file

@ -2,20 +2,19 @@
"name": "huegasm",
"dependencies": {
"bootstrap-sass": "~3.3.5",
"ember": "~2.2.0",
"ember-cli-shims": "0.0.6",
"ember": "~2.3.0",
"ember-cli-shims": "0.1.0",
"ember-cli-test-loader": "0.2.1",
"ember-data": "~2.2.1",
"ember-load-initializers": "0.1.7",
"ember-qunit": "0.4.18",
"ember-qunit": "0.4.16",
"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.1.4",
"jquery": "~2.2.0",
"jquery-mousewheel": "~3.1.13",
"loader.js": "ember-cli/loader.js#3.2.1",
"loader.js": "ember-cli/loader.js#3.4.0",
"locallyjs": "~0.3.2",
"matchMedia": "~0.2.0",
"nouislider": "^8.0.1",
@ -23,6 +22,12 @@
"HackTimer": "https://github.com/turuslan/HackTimer.git#~1.0.0"
},
"resolutions": {
"ember": "~2.1.0"
"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"
}
}

View file

@ -20,10 +20,10 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.2.0",
"ember-cli": "^1.13.12",
"ember-cli": "^1.13.15",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.5",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-content-security-policy": "0.5.0",
"ember-cli-dependency-checker": "^1.1.0",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
@ -31,12 +31,12 @@
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-nouislider": "0.7.0",
"ember-cli-qunit": "^1.0.4",
"ember-cli-release": "0.2.8",
"ember-cli-release": "1.0.0-beta.1",
"ember-cli-sass": "5.2.1",
"ember-cli-sri": "^1.1.0",
"ember-cli-sri": "^2.0.0",
"ember-cli-uglify": "^1.2.0",
"ember-cli-windows-addon": "^1.2.2",
"ember-data": "2.2.1",
"ember-data": "~2.3.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-modal-dialog": "0.8.3",