ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merging class

Browse Source
This commit is contained in:
Sam Potts 2019-04-25 12:03:24 +10:00
parent 2e6361898b
commit 17caa3c57b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/utils/elements.js
View File

@ -4,6 +4,7 @@
import { toggleListener } from './events'; import { toggleListener } from './events';
import is from './is'; import is from './is';
import { extend } from './objects';
// Wrap an element // Wrap an element
export function wrap(elements, wrapper) { export function wrap(elements, wrapper) {
@ -137,7 +138,7 @@ export function getAttributesFromSelector(sel, existingAttributes) {
} }
const attributes = {}; const attributes = {};
const existing = existingAttributes; const existing = extend({}, existingAttributes);
sel.split(',').forEach(s => { sel.split(',').forEach(s => {
// Remove whitespace // Remove whitespace
@ -147,7 +148,7 @@ export function getAttributesFromSelector(sel, existingAttributes) {
// Get the parts and value // Get the parts and value
const parts = stripped.split('='); const parts = stripped.split('=');
const key = parts[0]; const [key] = parts;
const value = parts.length > 1 ? parts[1].replace(/["']/g, '') : ''; const value = parts.length > 1 ? parts[1].replace(/["']/g, '') : '';
// Get the first character // Get the first character
@ -156,11 +157,11 @@ export function getAttributesFromSelector(sel, existingAttributes) {
switch (start) { switch (start) {
case '.': case '.':
// Add to existing classname // Add to existing classname
if (is.object(existing) && is.string(existing.class)) { if (is.string(existing.class)) {
existing.class += ` ${className}`; attributes.class = `${existing.class} ${className}`;
} else {
attributes.class = className;
} }
attributes.class = className;
break; break;
case '#': case '#':
@ -179,7 +180,7 @@ export function getAttributesFromSelector(sel, existingAttributes) {
} }
}); });
return attributes; return extend(existing, attributes);
} }
// Toggle hidden // Toggle hidden