tabulator-rails 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '069d63fb31245f7182ba1ac53eea81d3a6bf8cc5'
-  data.tar.gz: 9cbcdb9f0c24429499cc31537982a01f70c99a6f
+  metadata.gz: e7cec85b2f75a1523ce7e192596bb6c8da162f53
+  data.tar.gz: e0e8a903e31068ac5efd448e58d88bad467eacb1
 SHA512:
-  metadata.gz: 07c6ff37357cd9b8a83a5baa0f32f23df0a431aa2c17f1b6601d2b1b0f4d281c785c2592a7d262168d7e92d18d67d632eed7d83333a268c3de016be863719772
-  data.tar.gz: 4479205847bf629a1ff5eb3498856f83305804fc600b97effc0a03c11bd1144d61dae9f611acf551035a7cbcbfd88832de60dfee20a2aebc8910c06bbc621839
+  metadata.gz: 28c9c0e0a15d311712ea3cda97fbfd53b77620aacd66d59430d4238c4f23f00b683257ec252d7ec78e646d9f3a011f4396bbb359522c47c483c314d8303b6a5b
+  data.tar.gz: eee3c6b73e6c25d76c136d5405b61b6fa6be13162f89df9b8f16e86a96ae54595a4d57f3809d34b526db3735c3eb691bd5ce44af87b4b16d0d6e5115d2dd253b

data/Gemfile.lock

@@ -1,93 +1,20 @@
 PATH
   remote: .
   specs:
-    tabulator-rails (0.1.1)
+    tabulator-rails (0.2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    diff-lcs (1.3)
-    erubi (1.7.0)
-    i18n (0.9.1)
-      concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
-    loofah (2.1.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (0.9.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.1)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    rack (2.0.3)
-    rack-test (0.8.2)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.16)
-  jquery-rails
-  jquery-ui-rails
   rake (~> 10.0)
-  rspec (~> 3.0)
   tabulator-rails!
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/VERSIONS.md

@@ -10,4 +10,5 @@
 | 0.2.3  | 3.4.3
 | 0.2.4  | 3.4.4
 | 0.2.5  | 3.4.5
+| 0.2.6  | 3.4.6
 

data/lib/tabulator-rails/version.rb

@@ -1,5 +1,5 @@
 module Tabulator
   module Rails
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/vendor/assets/javascripts/tabulator.js

@@ -2,7 +2,7 @@
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-/* Tabulator v3.4.5 (c) Oliver Folkerd */
+/* Tabulator v3.4.6 (c) Oliver Folkerd */
 
 /*
  * This file is part of the Tabulator package.
@@ -4923,7 +4923,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
       if (this.table.extExists("edit", true)) {
 
-        return this.table.extensions.edit.edit(this, false, force);
+        return this.table.extensions.edit.editCell(this, false, force);
       }
     };
 
@@ -5543,9 +5543,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
       _clearObjectPointers: function _clearObjectPointers() {
 
-        this.options.columns = this.options.columns.splice(0);
+        this.options.columns = this.options.columns.slice(0);
 
-        this.options.data = this.options.data.splice(0);
+        this.options.data = this.options.data.slice(0);
       },
 
       //build tabulator element
@@ -8741,6 +8741,11 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
       this.mouseClick = false; //hold mousedown state to prevent click binding being overriden by editor opening
 
+
+      this.recursionBlock = false; //prevent focus recursion
+
+
+      this.invalidEdit = false;
     };
 
     //initialize column editor
@@ -8822,13 +8827,18 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
       var cell = this.currentCell;
 
-      this.currentCell = false;
+      this.invalidEdit = false;
+
+      if (cell) {
+
+        this.currentCell = false;
 
-      cell.getElement().removeClass("tabulator-validation-fail");
+        cell.getElement().removeClass("tabulator-validation-fail");
 
-      cell.getElement().removeClass("tabulator-editing").empty();
+        cell.getElement().removeClass("tabulator-editing").empty();
 
-      cell.row.getElement().removeClass("tabulator-row-editing");
+        cell.row.getElement().removeClass("tabulator-row-editing");
+      }
     };
 
     Edit.prototype.cancelEdit = function () {
@@ -8875,12 +8885,31 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         self.mouseClick = true;
       });
 
-      element.on("focus", function (e, force) {
+      element.on("focus", function (e) {
+
+        if (!self.recursionBlock) {
 
-        self.edit(cell, e);
+          self.edit(cell, e, false);
+        }
       });
     };
 
+    Edit.prototype.focusCellNoEvent = function (cell) {
+
+      this.recursionBlock = true;
+
+      cell.getElement().focus();
+
+      this.recursionBlock = false;
+    };
+
+    Edit.prototype.editCell = function (cell, forceEdit) {
+
+      this.focusCellNoEvent(cell);
+
+      this.edit(cell, false, forceEdit);
+    };
+
     Edit.prototype.edit = function (cell, e, forceEdit) {
 
       var self = this,
@@ -8890,12 +8919,18 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           cellEditor,
           component;
 
-      //if currently editing another cell trigger blur to trigger save and validate actions
+      //prevent editing if another cell is refusing to leave focus (eg. validation fail)
 
 
       if (this.currentCell) {
 
-        cell.getElement().focus();
+        if (!this.invalidEdit) {
+
+          this.cancelEdit();
+        } else {
+
+          return;
+        }
 
         return;
       }
@@ -8905,25 +8940,35 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
       function success(value) {
 
-        var valid = true;
+        if (self.currentCell === cell) {
 
-        if (cell.column.extensions.validate && self.table.extExists("validate")) {
+          var valid = true;
 
-          valid = self.table.extensions.validate.validate(cell.column.extensions.validate, cell.getComponent(), value);
-        }
+          if (cell.column.extensions.validate && self.table.extExists("validate")) {
 
-        if (valid === true) {
+            valid = self.table.extensions.validate.validate(cell.column.extensions.validate, cell.getComponent(), value);
+          }
 
-          self.clearEditor();
+          if (valid === true) {
 
-          cell.setValue(value, true);
-        } else {
+            self.clearEditor();
+
+            cell.setValue(value, true);
+          } else {
+
+            self.invalidEdit = true;
+
+            cell.getElement().addClass("tabulator-validation-fail");
 
-          cell.getElement().addClass("tabulator-validation-fail");
+            self.focusCellNoEvent(cell);
 
-          rendered();
+            rendered();
 
-          self.table.options.validationFailed(cell.getComponent(), value, valid);
+            self.table.options.validationFailed(cell.getComponent(), value, valid);
+          }
+        } else {
+
+          console.warn("Edit Success Error - cannot call success on a cell that is no longer being edited");
         }
       };
 
@@ -8932,7 +8977,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
       function cancel() {
 
-        self.cancelEdit();
+        if (self.currentCell === cell) {
+
+          self.cancelEdit();
+        } else {
+
+          console.warn("Edit Success Error - cannot call cancel on a cell that is no longer being edited");
+        }
       };
 
       function onRendered(callback) {
@@ -11150,7 +11201,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
         element.attr("aria-label", percentValue);
 
-        return "<div style='position:absolute; top:8px; bottom:8px; left:4px; right:4px;'><div style='position:relative; height:100%; width:calc(" + percentValue + "%); background-color:" + color + "; display:inline-block;' data-max='" + max + "' data-min='" + min + "'></div></div>" + (legend ? "<div style='position:absolute; top:4px; left:0; text-align:center; width:100%; color:" + legendColor + ";'>" + legend + "</div>" : "");
+        return "<div style='position:absolute; top:8px; bottom:8px; left:4px; right:4px;'  data-max='" + max + "' data-min='" + min + "'><div style='position:relative; height:100%; width:calc(" + percentValue + "%); background-color:" + color + "; display:inline-block;'></div></div>" + (legend ? "<div style='position:absolute; top:4px; left:0; text-align:center; width:100%; color:" + legendColor + ";'>" + legend + "</div>" : "");
       },
 
       //background color

data/vendor/assets/stylesheets/tabulator.css

@@ -1,4 +1,4 @@
-/* Tabulator v3.4.5 (c) Oliver Folkerd */
+/* Tabulator v3.4.6 (c) Oliver Folkerd */
 .tabulator {
   position: relative;
   border: 1px solid #999;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabulator-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - tanvir hasan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler