fixed Firefox bug and issue #2

asselinpaul · Feb 13, 2018 · f728180 · f728180
1 parent f7e508c
commit f728180
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 17 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,10 @@
 0.1.0 / 08-07-2015
 ==================
 
-* Initial release
+* Initial release
+
+0.1.3 / 13-02-2018
+==================
+
+* Fixed Firefox specific bugs
+* Fixed issue: multiple handsontable is not supported in a single page due to getElementsByClassName #2
diff --git a/demo/handsontable/handsontable.full.js b/demo/handsontable/handsontable.full.js
@@ -15726,12 +15726,7 @@ function checkboxRenderer(instance, TD, row, col, prop, value, cellProperties) {
   } else if (value === null) {
     dom.addClass(input, 'noValue');
     TD.appendChild(input);
-  } else {
-    input.style.display = 'none';
-    dom.addClass(input, BAD_VALUE_CLASS);
-    TD.appendChild(input);
-    TD.appendChild(document.createTextNode('#bad-value#'));
-  }
+  } 
   if (cellProperties.readOnly) {
     eventManager.addEventListener(input, 'click', preventDefault);
   } else {

diff --git a/demo/index.html b/demo/index.html
@@ -46,10 +46,7 @@ <h1>MediumEditor HandsOnTable</h1>
       </p>
     </div>
   </div>
-
-  <script type="text/javascript"
-    src="../bower_components/medium-editor/dist/js/medium-editor.js">
-  </script>
+  <script type="text/javascript" src="../bower_components/medium-editor/dist/js/medium-editor.js"></script>
   <script type="text/javascript" src="../dist/js/medium-editor-handsontable.js">
   </script>
 

diff --git a/dist/js/medium-editor-handsontable.js b/dist/js/medium-editor-handsontable.js
@@ -85,7 +85,7 @@ var contextMenu;
     }
 
     function parse() {
-        var spreadsheets = document.getElementsByClassName('handsontable');
+        var spreadsheets = document.getElementsByClassName('medium-text-handsontable');
         for (var k = 0; k < spreadsheets.length; k++) {
             if (spreadsheets[k].id !== '') {
                 var id = spreadsheets[k].id;
@@ -301,7 +301,7 @@ var contextMenu;
                 //initialise a blank two dimensional array
                 var data = new Array(parseInt(rows) + 1);
                 for (var i = 0; i < data.length; i++) {
-                    data[i] = new Array(parseInt(cols) + 1);
+                    data[i] = Array(parseInt(cols) + 1).fill("");
                 }
 
                 draw(container, data, contextMenuBool, readOnlyBool);
@@ -313,7 +313,7 @@ var contextMenu;
             var text = getSelectionText(this._doc);
 
             html += text;
-            html += '<div id="spreadsheet' + id + '"></div>';
+            html += ' <div id="spreadsheet' + id + '"> </div> ';
             return html;
         }
     };
@@ -325,14 +325,49 @@ var contextMenu;
         container.dataset.data = JSON.stringify(data);
     }
 
+    var checkboxRenderer;
+
+    checkboxRenderer = function(instance, td, row, col, prop, value, cellProperties) {
+        Handsontable.renderers.TextRenderer.apply(this, arguments);
+        if (value = '') {
+            td.html = '<input type="checkbox">'
+        }
+        td.style.backgroundColor = 'yellow';
+
+    };
+
     function draw(container, data, contextMenuBool, readOnlyBool) {
+        var contextMenuOptions;
+        if (contextMenuBool) {
+            contextMenuOptions = ['row_above', 'row_below', '---------', 'col_left',
+                'col_right', '---------', 'remove_row', 'remove_col',
+                '---------', 'undo', 'redo', 'make_read_only',
+                '---------', 'alignment', {
+                    key: 'add_checkmark',
+                    name: 'Insert checkmark',
+                    callback: function(key, selection) {
+                        for (var i = selection.start.col; i <= selection.end.col; i++) {
+                            for (var j = selection.start.row; j <= selection.end.row; j++) {
+                                this.setDataAtCell(j, i, '<input type="checkbox">');
+
+                            }
+                        }
+                    }
+                }
+
+            ];
+        } else {
+            contextMenuOptions = false;
+        }
         var html = new Handsontable(container, {
             data: data,
+            className: "medium-text-handsontable",
             rowHeaders: true,
             colHeaders: true,
-            contextMenu: contextMenuBool,
+            contextMenu: contextMenuOptions,
             autoWrapCol: true,
             autoWrapRow: true,
+            renderer: 'html',
             placeholder: ' ',
             autoColumnSize: true,
             readOnly: readOnlyBool,

diff --git a/dist/js/medium-editor-handsontable.min.js b/dist/js/medium-editor-handsontable.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medium-editor-handsontable",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "Paul Asselin <pa.asselin@gmail.com>",
   "description": "MediumEditor extension to allow handsontable spreadsheets.",
   "main": "dist/js/medium-editor-handsontable.js",