* fix import of common by custom
This commit is contained in:
parent
9d739a78f5
commit
dcc5437f3a
|
|
@ -2,6 +2,19 @@
|
|||
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
* when session ends
|
||||
* - in chrome:
|
||||
* onsuspend
|
||||
* onpause
|
||||
* onended
|
||||
* - in firefox
|
||||
* onstalled
|
||||
* onplaying
|
||||
* onsuspend
|
||||
* onpause
|
||||
* onended
|
||||
*/
|
||||
context.JK = context.JK || {};
|
||||
|
||||
// the purpose of this code is to simply the interaction between user and server
|
||||
|
|
@ -20,7 +33,18 @@
|
|||
var $audio = null;
|
||||
var audioDomElement = null;
|
||||
var musicSessionId = null;
|
||||
var isPlaying = false; // tracks if the stream is actually playing
|
||||
|
||||
var isPlaying = false;
|
||||
|
||||
var PlayStateNone = 'none';
|
||||
var PlayStateInitializing = 'initializing'; // user clicked play--nothing has happened yet
|
||||
var PlayStateBuffering = 'buffering'; // user clicked play--the stream is being read, buffer is being built
|
||||
var PlayStatePlaying = 'playing'; // we are playing
|
||||
var PlayStateStalled = 'stalled'; // we were playing, but the stream is stalled
|
||||
var PlayStateEnded = 'ended'; // we were playing, but the stream ended
|
||||
var PlayStateFailed = 'failed'; // we could not start the stream.
|
||||
|
||||
var playState = PlayStateNone; // tracks if the stream is actually playing
|
||||
|
||||
function play(e) {
|
||||
if(e) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
@import "bootstrap";
|
||||
@import "client/common";
|
||||
|
||||
/* mixins, variables, etc. */
|
||||
|
||||
|
|
|
|||
|
|
@ -210,6 +210,6 @@ if defined?(Bundler)
|
|||
|
||||
config.send_join_session_email_notifications = true
|
||||
|
||||
config.use_promos_on_homepage = true
|
||||
config.use_promos_on_homepage = false
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue