Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change stream to default at wqxr #4

Merged
merged 1 commit into from
Mar 7, 2017
Merged

change stream to default at wqxr #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/components/persistent-player/notification/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default Ember.Component.extend({
return pref === 'default_stream';
}),
preferredStream: computed('session.data.user-prefs-active-stream.slug', function(){
const slug = get(this, 'session.data.user-prefs-active-stream.slug') || 'wnyc-fm939';
const slug = get(this, 'session.data.user-prefs-active-stream.slug') || 'wqxr';
return get(this, 'store').peekRecord('stream', slug);
}),
classNames: ['notification', 'notification-active'],
Expand Down
2 changes: 1 addition & 1 deletion app/components/user-settings/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default Ember.Component.extend({
enableAutoplay: computed.equal('session.data.user-prefs-active-autoplay', 'no_autoplay'),
activeStream: computed('session.data.user-prefs-active-stream.slug', function(){
let streams = this.get('streams');
let currentStream = this.getWithDefault('session.data.user-prefs-active-stream', {slug: 'wnyc-fm939', name: 'WNYC 93.9 FM'});
let currentStream = this.getWithDefault('session.data.user-prefs-active-stream', {slug: 'wqxr', name: 'WQXR New York'});
return streams.findBy('slug', currentStream.slug);
}),

Expand Down
2 changes: 1 addition & 1 deletion app/routes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default Ember.Route.extend(PlayParamMixin, {

model() {
let page = this.store.findRecord('django-page', '/');
let featuredStream = this.store.findRecord('stream', 'wnyc-fm939');
let featuredStream = this.store.findRecord('stream', 'wqxr');
return hash({page, featuredStream});
},
afterModel({ page }) {
Expand Down
6 changes: 3 additions & 3 deletions app/services/bumper-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default Ember.Service.extend({
}
}),
autoplayChoice: computed('autoplayPref', 'autoplaySlug', function() {
const autoplaySlug = get(this, 'autoplaySlug') || 'wnyc-fm939';
const autoplaySlug = get(this, 'autoplaySlug') || 'wqxr';
const autoplayPref = get(this, 'autoplayPref') || 'default_stream';
if (autoplayPref === 'default_stream') {
let stream = get(this, 'store').peekRecord('stream', autoplaySlug);
Expand All @@ -61,7 +61,7 @@ export default Ember.Service.extend({
}),

getAutoplayAudioId() {
const autoplaySlug = get(this, 'autoplaySlug') || 'wnyc-fm939';
const autoplaySlug = get(this, 'autoplaySlug') || 'wqxr';
const autoplayPref = get(this, 'autoplayPref') || 'default_stream';

if (autoplayPref === 'default_stream') {
Expand All @@ -74,7 +74,7 @@ export default Ember.Service.extend({
},

getBumperUrl() {
const autoplaySlug = get(this, 'autoplaySlug') || 'wnyc-fm939';
const autoplaySlug = get(this, 'autoplaySlug') || 'wqxr';
const autoplayPref = get(this, 'autoplayPref') || 'default_stream';

let nextItem;
Expand Down