v3.4.4

jspreadsheet · Aug 21, 2019 · 37bb62f · 37bb62f
1 parent c842025
commit 37bb62f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 10 deletions.
diff --git a/dist/jexcel.css b/dist/jexcel.css
@@ -1,5 +1,5 @@
 /**
- * (c) jExcel v3.4.1
+ * (c) jExcel v3.4.4
  * 
  * Author: Paul Hodel <[email protected]>
  * Website: https://bossanova.uk/jexcel/

diff --git a/dist/jexcel.js b/dist/jexcel.js
@@ -1,5 +1,5 @@
 /**
- * (c) jExcel v3.4.3
+ * (c) jExcel v3.4.4
  * 
  * Author: Paul Hodel <[email protected]>
  * Website: https://bossanova.uk/jexcel/
@@ -113,6 +113,7 @@ var jexcel = (function(el, options) {
         style:null,
         // Execute formulas
         parseFormulas:true,
+        autoIncrement:true,
         // Event handles
         onload:null,
         onchange:null,
@@ -178,7 +179,7 @@ var jexcel = (function(el, options) {
             noCellsSelected: 'No cells selected',
         },
         // About message
-        about:"jExcel CE Spreadsheet\nVersion 3.4.2\nAuthor: Paul Hodel <[email protected]>\nWebsite: https://jexcel.net/v3",
+        about:"jExcel CE Spreadsheet\nVersion 3.4.4\nAuthor: Paul Hodel <[email protected]>\nWebsite: https://jexcel.net/v3",
     };
 
     // Loading initial configuration from user
@@ -1936,7 +1937,7 @@ var jexcel = (function(el, options) {
                         var value = data[posy][posx];
                     }
 
-                    if (value && t0 == t1) {
+                    if (value && t0 == t1 && obj.options.autoIncrement == true) {
                         if (obj.options.columns[i].type == 'text' || obj.options.columns[i].type == 'number') {
                             if ((''+value).substr(0,1) == '=') {
                                 var tokens = value.match(/([A-Z]+[0-9]+)/g);
@@ -6273,6 +6274,9 @@ jexcel.keyDownControls = function(e) {
                                             // Start edition
                                             jexcel.current.openEditor(jexcel.current.records[rowId][columnId], true);
                                         }
+                                    } else if (e.keyCode == 113) {
+                                        // Start edition with current content F2
+                                        jexcel.current.openEditor(jexcel.current.records[rowId][columnId], false);
                                     } else if ((e.keyCode == 8) ||
                                                (e.keyCode >= 48 && e.keyCode <= 57) ||
                                                (e.keyCode >= 65 && e.keyCode <= 90) ||
@@ -6284,9 +6288,6 @@ jexcel.keyDownControls = function(e) {
                                         if (jexcel.current.options.columns[columnId].type == 'calendar') {
                                             e.preventDefault();
                                         }
-                                    } else if (e.keyCode == 113) {
-                                        // Start edition with current content F2
-                                        jexcel.current.openEditor(jexcel.current.records[rowId][columnId], false);
                                     }
                                 }
                             }

diff --git a/dist/jexcel.min.css b/dist/jexcel.min.css
diff --git a/dist/jexcel.min.js b/dist/jexcel.min.js
diff --git a/example.html b/example.html
@@ -0,0 +1,30 @@
+<html>
+<script src="dist/jexcel.js"></script>
+<link rel="stylesheet" href="dist/jexcel.css" type="text/css" />
+
+<script src="https://bossanova.uk/jsuites/v2/jsuites.js"></script>
+<link rel="stylesheet" href="https://bossanova.uk/jsuites/v2/jsuites.css" type="text/css" />
+
+<div id="spreadsheet"></div>
+
+<script>
+var data = [
+    [],
+    [],
+];
+
+jexcel(document.getElementById('spreadsheet'), {
+    data:data,
+    columns: [
+        { type: 'text' },
+        { type: 'text' },
+        { type: 'text' },
+        { type: 'text' },
+        { type: 'text' },
+        { type: 'text' },
+        { type: 'text' },
+     ],
+     minDimensions:[5,5]
+});
+</script>
+</html>
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
         "jsuites": "^2.1.3"
     },
     "main": "dist/jexcel.js",
-    "version": "3.4.0",
+    "version": "3.4.4",
     "bugs": "https://github.com/paulhodel/jexcel/issues",
     "homepage": "https://github.com/paulhodel/jexcel",
     "docs": "https://bossanova.uk/jexcel",