Merge branch 'master' into update-packages

bigbluebutton-html5/imports/ui/components/tooltip/component.jsx

@@ -29,7 +29,16 @@ class Tooltip extends Component {
     const expandedEl = tooltipTarget.parentElement.querySelector('[aria-expanded="true"]');
     const isTarget = expandedEl === tooltipTarget;
     if (expandedEl && !isTarget) return;
-    tip.set({ content: tooltipTarget.lastChild.innerText });
+
+    const findLabel = (node) => {
+      const { nodeName, lastChild, parentElement } = node;
+      if (nodeName.toLowerCase() === 'button') return lastChild.innerText;
+      return findLabel(parentElement);
+    };
+    const label = findLabel(tooltipTarget);
+    if (label) tip.set({ content: label });
+    // if we are not able to get the text, the default content is used
+
     tip.show();
   }
 

bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx

@@ -48,13 +48,13 @@ class UserNotes extends PureComponent {
         }
         <div className={styles.scrollableList}>
           <div
-            role='button'
+            role="button"
             tabIndex={0}
             className={styles.noteLink}
             onClick={toggleNotePanel}
           >
-            <Icon iconName='copy' className={styles.icon} />
-            <span className={styles.label} >{intl.formatMessage(intlMessages.title)}</span>
+            <Icon iconName="copy" />
+            <span>{intl.formatMessage(intlMessages.title)}</span>
           </div>
         </div>
       </div>

bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-polls/component.jsx

@@ -47,8 +47,8 @@ class UserPolls extends PureComponent {
             className={styles.pollLink}
             onClick={handleClickTogglePoll}
           >
-            <Icon iconName="polling" className={styles.icon} />
-            <span className={styles.label}>{intl.formatMessage(intlMessages.pollLabel)}</span>
+            <Icon iconName="polling" />
+            <span>{intl.formatMessage(intlMessages.pollLabel)}</span>
           </div>
         </div>
       </div>

bigbluebutton-html5/imports/ui/components/video-preview/component.jsx

@@ -232,7 +232,7 @@ class VideoPreview extends Component {
               playsInline
             />
           </div>
-          <div className={styles.options}>
+          <div className={styles}>
             <label className={styles.label}>
               {intl.formatMessage(intlMessages.cameraLabel)}
             </label>

bigbluebutton-html5/package.json

@@ -21,11 +21,6 @@
     }
   },
   "dependencies": {
-    "//": [
-      "core-js is included with babel-runtime",
-      "but Meteor 1.6.0.1 doesn't see it there for some reason",
-      "need to investigate"
-    ],
     "@babel/runtime": "^7.3.1",
     "@browser-bunyan/server-stream": "^1.5.0",
     "autoprefixer": "~9.3.1",
@@ -35,7 +30,6 @@
     "browser-detect": "^0.2.28",
     "classnames": "^2.2.6",
     "clipboard": "^2.0.4",
-    "core-js": "^2.6.4",
     "eventemitter2": "~5.0.1",
     "fibers": "^3.1.1",
     "flat": "~4.1.0",