Remove old whiteboard toolbar items config

bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-submenu/component.jsx

@@ -162,14 +162,10 @@ class ToolbarSubmenu extends Component {
       return intl.formatMessage(intlMessages[intlLabel]);
     }
 
-    if (type === 'thickness') {
+    if (type === 'thickness' || type === 'font-size') {
       return obj.value.toString();
     }
 
-    if (type === 'font-size') {
-      return obj.label.toString();
-    }
-
     return '';
   }
 

bigbluebutton-html5/private/config/public/whiteboard.yaml

@@ -1,71 +0,0 @@
-whiteboard:
-  #annotation statuses specific to the each type of annotation
-  annotations:
-    message_frequency: 50
-    status:
-      start: 'DRAW_START'
-      update: 'DRAW_UPDATE'
-      end: 'DRAW_END'
-  toolbar:
-    colors:
-      - value: '#000000' #black
-        label: 'black'
-      - value: '#ffffff' #white
-        label: 'white'
-      - value: '#ff0000' #red
-        label: 'red'
-      - value: '#ff8800' #orange
-        label: 'orange'
-      - value: '#ccff00' #electric lime
-        label: 'eletricLime'
-      - value: '#00ff00' #lime
-        label: 'lime'
-      - value: '#00ffff' #aqua/cyan
-        label: 'cyan'
-      - value: '#0088ff' #dodger blue
-        label: 'dodgerBlue'
-      - value: '#0000ff' #blue
-        label: 'blue'
-      - value: '#8800ff' #violet/indigo
-        label: 'violet'
-      - value: '#ff00ff' #magenta/fuchsia
-        label: 'magenta'
-      - value: '#c0c0c0' #silver
-        label: 'silver'
-    thickness:
-      - value: 14
-      - value: 12
-      - value: 10
-      - value: 8
-      - value: 6
-      - value: 4
-      - value: 2
-    font_sizes:
-      - value: 36
-      - value: 32
-      - value: 28
-      - value: 24
-      - value: 20
-      - value: 16
-    tools:
-      #text
-      - icon: 'text_tool'
-        value: 'text'
-      #line
-      - icon: 'linte_tool'
-        value: 'line'
-      #ellipse
-      - icon: 'circle_tool'
-        value: 'ellipse'
-      #triangle
-      - icon: 'triangle_tool'
-        value: 'triangle'
-      #rectangle
-      - icon: 'rectangle_tool'
-        value: 'rectangle'
-      #pencil
-      - icon: 'pen_tool'
-        value: 'pencil'
-      #pan and zoom hand
-      - icon: 'hand'
-        value: 'hand'

bigbluebutton-html5/private/config/settings-development.json

@@ -191,39 +191,51 @@
       "toolbar": {
         "colors": [
           {
+            "label": "black",
             "value": "#000000"
           },
           {
+            "label": "white",
             "value": "#ffffff"
           },
           {
+            "label": "red",
             "value": "#ff0000"
           },
           {
+            "label": "orange",
             "value": "#ff8800"
           },
           {
+            "label": "eletricLime",
             "value": "#ccff00"
           },
           {
+            "label": "Lime",
             "value": "#00ff00"
           },
           {
+            "label": "Cyan",
             "value": "#00ffff"
           },
           {
+            "label": "dodgerBlue",
             "value": "#0088ff"
           },
           {
+            "label": "blue",
             "value": "#0000ff"
           },
           {
+            "label": "violet",
             "value": "#8800ff"
           },
           {
+            "label": "magenta",
             "value": "#ff00ff"
           },
           {
+            "label": "silver",
             "value": "#c0c0c0"
           }
         ],
@@ -339,5 +351,3 @@
     }
   }
 }
-
-