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

Fix/mouseenter mouseleave handlers on i os upd 10 2019 #3

Open
wants to merge 30 commits into
base: master-hearst
Choose a base branch
from
Open

Fix/mouseenter mouseleave handlers on i os upd 10 2019 #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
278556b
feat: adds a request mode for ad requests
Jan 29, 2019
168c3c1
Readme Update: updates the Readme to highlight an example using es6 i…
Kiro705 Aug 19, 2019
18186f9
fix: fixed small errors in Readme update
Kiro705 Aug 19, 2019
8dd1922
updates for spelling
Kiro705 Aug 19, 2019
8be147e
grammer update
Kiro705 Aug 19, 2019
1f685b2
one comma
Kiro705 Aug 19, 2019
4f34a54
Merge pull request #815 from googleads/es6-readme-update
Kiro705 Aug 20, 2019
9968f03
Removes the click eventListener on the adContainer
arnaudcasame Aug 27, 2019
0f88d33
Generates the distribution files
arnaudcasame Aug 27, 2019
0b63fb1
Merge pull request #1 from googleads/master
arnaudcasame Aug 27, 2019
2b854a4
fix: changed to parseFloat
Kiro705 Sep 9, 2019
4b5eef9
fix: removed second param from parseFloat
Kiro705 Sep 9, 2019
3ceda1b
1.6.1
Kiro705 Sep 10, 2019
f8d9546
merge commits for v1.6.1
Kiro705 Sep 10, 2019
b32c1dc
Merge pull request #818 from arnaudcasame/master
gschoppe Sep 10, 2019
3d4e995
fix: fixed error in videojs.ima.min.js
Kiro705 Sep 11, 2019
a8026ec
Merge pull request #822 from googleads/minified-fix
Kiro705 Sep 11, 2019
b76516c
1.6.2
Kiro705 Sep 11, 2019
3768f01
Build for samples at v1.6.2
Kiro705 Sep 11, 2019
6790115
Updates readme for accurate locale codes
Kiro705 Sep 30, 2019
054a57b
update to v1.6.3
Kiro705 Sep 30, 2019
16d3c8b
Merge pull request #781 from Afrozaar/master
gschoppe Sep 30, 2019
b9c93f5
Merge pull request #827 from googleads/currentChange
Kiro705 Sep 30, 2019
6675841
Merge pull request #828 from googleads/locale-update
Kiro705 Sep 30, 2019
3e10247
updated dist files for 1.6.3
Kiro705 Sep 30, 2019
93d70d2
Merge pull request #829 from googleads/updated-files
Kiro705 Sep 30, 2019
43a87b9
1.6.3
Kiro705 Sep 30, 2019
5f643a3
CI and test-stage edits inside origin: .travis.yml & package.json
Viktor286hearts Jul 16, 2019
a3a263a
fix: edge case for iOS: no mouse enter/leave events on adContainerDiv
Viktor286hearts Jul 15, 2019
70ca5d8
dist manual update (temp)
Viktor286hearts Jul 16, 2019
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
node_modules/
dist/
8 changes: 5 additions & 3 deletions dist/videojs.ima.es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,10 @@ AdUi.prototype.createAdContainer = function () {
this.assignControlAttributes(this.adContainerDiv, 'ima-ad-container');
this.adContainerDiv.style.position = 'absolute';
this.adContainerDiv.style.zIndex = 1111;
this.adContainerDiv.addEventListener('mouseenter', this.showAdControls.bind(this), false);
this.adContainerDiv.addEventListener('mouseleave', this.hideAdControls.bind(this), false);
if (!videojs.browser.IS_IOS) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the reason for this check?

this.adContainerDiv.addEventListener('mouseenter', this.showAdControls.bind(this), false);
this.adContainerDiv.addEventListener('mouseleave', this.hideAdControls.bind(this), false);
}
this.createControls();
this.controller.injectAdContainerDiv(this.adContainerDiv);
};
Expand Down Expand Up @@ -1112,7 +1114,7 @@ var main = "./dist/videojs.ima.js";
var module$1 = "./dist/videojs.ima.es.js";
var author = { "name": "Google Inc." };
var engines = { "node": ">=0.8.0" };
var scripts = { "contBuild": "watch 'npm run rollup:max' src", "predevServer": "echo \"Starting up server on localhost:8000.\"", "devServer": "npm-run-all -p testServer contBuild", "lint": "eslint \"src/*.js\"", "rollup": "npm-run-all rollup:*", "rollup:max": "rollup -c configs/rollup.config.js", "rollup:es": "rollup -c configs/rollup.config.es.js", "rollup:min": "rollup -c configs/rollup.config.min.js", "pretest": "npm run rollup", "start": "npm run devServer", "test": "npm-run-all test:*", "test:vjs5": "npm install [email protected] --no-save && npm-run-all -p -r testServer webdriver", "test:vjs6": "npm install video.js@6 --no-save && npm-run-all -p -r testServer webdriver", "test:vjs7": "npm install video.js@7 --no-save && npm-run-all -p -r testServer webdriver", "testServer": "http-server --cors -p 8000 --silent", "preversion": "node scripts/preversion.js && npm run lint && npm test", "version": "node scripts/version.js", "postversion": "node scripts/postversion.js", "webdriver": "mocha test/webdriver/*.js --no-timeouts" };
var scripts = { "contBuild": "watch 'npm run rollup:max' src", "predevServer": "echo \"Starting up server on localhost:8000.\"", "devServer": "npm-run-all -p testServer contBuild", "lint": "eslint \"src/*.js\"", "rollup": "npm-run-all rollup:*", "rollup:max": "rollup -c configs/rollup.config.js", "rollup:es": "rollup -c configs/rollup.config.es.js", "rollup:min": "rollup -c configs/rollup.config.min.js", "pretest": "npm run rollup", "start": "npm run devServer", "test": "npm-run-all test:*", "test:vjs5": "npm install [email protected] --no-save && npm-run-all -p -r testServer webdriver", "test:vjs6": "npm install video.js@6 --no-save && npm-run-all -p -r testServer webdriver", "test:vjs7": "npm install video.js@7 --no-save && npm-run-all -p -r testServer webdriver", "testServer": "http-server --cors -p 8000 --silent", "preversion": "node scripts/preversion.js && npm run lint && npm test", "version": "node scripts/version.js", "postversion": "node scripts/postversion.js", "webdriver": "mocha test/webdriver/basic-hearst-mod.js --no-timeouts" };
var repository = { "type": "git", "url": "https://github.com/googleads/videojs-ima" };
var files = ["CHANGELOG.md", "LICENSE", "README.md", "dist/", "src/"];
var dependencies = { "can-autoplay": "^3.0.0", "cryptiles": "^4.1.2", "video.js": "^5.19.2 || ^6 || ^7", "videojs-contrib-ads": "^6" };
Expand Down
8 changes: 5 additions & 3 deletions dist/videojs.ima.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,10 @@ AdUi.prototype.createAdContainer = function () {
this.assignControlAttributes(this.adContainerDiv, 'ima-ad-container');
this.adContainerDiv.style.position = 'absolute';
this.adContainerDiv.style.zIndex = 1111;
this.adContainerDiv.addEventListener('mouseenter', this.showAdControls.bind(this), false);
this.adContainerDiv.addEventListener('mouseleave', this.hideAdControls.bind(this), false);
if (!videojs.browser.IS_IOS) {
this.adContainerDiv.addEventListener('mouseenter', this.showAdControls.bind(this), false);
this.adContainerDiv.addEventListener('mouseleave', this.hideAdControls.bind(this), false);
}
this.createControls();
this.controller.injectAdContainerDiv(this.adContainerDiv);
};
Expand Down Expand Up @@ -1118,7 +1120,7 @@ var main = "./dist/videojs.ima.js";
var module$1 = "./dist/videojs.ima.es.js";
var author = { "name": "Google Inc." };
var engines = { "node": ">=0.8.0" };
var scripts = { "contBuild": "watch 'npm run rollup:max' src", "predevServer": "echo \"Starting up server on localhost:8000.\"", "devServer": "npm-run-all -p testServer contBuild", "lint": "eslint \"src/*.js\"", "rollup": "npm-run-all rollup:*", "rollup:max": "rollup -c configs/rollup.config.js", "rollup:es": "rollup -c configs/rollup.config.es.js", "rollup:min": "rollup -c configs/rollup.config.min.js", "pretest": "npm run rollup", "start": "npm run devServer", "test": "npm-run-all test:*", "test:vjs5": "npm install [email protected] --no-save && npm-run-all -p -r testServer webdriver", "test:vjs6": "npm install video.js@6 --no-save && npm-run-all -p -r testServer webdriver", "test:vjs7": "npm install video.js@7 --no-save && npm-run-all -p -r testServer webdriver", "testServer": "http-server --cors -p 8000 --silent", "preversion": "node scripts/preversion.js && npm run lint && npm test", "version": "node scripts/version.js", "postversion": "node scripts/postversion.js", "webdriver": "mocha test/webdriver/*.js --no-timeouts" };
var scripts = { "contBuild": "watch 'npm run rollup:max' src", "predevServer": "echo \"Starting up server on localhost:8000.\"", "devServer": "npm-run-all -p testServer contBuild", "lint": "eslint \"src/*.js\"", "rollup": "npm-run-all rollup:*", "rollup:max": "rollup -c configs/rollup.config.js", "rollup:es": "rollup -c configs/rollup.config.es.js", "rollup:min": "rollup -c configs/rollup.config.min.js", "pretest": "npm run rollup", "start": "npm run devServer", "test": "npm-run-all test:*", "test:vjs5": "npm install [email protected] --no-save && npm-run-all -p -r testServer webdriver", "test:vjs6": "npm install video.js@6 --no-save && npm-run-all -p -r testServer webdriver", "test:vjs7": "npm install video.js@7 --no-save && npm-run-all -p -r testServer webdriver", "testServer": "http-server --cors -p 8000 --silent", "preversion": "node scripts/preversion.js && npm run lint && npm test", "version": "node scripts/version.js", "postversion": "node scripts/postversion.js", "webdriver": "mocha test/webdriver/basic-hearst-mod.js --no-timeouts" };
var repository = { "type": "git", "url": "https://github.com/googleads/videojs-ima" };
var files = ["CHANGELOG.md", "LICENSE", "README.md", "dist/", "src/"];
var dependencies = { "can-autoplay": "^3.0.0", "cryptiles": "^4.1.2", "video.js": "^5.19.2 || ^6 || ^7", "videojs-contrib-ads": "^6" };
Expand Down
2 changes: 1 addition & 1 deletion dist/videojs.ima.min.js
View file
Open in desktop

Large diffs are not rendered by default.