From ad0820cfa3cf4fe95b883954e83fd0393acf9e99 Mon Sep 17 00:00:00 2001 From: "Pat O'Neill" Date: Fri, 25 Sep 2015 14:13:56 -0400 Subject: [PATCH] @misteroneill fixed tsml to be used as a tag for template strings. closes #2629 --- CHANGELOG.md | 1 + src/js/utils/dom.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30aea34e02..6908254ef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) -------------------- diff --git a/src/js/utils/dom.js b/src/js/utils/dom.js index 07ce71fae8..570ccdbb47 100644 --- a/src/js/utils/dom.js +++ b/src/js/utils/dom.js @@ -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;