Skip to content

Commit

Permalink
@misteroneill fixed tsml to be used as a tag for template strings. cl…
Browse files Browse the repository at this point in the history
…oses #2629
  • Loading branch information
misteroneill authored and gkatsev committed Sep 25, 2015
1 parent 992e5e6 commit ad0820c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ CHANGELOG
* @heff fixed timeranges deprecation warnings in tests ([view](https://github.com/videojs/video.js/pull/2627))
* @misteroneill updated play control to use its state for icon ([view](https://github.com/videojs/video.js/pull/2636))
* @gkatsev exposed isCrossOrigin and used it to enable CORS for textTrack XHRs ([view](https://github.com/videojs/video.js/pull/2633))
* @misteroneill fixed tsml to be used as a tag for template strings ([view](https://github.com/videojs/video.js/pull/2629))

--------------------

Expand Down
4 changes: 2 additions & 2 deletions src/js/utils/dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ export function createEl(tagName='div', properties={}, attributes={}){
// We originally were accepting both properties and attributes in the
// same object, but that doesn't work so well.
if (propName.indexOf('aria-') !== -1 || propName === 'role' || propName === 'type') {
log.warn(tsml(`Setting attributes in the second argument of createEl()
log.warn(tsml`Setting attributes in the second argument of createEl()
has been deprecated. Use the third argument instead.
createEl(type, properties, attributes). Attempting to set ${propName} to ${val}.`));
createEl(type, properties, attributes). Attempting to set ${propName} to ${val}.`);
el.setAttribute(propName, val);
} else {
el[propName] = val;
Expand Down

0 comments on commit ad0820c

Please sign in to comment.