Skip to content

Commit db3dc83

Browse files
author
Matthew Spencer
committed
Merge branch 'events'
Closes #11
2 parents 6e7cefa + b3b7a8e commit db3dc83

File tree

7 files changed

+44
-44
lines changed

7 files changed

+44
-44
lines changed

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -380,28 +380,28 @@ var config = {
380380

381381
## Events
382382

383-
Custom jQuery events prefixed with `GPT`.
383+
Custom jQuery events prefixed with `AdManager`.
384384

385-
| event | trigger source |
386-
| ------------------------------------------ | --------------- |
387-
| [`GPT:initPageAds`](#gptinitpageads) | internal |
388-
| [`GPT:libraryLoaded`](#gptlibraryloaded) | internal |
389-
| [`GPT:adUnitRendered`](#gptadunitrendered) | internal |
390-
| [`GPT:slotsDefined`](#gptslotsdefined) | internal |
385+
| event | trigger source |
386+
| ------------------------------------------------------ | --------------- |
387+
| [`AdManager:initPageAds`](#admanagerinitpageads) | internal |
388+
| [`AdManager:libraryLoaded`](#admanagerlibraryloaded) | internal |
389+
| [`AdManager:adUnitRendered`](#admanageradunitrendered) | internal |
390+
| [`AdManager:slotsDefined`](#admanagerslotsdefined) | internal |
391391

392-
### `GPT:initPageAds`
392+
### `AdManager:initPageAds`
393393

394394
**Description:** This is triggered once when ads are initialized.
395395

396396
[:arrow_up:](#events)
397397

398-
### `GPT:libraryLoaded`
398+
### `AdManager:libraryLoaded`
399399

400400
**Description:** This is triggered once when the GPT library is loaded.
401401

402402
[:arrow_up:](#events)
403403

404-
### `GPT:adUnitRendered`
404+
### `AdManager:adUnitRendered`
405405

406406
**Description:** This is triggered each time an ad is rendered. Bind to this event to receive notification of a particular ad that has rendered.
407407

@@ -419,7 +419,7 @@ Custom jQuery events prefixed with `GPT`.
419419

420420
[:arrow_up:](#events)
421421

422-
### `GPT:slotsDefined`
422+
### `AdManager:slotsDefined`
423423

424424
**Description:** This is triggered when slots are successfully defined, but before ads are rendered.
425425

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "AdManager",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"homepage": "https://github.com/athletics/ad-manager",
55
"description": "A JavaScipt library for interacting with Google DFP.",
66
"license": "Apache-2.0",

‎dist/AdManager.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* @author Athletics - http://athleticsnyc.com
55
* @see https://github.com/athletics/ad-manager
6-
* @version 0.4.2
6+
* @version 0.4.3
77
*//**
88
* Shared utilities for debugging and array manipulation.
99
*/
@@ -738,12 +738,12 @@
738738
function bindHandlers() {
739739

740740
$( document )
741-
.on( 'GPT:unitsInserted', function ( event ) {} )
742-
.on( 'GPT:libraryLoaded', function ( event ) {
741+
.on( 'AdManager:unitsInserted', function ( event ) {} )
742+
.on( 'AdManager:libraryLoaded', function ( event ) {
743743
libraryLoaded = true;
744744
initSequence();
745745
} )
746-
.on( 'GPT:slotsDefined', function ( event ) {
746+
.on( 'AdManager:slotsDefined', function ( event ) {
747747
displayPageAds();
748748
} );
749749

@@ -756,11 +756,11 @@
756756
* load functions.
757757
* @todo Consider using separate events.
758758
*
759-
* @fires GPT:initSequence
759+
* @fires AdManager:initSequence
760760
*/
761761
function initSequence() {
762762

763-
$.event.trigger( 'GPT:initSequence' );
763+
$.event.trigger( 'AdManager:initSequence' );
764764

765765
listenForDfpEvents();
766766
enableSingleRequest();
@@ -815,12 +815,12 @@
815815
/**
816816
* Callback when GPT library is loaded.
817817
*
818-
* @fires GPT:libraryLoaded
818+
* @fires AdManager:libraryLoaded
819819
*/
820820
function onLibraryLoaded() {
821821

822822
googletag.cmd.push( function () {
823-
$.event.trigger( 'GPT:libraryLoaded' );
823+
$.event.trigger( 'AdManager:libraryLoaded' );
824824
} );
825825

826826
}
@@ -910,7 +910,7 @@
910910
/**
911911
* Define slots for page positions.
912912
*
913-
* @fires GPT:slotsDefined
913+
* @fires AdManager:slotsDefined
914914
*/
915915
function defineSlotsForPagePositions() {
916916

@@ -961,7 +961,7 @@
961961
// Enables GPT services for defined slots.
962962
googletag.enableServices();
963963

964-
$.event.trigger( 'GPT:slotsDefined' );
964+
$.event.trigger( 'AdManager:slotsDefined' );
965965

966966
} );
967967

@@ -993,7 +993,7 @@
993993
/**
994994
* Callback from DFP rendered event.
995995
*
996-
* @fires GPT:adUnitRendered
996+
* @fires AdManager:adUnitRendered
997997
* @see https://developers.google.com/doubleclick-gpt/reference
998998
*
999999
* @param {Object} unit
@@ -1004,7 +1004,7 @@
10041004
adInfo = Inventory.getAdInfo( unitName )
10051005
;
10061006

1007-
$.event.trigger( 'GPT:adUnitRendered', {
1007+
$.event.trigger( 'AdManager:adUnitRendered', {
10081008
name: unitName,
10091009
id: adInfo.id,
10101010
size: unit.size,
@@ -1163,7 +1163,7 @@
11631163
*/
11641164
function init() {
11651165

1166-
$( document ).on( 'GPT:initSequence', qualifyContext );
1166+
$( document ).on( 'AdManager:initSequence', qualifyContext );
11671167

11681168
}
11691169

@@ -1215,11 +1215,11 @@
12151215
/**
12161216
* Triggers ad units inserted event.
12171217
*
1218-
* @fires GPT:unitsInserted
1218+
* @fires AdManager:unitsInserted
12191219
*/
12201220
function broadcast() {
12211221

1222-
$.event.trigger( 'GPT:unitsInserted' );
1222+
$.event.trigger( 'AdManager:unitsInserted' );
12231223

12241224
}
12251225

‎dist/AdManager.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "AdManager",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"description": "A JavaScipt library for interacting with Google DFP.",
55
"main": "src/Index.js",
66
"repository": {

‎src/Insertion.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*/
6161
function init() {
6262

63-
$( document ).on( 'GPT:initSequence', qualifyContext );
63+
$( document ).on( 'AdManager:initSequence', qualifyContext );
6464

6565
}
6666

@@ -112,11 +112,11 @@
112112
/**
113113
* Triggers ad units inserted event.
114114
*
115-
* @fires GPT:unitsInserted
115+
* @fires AdManager:unitsInserted
116116
*/
117117
function broadcast() {
118118

119-
$.event.trigger( 'GPT:unitsInserted' );
119+
$.event.trigger( 'AdManager:unitsInserted' );
120120

121121
}
122122

‎src/Manager.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@
7979
function bindHandlers() {
8080

8181
$( document )
82-
.on( 'GPT:unitsInserted', function ( event ) {} )
83-
.on( 'GPT:libraryLoaded', function ( event ) {
82+
.on( 'AdManager:unitsInserted', function ( event ) {} )
83+
.on( 'AdManager:libraryLoaded', function ( event ) {
8484
libraryLoaded = true;
8585
initSequence();
8686
} )
87-
.on( 'GPT:slotsDefined', function ( event ) {
87+
.on( 'AdManager:slotsDefined', function ( event ) {
8888
displayPageAds();
8989
} );
9090

@@ -97,11 +97,11 @@
9797
* load functions.
9898
* @todo Consider using separate events.
9999
*
100-
* @fires GPT:initSequence
100+
* @fires AdManager:initSequence
101101
*/
102102
function initSequence() {
103103

104-
$.event.trigger( 'GPT:initSequence' );
104+
$.event.trigger( 'AdManager:initSequence' );
105105

106106
listenForDfpEvents();
107107
enableSingleRequest();
@@ -156,12 +156,12 @@
156156
/**
157157
* Callback when GPT library is loaded.
158158
*
159-
* @fires GPT:libraryLoaded
159+
* @fires AdManager:libraryLoaded
160160
*/
161161
function onLibraryLoaded() {
162162

163163
googletag.cmd.push( function () {
164-
$.event.trigger( 'GPT:libraryLoaded' );
164+
$.event.trigger( 'AdManager:libraryLoaded' );
165165
} );
166166

167167
}
@@ -251,7 +251,7 @@
251251
/**
252252
* Define slots for page positions.
253253
*
254-
* @fires GPT:slotsDefined
254+
* @fires AdManager:slotsDefined
255255
*/
256256
function defineSlotsForPagePositions() {
257257

@@ -302,7 +302,7 @@
302302
// Enables GPT services for defined slots.
303303
googletag.enableServices();
304304

305-
$.event.trigger( 'GPT:slotsDefined' );
305+
$.event.trigger( 'AdManager:slotsDefined' );
306306

307307
} );
308308

@@ -334,7 +334,7 @@
334334
/**
335335
* Callback from DFP rendered event.
336336
*
337-
* @fires GPT:adUnitRendered
337+
* @fires AdManager:adUnitRendered
338338
* @see https://developers.google.com/doubleclick-gpt/reference
339339
*
340340
* @param {Object} unit
@@ -345,7 +345,7 @@
345345
adInfo = Inventory.getAdInfo( unitName )
346346
;
347347

348-
$.event.trigger( 'GPT:adUnitRendered', {
348+
$.event.trigger( 'AdManager:adUnitRendered', {
349349
name: unitName,
350350
id: adInfo.id,
351351
size: unit.size,

0 commit comments

Comments
 (0)