Feature/custom namespacing #409
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
June 14, 2016 10:45
Replacing all references to 'pbjs' with '$$PREBID_GLOBAL$$'.
Adding integrationExamples to what gets string-replaced.
added 2 commits
June 29, 2016 10:14
Conflicts: integrationExamples/gpt/pbjs_example_gpt.html src/bidmanager.js src/prebid.js test/spec/unit/pbjs_api_spec.js
Some cleanup after merge.
|
@mkendall07 I resolved the conflicts with master and re-pushed. |
|
I'll resolve conflicts again, as soon at #438 is resolved. |
added 2 commits
July 6, 2016 09:10
Conflicts: src/bidmanager.js src/prebid.js test/spec/unit/pbjs_api_spec.js
|
OK, @mkendall07 -- ready for review again. |
|
@nedstankus With that said, i'll try to get this in by early next week. |
| @@ -10,6 +10,7 @@ | |||
| "type": "git", | |||
| "url": "https://github.com/prebid/Prebid.js.git" | |||
| }, | |||
| "globalVarName": "pbjs", | |||
There was a problem hiding this comment.
nitpick: please soft tabs (spaces)
|
I'm going to merge this because it looks like it's working now. We'll monitor for any side effects as we move towards our next release iteration. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Switched global name to$$PREBID_GLOBAL$$ , replaced, by default, with 'pbjs'.
Updated references in /src, /test and /integrationExamples.