diff --git a/app/lib/AudioPlayer.coffee b/app/lib/AudioPlayer.coffee index 773a72d35..9d7143192 100644 --- a/app/lib/AudioPlayer.coffee +++ b/app/lib/AudioPlayer.coffee @@ -111,9 +111,6 @@ class AudioPlayer extends CocoClass @soundsToPlayWhenLoaded[name] = audioOptions.volume audioOptions = @applyPanning audioOptions, pos if @camera and not @camera.destroyed and pos instance = createjs.Sound.play name, audioOptions - # For some reason, individual sound volume control doesn't work any more. - # I tried updating to SoundJS NEXT on 2014-09-10, but couldn't get any sounds to play with that one. - #console.log 'got instance with volume', instance.volume, instance._volume, instance.gainNode?.gain.value instance hasLoadedSound: (filename, name) -> diff --git a/app/lib/surface/MusicPlayer.coffee b/app/lib/surface/MusicPlayer.coffee index 383f7f79b..b218ea05b 100644 --- a/app/lib/surface/MusicPlayer.coffee +++ b/app/lib/surface/MusicPlayer.coffee @@ -27,7 +27,7 @@ module.exports = class MusicPlayer extends CocoClass onPlayMusic: (e) -> return if application.isIPadApp # Hard to measure, but just guessing this will save memory. src = e.file - src = "/file#{e.file}#{AudioPlayer.ext}" + src = "/file#{src}#{AudioPlayer.ext}" if (not e.file) or src is @currentMusic?.src if e.play then @restartCurrentMusic() else @fadeOutCurrentMusic() return diff --git a/app/models/User.coffee b/app/models/User.coffee index 09157abd1..a3d6e3aeb 100644 --- a/app/models/User.coffee +++ b/app/models/User.coffee @@ -144,7 +144,7 @@ module.exports = class User extends CocoModel @subscribeCopyGroup = switch group when 0, 1, 2 then 'original' when 3, 4, 5 then 'new' - if /^en/.test(@get('preferredLanguage')) and not me.isAdmin() + if (not @get('preferredLanguage') or /^en/.test(@get('preferredLanguage'))) and not me.isAdmin() application.tracker.identify subscribeCopyGroup: @subscribeCopyGroup else @subscribeCopyGroup = 'original' diff --git a/app/styles/play/world-map-view.sass b/app/styles/play/world-map-view.sass index 64a8eec6b..d96b8dda6 100644 --- a/app/styles/play/world-map-view.sass +++ b/app/styles/play/world-map-view.sass @@ -96,6 +96,7 @@ $gameControlMargin: 30px .map-background width: 100% height: 100% + @include user-select(none) .level, .level-shadow position: absolute diff --git a/app/views/core/CocoView.coffee b/app/views/core/CocoView.coffee index 0273cb245..593c79e07 100644 --- a/app/views/core/CocoView.coffee +++ b/app/views/core/CocoView.coffee @@ -161,7 +161,7 @@ module.exports = class CocoView extends Backbone.View else @warnConnectionError() return _.delay (=> r.load()), 3000 - + @$el.find('.loading-container .errors').append(loadingErrorTemplate({ status: r.jqxhr?.status name: r.name @@ -173,7 +173,7 @@ module.exports = class CocoView extends Backbone.View warnConnectionError: -> msg = $.i18n.t 'loading_error.connection_failure', defaultValue: 'Connection failed.' noty text: msg, layout: 'center', type: 'error', killer: true, timeout: 3000 - + onRetryResource: (e) -> res = @supermodel.getResource($(e.target).data('resource-index')) # different views may respond to this call, and not all have the resource to reload @@ -425,6 +425,9 @@ module.exports = class CocoView extends Backbone.View isIPadBrowser: -> navigator?.userAgent?.indexOf('iPad') isnt -1 + isFirefox: -> + navigator.userAgent.toLowerCase().indexOf('firefox') isnt -1 + initSlider: ($el, startValue, changeCallback) -> slider = $el.slider({animate: 'fast'}) slider.slider('value', startValue)