--- a/cms/app-client/.travis.yml Sat Aug 06 21:29:33 2016 +0700
+++ b/cms/app-client/.travis.yml Mon Aug 08 15:27:35 2016 +0700
@@ -14,7 +14,7 @@
- npm install -g bower
- bower --version
- npm install phantomjs-prebuilt
- - phantomjs --version
+ - node_modules/phantomjs-prebuilt/bin/phantomjs --version
install:
- npm install
--- a/cms/app-client/app/components/player-component.js Sat Aug 06 21:29:33 2016 +0700
+++ b/cms/app-client/app/components/player-component.js Mon Aug 08 15:27:35 2016 +0700
@@ -3,8 +3,9 @@
export default Ember.Component.extend({
classNames: ['player-component'],
- classNameBindings: ['video:video'],
- videoBinding: 'player.model.video',
+ classNameBindings: ['video:video', 'reduce:reduce'],
+ video: Ember.computed.alias('player.model.video'),
+ reduce: Ember.computed.alias('player.reduce'),
player: Ember.inject.service(),
popcorn: null,
@@ -38,7 +39,7 @@
this.play();
} else {
this.pause();
- }
+ }
}),
init: function() {
--- a/cms/app-client/bower.json Sat Aug 06 21:29:33 2016 +0700
+++ b/cms/app-client/bower.json Mon Aug 08 15:27:35 2016 +0700
@@ -1,7 +1,7 @@
{
"name": "app-client",
"dependencies": {
- "ember": "~2.7.0",
+ "ember": "~2.8.0-beta.1",
"ember-cli-shims": "0.1.1",
"ember-qunit-notifications": "0.1.0",
"jquery": "^2.2",
--- a/cms/app-client/package.json Sat Aug 06 21:29:33 2016 +0700
+++ b/cms/app-client/package.json Mon Aug 08 15:27:35 2016 +0700
@@ -30,7 +30,7 @@
"broccoli-static-compiler": "^0.2.2",
"corpus-common-addon": "file:../../common/corpus-common-addon",
"ember-ajax": "^2.4.1",
- "ember-cli": "2.7.0",
+ "ember-cli": "2.8.0-beta.2",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6",
"ember-cli-d3": "1.1.6",
@@ -40,13 +40,13 @@
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0",
"ember-cli-mirage": "0.2.0",
- "ember-cli-qunit": "^2.0.0",
+ "ember-cli-qunit": "^2.1.0",
"ember-cli-release": "^0.2.9",
"ember-cli-sass": "5.3.1",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.7.0",
+ "ember-data": "^2.8.0-beta.1",
"ember-data-fixture-adapter": "1.13.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",