Skip to content

Commit

Permalink
Build for samples at v1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Kiro705 committed Mar 3, 2020
1 parent ef8d96b commit cf04032
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 15 deletions.
24 changes: 17 additions & 7 deletions dist/videojs.ima.es.js
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,12 @@ AdUi.prototype.onPlayerVolumeChanged = function (volume) {
* Shows ad controls on mouseover.
*/
AdUi.prototype.showAdControls = function () {
this.addClass(this.controlsDiv, 'ima-controls-div-showing');
var _controller$getSettin = this.controller.getSettings(),
disableAdControls = _controller$getSettin.disableAdControls;

if (!disableAdControls) {
this.addClass(this.controlsDiv, 'ima-controls-div-showing');
}
};

/**
Expand Down Expand Up @@ -1116,7 +1121,7 @@ AdUi.prototype.setShowCountdown = function (showCountdownIn) {
};

var name = "videojs-ima";
var version = "1.7.5";
var version = "1.8.0";
var license = "Apache-2.0";
var main = "./dist/videojs.ima.js";
var module$1 = "./dist/videojs.ima.es.js";
Expand Down Expand Up @@ -1286,6 +1291,10 @@ var SdkImpl = function SdkImpl(controller) {
if (this.controller.getSettings().disableCustomPlaybackForIOS10Plus) {
google.ima.settings.setDisableCustomPlaybackForIOS10Plus(this.controller.getSettings().disableCustomPlaybackForIOS10Plus);
}

if (this.controller.getSettings().ppid) {
google.ima.settings.setPpid(this.controller.getSettings().ppid);
}
};

/**
Expand Down Expand Up @@ -1934,14 +1943,15 @@ var Controller = function Controller(player, options) {
};

Controller.IMA_DEFAULTS = {
debug: false,
timeout: 5000,
prerollTimeout: 1000,
adLabel: 'Advertisement',
adLabelNofN: 'of',
showControlsForJSAds: true,
debug: false,
disableAdControls: false,
prerollTimeout: 1000,
preventLateAdStart: false,
requestMode: 'onLoad',
preventLateAdStart: false
showControlsForJSAds: true,
timeout: 5000
};

/**
Expand Down
24 changes: 17 additions & 7 deletions dist/videojs.ima.js
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,12 @@ AdUi.prototype.onPlayerVolumeChanged = function (volume) {
* Shows ad controls on mouseover.
*/
AdUi.prototype.showAdControls = function () {
this.addClass(this.controlsDiv, 'ima-controls-div-showing');
var _controller$getSettin = this.controller.getSettings(),
disableAdControls = _controller$getSettin.disableAdControls;

if (!disableAdControls) {
this.addClass(this.controlsDiv, 'ima-controls-div-showing');
}
};

/**
Expand Down Expand Up @@ -1122,7 +1127,7 @@ AdUi.prototype.setShowCountdown = function (showCountdownIn) {
};

var name = "videojs-ima";
var version = "1.7.5";
var version = "1.8.0";
var license = "Apache-2.0";
var main = "./dist/videojs.ima.js";
var module$1 = "./dist/videojs.ima.es.js";
Expand Down Expand Up @@ -1292,6 +1297,10 @@ var SdkImpl = function SdkImpl(controller) {
if (this.controller.getSettings().disableCustomPlaybackForIOS10Plus) {
google.ima.settings.setDisableCustomPlaybackForIOS10Plus(this.controller.getSettings().disableCustomPlaybackForIOS10Plus);
}

if (this.controller.getSettings().ppid) {
google.ima.settings.setPpid(this.controller.getSettings().ppid);
}
};

/**
Expand Down Expand Up @@ -1940,14 +1949,15 @@ var Controller = function Controller(player, options) {
};

Controller.IMA_DEFAULTS = {
debug: false,
timeout: 5000,
prerollTimeout: 1000,
adLabel: 'Advertisement',
adLabelNofN: 'of',
showControlsForJSAds: true,
debug: false,
disableAdControls: false,
prerollTimeout: 1000,
preventLateAdStart: false,
requestMode: 'onLoad',
preventLateAdStart: false
showControlsForJSAds: true,
timeout: 5000
};

/**
Expand Down
Loading

0 comments on commit cf04032

Please sign in to comment.