minor fix to xls toolbar

Author: QuantLab

packages/spreadsheet/src/panel.ts

@@ -47,9 +47,9 @@ import {
  */
 const SPREADSHEET_PANEL_CLASS = 'jp-SpreadsheetPanel';
 
-const SPREADSHEET_PANEL_TOOLBAR_CLASS = 'jp-Spreadsheet-toolbar';
+const SPREADSHEET_TOOLBAR_CLASS = 'jp-Spreadsheet-toolbar';
 
-const SPREADSHEET_PANEL_SPREADSHEET_CLASS = 'jp-SpreadsheetPanel-spreadsheet';
+const SPREADSHEET_CLASS = 'jp-Spreadsheet';
 
 /**
  * The class name added to a dirty widget.
@@ -81,15 +81,15 @@ class SpreadsheetPanel extends Widget implements DocumentRegistry.IReadyWidget {
 
     // Toolbar
     let toolbar = new Toolbar();
-    toolbar.addClass(SPREADSHEET_PANEL_TOOLBAR_CLASS);
+    toolbar.addClass(SPREADSHEET_TOOLBAR_CLASS);
 
     // spreadsheet
     let ssOptions = {
       languagePreference: options.languagePreference,
       contentFactory: contentFactory
     };
     let spreadsheet = this.spreadsheet = contentFactory.createSpreadsheet(ssOptions);
-    spreadsheet.addClass(SPREADSHEET_PANEL_SPREADSHEET_CLASS);
+    spreadsheet.addClass(SPREADSHEET_CLASS);
 
     layout.addWidget(toolbar);
     layout.addWidget(this.spreadsheet);

packages/spreadsheet/src/toolbar.ts

@@ -310,7 +310,8 @@ function createColorSwitcherNode(prompt: string): HTMLElement {
     let option = document.createElement('option');
     option.value = t.toLowerCase();
     option.textContent = t;
-    option.style.backgroundColor = t;
+    if(option.value != prompt)
+      option.style.backgroundColor = t;
     select.appendChild(option);
   }
   select.className = TOOLBAR_DROPDOWN_CLASS;

packages/spreadsheet/src/widget.ts

@@ -23,7 +23,7 @@ import * as Handsontable
 /**
  * The class name added to a spreadsheet widget.
  */
-const SPREADSHEET_CLASS = 'jp-Spreadsheet';
+//const SPREADSHEET_CLASS = 'jp-Spreadsheet';
 
 
 /**
@@ -38,7 +38,7 @@ class Spreadsheet extends Widget {
    */
   constructor(options: Spreadsheet.IOptions) {
     super();
-    this.addClass(SPREADSHEET_CLASS);
+    //this.addClass(SPREADSHEET_CLASS);
 
   }
 
@@ -189,61 +189,18 @@ class Spreadsheet extends Widget {
     for(r = r1; r <= r2; r++){
       for(c = c1; c <= c2; c++){
         let existing = cell.filter( (item:filterItem) => item.row === r && item.col === c)[0];
-        switch(property){
-          case 'fontWeight':
-            if(existing != null){
-              if(existing.fontWeight == value)
-                existing.fontWeight = '';
-              else
-                existing.fontWeight = value;
-            }else{
-              cell.push({row: r, col: c, fontWeight: value})
-            }
-            break;
-          case 'fontStyle':
-            if(existing != null){
-              if(existing.fontStyle == value)
-                existing.fontStyle = '';
-              else
-                existing.fontStyle = value;
-            }else{
-              cell.push({row: r, col: c, fontStyle: value})
-            }
-            break;
-          case 'className':
-            if(existing != null){
-              if(existing.className == value)
-                existing.className = '';
-              else
-                existing.className = value;
-            }else{
-              cell.push({row: r, col: c, className: value})
-            }
-            break;
-          case 'background':
-            if(existing != null){
-              if(existing.background == value)
-                existing.background = '';
-              else
-                existing.background = value;
-            }else{
-              cell.push({row: r, col: c, background: value})
-            }
-            break;
-          case 'color':
-            if(existing != null){
-              if(existing.color == value)
-                existing.color = '';
-              else
-                existing.color = value;
-            }else{
-              cell.push({row: r, col: c, color: value})
-            }
-            break;
-          default:
-            break;
+        if(existing != null && existing != undefined){
+          if(existing.hasOwnProperty(property) && existing[property] == value)
+            existing[property] = '';
+          else
+            existing[property] = value;
+        }else{
+          let cellStyle:any = {};
+          cellStyle['row'] = r;
+          cellStyle['col'] = c;
+          cellStyle[property] = value;
+          cell.push(cellStyle);
         }
-
       }
     }