slickgrid 2.3.16.1 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3360874f91b169a5d76cb3bbde2a912faccb7aa7
-  data.tar.gz: fba577ccae5cd74f75019948f8bd9fcc93ede240
+  metadata.gz: 9ff99f00455831f57630e3801f3f876efbb7b7ee
+  data.tar.gz: 1ffe1c0bfad0c20f25f18d0e9ecf99adacaf3759
 SHA512:
-  metadata.gz: 797578e85b23c2639ff40232f2731b0b0d2f4f3aa869998e375ca7ce56e3aa86b58e2af1830f6b46d6838bd0b65f2336a02fb3cc1d49d92b2dc415afc0448d6a
-  data.tar.gz: 9da6cd5d435bb8fba3ccf6722780a6507d115220cd505240e040b1ca6b83bdc9a26ac864e93c6cf180f1712842ff11e44436218bb9da7added901a9e42f7e373
+  metadata.gz: cde211d3104b85d486afa9dab9260787529aff8ab7514c2ea1e39b8eb048b30a16732964b3ee8c37e64bcffd8c6acd0e96f8fe7ef86cb3e29dac22ed6fb88b30
+  data.tar.gz: d6f02024be59b054c070c4e567be992333c26f73b72a6851de8d77844570b857008247d57e3ad890048b91a6f20125176ca49cabf213eaedddd7f69eb7915f85

data/slickgrid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "slickgrid"
-  gem.version       = "2.3.16.1"
+  gem.version       = "2.4.5"
   gem.authors       = ["Erlingur Þorsteinsson"]
   gem.email         = ["erlingur@rsf.is"]
   gem.description   = %q{SlickGrid (6pac fork) gem for Rails}

data/vendor/assets/javascripts/slickgrid/controls/columnpicker.js

@@ -13,9 +13,10 @@
    *      columnTitle: "Columns",                 // default to empty string
    *
    *      // the last 2 checkboxes titles
-   *      hideForceFitButton: false,              // show/hide checkbox near the end "Force Fit Columns" (default:false) 
-   *      hideSyncResizeButton: false,            // show/hide checkbox near the end "Synchronous Resize" (default:false) 
+   *      hideForceFitButton: false,              // show/hide checkbox near the end "Force Fit Columns" (default:false)
+   *      hideSyncResizeButton: false,            // show/hide checkbox near the end "Synchronous Resize" (default:false)
    *      forceFitTitle: "Force fit columns",     // default to "Force fit columns"
+   *      headerColumnValueExtractor: "Extract the column label" // default to column.name
    *      syncResizeTitle: "Synchronous resize",  // default to "Synchronous resize"
    *    }
    *  };
@@ -28,6 +29,8 @@
 
 (function ($) {
   function SlickColumnPicker(columns, grid, options) {
+    var _grid = grid;
+    var _options = options;
     var $list;
     var $menu;
     var columnCheckboxes;
@@ -38,22 +41,26 @@
 
       // the last 2 checkboxes titles
       hideForceFitButton: false,
-      hideSyncResizeButton: false, 
+      hideSyncResizeButton: false,
       forceFitTitle: "Force fit columns",
-      syncResizeTitle: "Synchronous resize"
+      syncResizeTitle: "Synchronous resize",
+      headerColumnValueExtractor:
+        function (columnDef) {
+          return columnDef.name;
+        }
     };
 
-    function init() {
+    function init(grid) {
       grid.onHeaderContextMenu.subscribe(handleHeaderContextMenu);
       grid.onColumnsReordered.subscribe(updateColumnOrder);
-      options = $.extend({}, defaults, options);
+      _options = $.extend({}, defaults, options);
 
       $menu = $("<div class='slick-columnpicker' style='display:none' />").appendTo(document.body);
       var $close = $("<button type='button' class='close' data-dismiss='slick-columnpicker' aria-label='Close'><span class='close' aria-hidden='true'>&times;</span></button>").appendTo($menu);
 
       // user could pass a title on top of the columns list
-      if(options.columnPickerTitle || (options.columnPicker && options.columnPicker.columnTitle)) {
-        var columnTitle = options.columnPickerTitle || options.columnPicker.columnTitle;
+      if(_options.columnPickerTitle || (_options.columnPicker && _options.columnPicker.columnTitle)) {
+        var columnTitle = _options.columnPickerTitle || _options.columnPicker.columnTitle;
         var $title = $("<div class='title'/>").append(columnTitle);
         $title.appendTo($menu);
       }
@@ -69,16 +76,16 @@
     }
 
     function destroy() {
-      grid.onHeaderContextMenu.unsubscribe(handleHeaderContextMenu);
-      grid.onColumnsReordered.unsubscribe(updateColumnOrder);
+      _grid.onHeaderContextMenu.unsubscribe(handleHeaderContextMenu);
+      _grid.onColumnsReordered.unsubscribe(updateColumnOrder);
       $(document.body).off("mousedown", handleBodyMouseDown);
-      $("div.slick-columnpicker").hide(options.fadeSpeed);
+      $("div.slick-columnpicker").hide(_options.fadeSpeed);
       $menu.remove();
     }
 
     function handleBodyMouseDown(e) {
       if (($menu && $menu[0] != e.target && !$.contains($menu[0], e.target)) || e.target.className == "close") {
-        $menu.hide(options.fadeSpeed);
+        $menu.hide(_options.fadeSpeed);
       }
     }
 
@@ -89,47 +96,54 @@
       columnCheckboxes = [];
 
       var $li, $input;
+      var columnLabel;
       for (var i = 0; i < columns.length; i++) {
         $li = $("<li />").appendTo($list);
         $input = $("<input type='checkbox' />").data("column-id", columns[i].id);
         columnCheckboxes.push($input);
 
-        if (grid.getColumnIndex(columns[i].id) != null) {
+        if (_grid.getColumnIndex(columns[i].id) != null) {
           $input.attr("checked", "checked");
         }
 
+        if (_options && _options.columnPicker && _options.columnPicker.headerColumnValueExtractor) {
+          columnLabel = _options.columnPicker.headerColumnValueExtractor(columns[i]);
+        } else {
+          columnLabel = defaults.headerColumnValueExtractor(columns[i]);
+        }
+        
         $("<label />")
-            .html(columns[i].name)
-            .prepend($input)
-            .appendTo($li);
+          .html(columnLabel)
+          .prepend($input)
+          .appendTo($li);
       }
 
-      if (options.columnPicker && (!options.columnPicker.hideForceFitButton || !options.columnPicker.hideSyncResizeButton)) {
+      if (_options.columnPicker && (!_options.columnPicker.hideForceFitButton || !_options.columnPicker.hideSyncResizeButton)) {
         $("<hr/>").appendTo($list);
       }
 
-      if (!(options.columnPicker && options.columnPicker.hideForceFitButton)) {
-        var forceFitTitle = (options.columnPicker && options.columnPicker.forceFitTitle) || options.forceFitTitle;
+      if (!(_options.columnPicker && _options.columnPicker.hideForceFitButton)) {
+        var forceFitTitle = (_options.columnPicker && _options.columnPicker.forceFitTitle) || _options.forceFitTitle;
         $li = $("<li />").appendTo($list);
         $input = $("<input type='checkbox' />").data("option", "autoresize");
         $("<label />")
             .text(forceFitTitle)
             .prepend($input)
             .appendTo($li);
-        if (grid.getOptions().forceFitColumns) {
+        if (_grid.getOptions().forceFitColumns) {
           $input.attr("checked", "checked");
         }
       }
 
-      if (!(options.columnPicker && options.columnPicker.hideSyncResizeButton)) {
-        var syncResizeTitle = (options.columnPicker && options.columnPicker.syncResizeTitle) || options.syncResizeTitle;
+      if (!(_options.columnPicker && _options.columnPicker.hideSyncResizeButton)) {
+        var syncResizeTitle = (_options.columnPicker && _options.columnPicker.syncResizeTitle) || _options.syncResizeTitle;
         $li = $("<li />").appendTo($list);
         $input = $("<input type='checkbox' />").data("option", "syncresize");
         $("<label />")
             .text(syncResizeTitle)
             .prepend($input)
             .appendTo($li);
-        if (grid.getOptions().syncColumnCellResize) {
+        if (_grid.getOptions().syncColumnCellResize) {
           $input.attr("checked", "checked");
         }
       }
@@ -138,7 +152,7 @@
           .css("top", e.pageY - 10)
           .css("left", e.pageX - 10)
           .css("max-height", $(window).height() - e.pageY -10)
-          .fadeIn(options.fadeSpeed);
+          .fadeIn(_options.fadeSpeed);
 
       $list.appendTo($menu);
     }
@@ -150,10 +164,10 @@
       // We create a new `columns` structure by leaving currently-hidden
       // columns in their original ordinal position and interleaving the results
       // of the current column sort.
-      var current = grid.getColumns().slice(0);
+      var current = _grid.getColumns().slice(0);
       var ordered = new Array(columns.length);
       for (var i = 0; i < ordered.length; i++) {
-        if ( grid.getColumnIndex(columns[i].id) === undefined ) {
+        if ( _grid.getColumnIndex(columns[i].id) === undefined ) {
           // If the column doesn't return a value from getColumnIndex,
           // it is hidden. Leave it in this position.
           ordered[i] = columns[i];
@@ -168,19 +182,19 @@
     function updateColumn(e) {
       if ($(e.target).data("option") == "autoresize") {
         if (e.target.checked) {
-          grid.setOptions({forceFitColumns:true});
-          grid.autosizeColumns();
+          _grid.setOptions({forceFitColumns:true});
+          _grid.autosizeColumns();
         } else {
-          grid.setOptions({forceFitColumns:false});
+          _grid.setOptions({forceFitColumns:false});
         }
         return;
       }
 
       if ($(e.target).data("option") == "syncresize") {
         if (e.target.checked) {
-          grid.setOptions({syncColumnCellResize:true});
+          _grid.setOptions({syncColumnCellResize:true});
         } else {
-          grid.setOptions({syncColumnCellResize:false});
+          _grid.setOptions({syncColumnCellResize:false});
         }
         return;
       }
@@ -198,8 +212,8 @@
           return;
         }
 
-        grid.setColumns(visibleColumns);
-        onColumnsChanged.notify({columns: visibleColumns, grid: grid});
+        _grid.setColumns(visibleColumns);
+        onColumnsChanged.notify({columns: visibleColumns, grid: _grid});
       }
     }
 
@@ -207,9 +221,10 @@
       return columns;
     }
 
-    init();
+    init(_grid);
 
     return {
+      "init": init,
       "getAllColumns": getAllColumns,
       "destroy": destroy,
       "onColumnsChanged": onColumnsChanged

data/vendor/assets/javascripts/slickgrid/controls/gridmenu.js

@@ -19,7 +19,7 @@
    *      iconCssClass: "fa fa-bars",                 // you can provide iconImage OR iconCssClass
    *      leaveOpen: false,                           // do we want to leave the Grid Menu open after a command execution? (false by default)
    *      menuWidth: 18,                              // width that will be use to resize the column header container (18 by default)
-   *      resizeOnShowHeaderRow: true,                // true by default
+   *      resizeOnShowHeaderRow: false,               // false by default
    *
    *      // the last 2 checkboxes titles
    *      hideForceFitButton: false,                  // show/hide checkbox near the end "Force Fit Columns"
@@ -41,6 +41,7 @@
    *
    * Available custom menu item options:
    *    title:        Menu item text.
+   *    divider:      Whether the current item is a divider, not an actual command.
    *    disabled:     Whether the item is disabled.
    *    tooltip:      Item tooltip.
    *    command:      A command identifier to be passed to the onCommand event handlers.
@@ -94,10 +95,13 @@
 
     function SlickGridMenu(columns, grid, options) {
       var _grid = grid;
+      var _gridOptions;
+      var _gridUid = (grid && grid.getUID) ? grid.getUID() : '';
       var _isMenuOpen = false;
       var _options = options;
       var _self = this;
       var $list;
+      var $button;
       var $menu;
       var columnCheckboxes;
       var _defaults = {
@@ -111,18 +115,27 @@
       };
 
       function init(grid) {
+        _gridOptions = grid.getOptions();
         var gridMenuWidth = (_options.gridMenu && _options.gridMenu.menuWidth) || _defaults.menuWidth;
-        var $header = $('.slick-header');
+        var $header;
+        if (_gridOptions && _gridOptions.frozenColumn && _gridOptions.frozenColumn > 0 ) {
+          $header = $('.' + _gridUid + ' .slick-header-right');
+        } else {
+          $header = $('.' + _gridUid + ' .slick-header-left');
+        }
         $header.attr('style', 'width: calc(100% - ' + gridMenuWidth +'px)');
 
+        // subscribe to the grid, when it's destroyed, we should also destroy the Grid Menu
+        grid.onBeforeDestroy.subscribe(destroy);
+
         // if header row is enabled, we need to resize it's width also
         var enableResizeHeaderRow = (_options.gridMenu && _options.gridMenu.resizeOnShowHeaderRow != undefined) ? _options.gridMenu.resizeOnShowHeaderRow : _defaults.resizeOnShowHeaderRow;
-        if(enableResizeHeaderRow) {
-          var $headerrow = $('.slick-headerrow');
+        if(enableResizeHeaderRow && _options.showHeaderRow) {
+          var $headerrow = $('.' + _gridUid + '.slick-headerrow');
           $headerrow.attr('style', 'width: calc(100% - ' + gridMenuWidth +'px)');
         }
 
-        var $button = $('<button class="slick-gridmenu-button"/>');
+        $button = $('<button class="slick-gridmenu-button"/>');
         if (_options.gridMenu && _options.gridMenu.iconCssClass) {
           $button.addClass(_options.gridMenu.iconCssClass);
         } else {
@@ -132,7 +145,7 @@
         }
         $button.insertBefore($header);
 
-        $menu = $('<div class="slick-gridmenu" style="display: none" />').appendTo(document.body);
+        $menu = $('<div class="slick-gridmenu ' + _gridUid + '" style="display: none" />').appendTo(document.body);
         var $close = $('<button type="button" class="close" data-dismiss="slick-gridmenu" aria-label="Close"><span class="close" aria-hidden="true">&times;</span></button>').appendTo($menu);
 
         var $customMenu = $('<div class="slick-gridmenu-custom" />');
@@ -148,13 +161,13 @@
         populateColumnPicker();
 
         // Hide the menu on outside click.
-        $(document.body).on("mousedown", handleBodyMouseDown);
+        $(document.body).on("mousedown." + _gridUid, handleBodyMouseDown);
 
         // destroy the picker if user leaves the page
         $(window).on("beforeunload", destroy);
 
         // add on click handler for the Grid Menu itself
-        $button.on("click", showGridMenu);
+        $button.on("click." + _gridUid, showGridMenu);
       }
 
       function destroy() {
@@ -163,9 +176,11 @@
         _self.onCommand.unsubscribe();
         _self.onColumnsChanged.unsubscribe();
         _grid.onColumnsReordered.unsubscribe(updateColumnOrder);
-        $(document.body).off("mousedown", handleBodyMouseDown);
-        $("div.slick-gridmenu").hide(_options.fadeSpeed);
+        _grid.onBeforeDestroy.unsubscribe();
+        $(document.body).off("mousedown." + _gridUid, handleBodyMouseDown);
+        $("div.slick-gridmenu." + _gridUid).hide(_options.fadeSpeed);
         $menu.remove();
+        $button.remove();
       }
 
       function populateCustomMenus(options, $customMenu) {
@@ -186,6 +201,11 @@
             $li.addClass("slick-gridmenu-item-disabled");
           }
 
+          if (item.divider) {
+            $li.addClass("slick-gridmenu-item-divider");
+            continue;
+          }
+
           if (item.tooltip) {
             $li.attr("title", item.tooltip);
           }
@@ -295,13 +315,12 @@
             .fadeIn(_options.fadeSpeed);
 
         $list.appendTo($menu);
+        _isMenuOpen = true;
       }
 
       function handleBodyMouseDown(e) {
         if (($menu && $menu[0] != e.target && !$.contains($menu[0], e.target) && _isMenuOpen) || e.target.className == "close") {
           hideMenu(e);
-        } else {
-          _isMenuOpen = true;
         }
       }
 
@@ -309,7 +328,7 @@
         var command = $(this).data("command");
         var item = $(this).data("item");
 
-        if (item.disabled) {
+        if (item.disabled || item.divider) {
           return;
         }
 

data/vendor/assets/javascripts/slickgrid/core.js

@@ -24,8 +24,10 @@
        * @constructor
        */
       "GlobalEditorLock": new EditorLock(),
+      "TreeColumns": TreeColumns,
 
       "keyCode": {
+        SPACE: 8,
         BACKSPACE: 8,
         DELETE: 46,
         DOWN: 40,
@@ -488,6 +490,178 @@
       return (activeEditController ? activeEditController.cancelCurrentEdit() : true);
     };
   }
+
+  /**
+   *
+   * @param {Array} treeColumns Array com levels of columns
+   * @returns {{hasDepth: 'hasDepth', getTreeColumns: 'getTreeColumns', extractColumns: 'extractColumns', getDepth: 'getDepth', getColumnsInDepth: 'getColumnsInDepth', getColumnsInGroup: 'getColumnsInGroup', visibleColumns: 'visibleColumns', filter: 'filter', reOrder: reOrder}}
+   * @constructor
+   */
+  function TreeColumns(treeColumns) {
+
+    var columnsById = {};
+
+    function init() {
+      mapToId(treeColumns);
+    }
+
+    function mapToId(columns) {
+      columns
+        .forEach(function (column) {
+          columnsById[column.id] = column;
+
+          if (column.columns)
+            mapToId(column.columns);
+        });
+    }
+
+    function filter(node, condition) {
+
+      return node.filter(function (column) {
+
+        var valid = condition.call(column);
+
+        if (valid && column.columns)
+          column.columns = filter(column.columns, condition);
+
+        return valid && (!column.columns || column.columns.length);
+      });
+
+    }
+
+    function sort(columns, grid) {
+      columns
+        .sort(function (a, b) {
+          var indexA = getOrDefault(grid.getColumnIndex(a.id)),
+            indexB = getOrDefault(grid.getColumnIndex(b.id));
+
+          return indexA - indexB;
+        })
+        .forEach(function (column) {
+          if (column.columns)
+            sort(column.columns, grid);
+        });
+    }
+
+    function getOrDefault(value) {
+      return typeof value === 'undefined' ? -1 : value;
+    }
+
+    function getDepth(node) {
+      if (node.length)
+        for (var i in node)
+          return getDepth(node[i]);
+      else if (node.columns)
+        return 1 + getDepth(node.columns);
+      else
+        return 1;
+    }
+
+    function getColumnsInDepth(node, depth, current) {
+      var columns = [];
+      current = current || 0;
+
+      if (depth == current) {
+
+        if (node.length)
+          node.forEach(function(n) {
+            if (n.columns)
+              n.extractColumns = function() {
+                return extractColumns(n);
+              };
+          });
+
+        return node;
+      } else
+        for (var i in node)
+          if (node[i].columns) {
+            columns = columns.concat(getColumnsInDepth(node[i].columns, depth, current + 1));
+          }
+
+      return columns;
+    }
+
+    function extractColumns(node) {
+      var result = [];
+
+      if (node.hasOwnProperty('length')) {
+
+        for (var i = 0; i < node.length; i++)
+          result = result.concat(extractColumns(node[i]));
+
+      } else {
+
+        if (node.hasOwnProperty('columns'))
+
+          result = result.concat(extractColumns(node.columns));
+
+        else
+          return node;
+
+      }
+
+      return result;
+    }
+
+    function cloneTreeColumns() {
+      return $.extend(true, [], treeColumns);
+    }
+
+    init();
+
+    this.hasDepth = function () {
+
+      for (var i in treeColumns)
+        if (treeColumns[i].hasOwnProperty('columns'))
+          return true;
+
+      return false;
+    };
+
+    this.getTreeColumns = function () {
+      return treeColumns;
+    };
+
+    this.extractColumns = function () {
+      return this.hasDepth()? extractColumns(treeColumns): treeColumns;
+    };
+
+    this.getDepth = function () {
+      return getDepth(treeColumns);
+    };
+
+    this.getColumnsInDepth = function (depth) {
+      return getColumnsInDepth(treeColumns, depth);
+    };
+
+    this.getColumnsInGroup = function (groups) {
+      return extractColumns(groups);
+    };
+
+    this.visibleColumns = function () {
+      return filter(cloneTreeColumns(), function () {
+        return this.visible;
+      });
+    };
+
+    this.filter = function (condition) {
+      return filter(cloneTreeColumns(), condition);
+    };
+
+    this.reOrder = function (grid) {
+      return sort(treeColumns, grid);
+    };
+
+    this.getById = function (id) {
+      return columnsById[id];
+    };
+
+    this.getInIds = function (ids) {
+      return ids.map(function (id) {
+        return columnsById[id];
+      });
+    }
+  }
 })(jQuery);