@financial-times/o-ads
Advanced tools
Comparing version 12.4.1 to 12.5.0
@@ -424,2 +424,3 @@ "use strict"; | ||
size: this.gpt && this.gpt.size || '', | ||
creativeId: this.gpt && this.gpt.creativeId || '', | ||
slot: this | ||
@@ -426,0 +427,0 @@ }; |
@@ -306,2 +306,3 @@ "use strict"; | ||
else if (type === 'collapse') { | ||
slot.fire('slotCollapsed'); | ||
slot.collapse(); | ||
@@ -308,0 +309,0 @@ } // Received touch events from ad slot iframe |
@@ -47,3 +47,6 @@ "use strict"; | ||
}; | ||
const markName = typeof data === 'object' && 'pos' in data && 'name' in data ? [eventName, data.pos, data.name, data.size.length ? data.size.toString() : ''].join('__') : eventName; | ||
const hasDetails = typeof data === 'object' && 'pos' in data && 'name' in data; | ||
const size = data && data.size && data.size.length ? data.size.toString() : ''; | ||
const creativeId = data && data.creativeId; | ||
const markName = hasDetails ? [eventName, data.pos, data.name, size, creativeId].join('__') : eventName; | ||
perfMark(markName); | ||
@@ -50,0 +53,0 @@ target.dispatchEvent(new CustomEvent(eventName, opts)); |
@@ -64,3 +64,3 @@ "use strict"; | ||
if (eventDetails && 'pos' in eventDetails && 'name' in eventDetails) { | ||
suffix = '__' + [eventDetails.pos, eventDetails.name, eventDetails.size].join('__'); | ||
suffix = '__' + [eventDetails.pos, eventDetails.name, eventDetails.size, eventDetails.creativeId].join('__'); | ||
} | ||
@@ -81,3 +81,4 @@ | ||
pos: eventDetails.pos, | ||
size: eventDetails.size && eventDetails.size.toString() | ||
size: eventDetails.size && eventDetails.size.toString(), | ||
creativeId: eventDetails.creativeId && eventDetails.creativeId || 0 | ||
}; | ||
@@ -84,0 +85,0 @@ } |
"use strict"; | ||
// generated by genversion | ||
module.exports = '12.4.1'; | ||
module.exports = '12.5.0'; |
@@ -26,3 +26,3 @@ { | ||
"name": "@financial-times/o-ads", | ||
"version": "12.4.1", | ||
"version": "12.5.0", | ||
"dependencies": { | ||
@@ -45,3 +45,3 @@ "ftdomdelegate": ">=2.2.0 <4.0.0", | ||
"test-nw:local": "nightwatch -c ./test/nightwatch/config/nightwatch.conf.local.js", | ||
"test-nw:basic": "npm run nightwatch-bs -- --group basic --env chrome,edge,galaxy_s8", | ||
"test-nw:basic": "npm run nightwatch-bs -- --group basic --env chrome,firefox,edge,galaxy_s8", | ||
"test-nw:extended": "npm run nightwatch-bs -- --group extended --env chrome", | ||
@@ -66,3 +66,3 @@ "coverage": "export COVERAGE=true && karma start && unset COVERAGE", | ||
"cypress": "^3.1.5", | ||
"dotenv": "^6.1.0", | ||
"dotenv": "^8.0.0", | ||
"eslint": "^5.16.0", | ||
@@ -82,3 +82,3 @@ "fetch-mock": "^5.1.1", | ||
"karma-webpack": "^3.0.5", | ||
"nightwatch": "^1.0.19", | ||
"nightwatch": "git@github.com:Financial-Times/nightwatch.git", | ||
"origami-build-tools": "^8.0.0", | ||
@@ -85,0 +85,0 @@ "pre-git": "^3.17.1", |
116903
3098