瀏覽代碼

Merge pull request #1565 from virtuacoplenny/lenny/defensive-classnames

fix(toolbox): Defensively check classNames when mapping button attrib…
master
Saúl Ibarra Corretgé 8 年之前
父節點
當前提交
b7c57d306a
共有 1 個文件被更改,包括 3 次插入7 次删除
  1. 3
    7
      react/features/toolbox/functions.web.js

+ 3
- 7
react/features/toolbox/functions.web.js 查看文件

21
  */
21
  */
22
 export function getButtonAttributesByProps(props: Object = {})
22
 export function getButtonAttributesByProps(props: Object = {})
23
         : MapOfAttributes {
23
         : MapOfAttributes {
24
-    let classNames = props.classNames;
25
-
26
-    if (classNames) {
27
-        // XXX Make sure to not modify props.classNames because that'd be bad
28
-        // practice.
29
-        classNames = [ ...classNames ];
30
-    }
24
+    // XXX Make sure to not modify props.classNames because that'd be bad
25
+    // practice.
26
+    const classNames = (props.classNames && [ ...props.classNames ]) || [];
31
 
27
 
32
     props.toggled && classNames.push('toggled');
28
     props.toggled && classNames.push('toggled');
33
     props.unclickable && classNames.push('unclickable');
29
     props.unclickable && classNames.push('unclickable');

Loading…
取消
儲存