Skip to content

Commit

Permalink
Merge e2f36f4 into bfe5e70
Browse files Browse the repository at this point in the history
  • Loading branch information
tilsammans committed Nov 7, 2016
2 parents bfe5e70 + e2f36f4 commit a6720dd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/assets/javascripts/pageflow/slideshow/atmo.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
initialize: function(slideshow, events, multiPlayer) {
this.slideshow = slideshow;
this.multiPlayer = multiPlayer;
this.disabled = false;
this.disabled = pageflow.browser.has('mobile platform');

this.listenTo(events, 'page:change page:update', function() {
this.update();
Expand Down Expand Up @@ -61,7 +61,7 @@
update: function() {
var configuration = this.slideshow.currentPageConfiguration();

if (!this.disabled && !pageflow.browser.has('mobile platform')) {
if (!this.disabled) {
this.multiPlayer.fadeTo(configuration[attributeName]);
}
},
Expand Down Expand Up @@ -102,4 +102,4 @@
};

pageflow.Atmo.duringPlaybackModes = ['play', 'mute', 'turn_down'];
}());
}());

0 comments on commit a6720dd

Please sign in to comment.