bootstrap-table-rails 1.11.1.1 → 1.12.1

data/vendor/assets/javascripts/extensions/bootstrap-table-print.js

@@ -24,6 +24,7 @@
         printAsFilteredAndSortedOnUI: true, //boolean, when true - print table as sorted and filtered on UI.
                                             //Please note that if true is set, along with explicit predefined print options for filtering and sorting (printFilter, printSortOrder, printSortColumn)- then they will be applied on data already filtered and sorted by UI controls.
                                             //For printing data as filtered and sorted on UI - do not set these 3 options:printFilter, printSortOrder, printSortColumn
+
         printSortColumn: undefined  , //String, set column field name to be sorted by
         printSortOrder: 'asc', //String: 'asc' , 'desc'  - relevant only if printSortColumn is set
         printPageBuilder: function(table){return printPageBuilderDefault(table)} // function, receive html <table> element as string, returns html string for printing. by default delegates to function printPageBuilderDefault(table). used for styling and adding header or footer
@@ -32,6 +33,7 @@
         printFilter: undefined, //set value to filter by in print page
         printIgnore: false, //boolean, set true to ignore this column in the print page
         printFormatter:undefined //function(value, row, index), formats the cell value for this column in the printed table. Function behaviour is similar to the 'formatter' column option
+
     });
     $.extend($.fn.bootstrapTable.defaults.icons, {
         print: 'glyphicon-print icon-share'
@@ -41,7 +43,7 @@
         _initToolbar = BootstrapTable.prototype.initToolbar;
 
     BootstrapTable.prototype.initToolbar = function () {
-        this.showToolbar = this.options.showPrint;
+        this.showToolbar = this.showToolbar || this.options.showPrint;
 
         _initToolbar.apply(this, Array.prototype.slice.apply(arguments));
 
@@ -63,28 +65,42 @@
                             return  column.printFormatter.apply(column, [value, row, i]);
                         }
                         else {
-                            return  value || "-";
+                            return  typeof value === 'undefined' ? "-" : value;
                         }
                     }
-                    function buildTable(data,columns) {
-                        var out = "<table><thead><tr>";
-                        for(var h = 0; h < columns.length; h++) {
-                            if(!columns[h].printIgnore) {
-                                out += ("<th>"+columns[h].title+"</th>");
+
+                    function buildTable(data, columnsArray) {
+                        var html = ['<table><thead>'];
+                        for (var k = 0; k < columnsArray.length; k++) {
+                            var columns = columnsArray[k];
+                            html.push('<tr>');
+                            for (var h = 0; h < columns.length; h++) {
+                                if (!columns[h].printIgnore) {
+                                    html.push(
+                                        '<th',
+                                        sprintf(' rowspan="%s"', columns[h].rowspan),
+                                        sprintf(' colspan="%s"', columns[h].colspan),
+                                        sprintf('>%s</th>', columns[h].title)
+                                    );
+                                }
                             }
+                            html.push('</tr>');
                         }
-                        out += "</tr></thead><tbody>";
-                        for(var i = 0; i < data.length; i++) {
-                            out += "<tr>";
-                            for(var j = 0; j < columns.length; j++) {
-                                if(!columns[j].printIgnore) {
-                                    out += ("<td>"+ formatValue(data[i], i, columns[j])+"</td>");
+                        html.push('</thead><tbody>');
+                        for (var i = 0; i < data.length; i++) {
+                            html.push('<tr>');
+                            for(var l = 0; l < columnsArray.length; l++) {
+                                var columns = columnsArray[l];
+                                for(var j = 0; j < columns.length; j++) {
+                                    if (!columns[j].printIgnore && columns[j].field) {
+                                        html.push('<td>', formatValue(data[i], i, columns[j]), '</td>');
+                                    }
                                 }
                             }
-                            out += "</tr>";
+                            html.push('</tr>');
                         }
-                        out += "</tbody></table>";
-                        return out;
+                        html.push('</tbody></table>');
+                        return html.join('');
                     }
                     function sortRows(data,colName,sortOrder) {
                         if(!colName){
@@ -119,7 +135,7 @@
                     var doPrint = function (data) {
                         data=filterRows(data,getColumnFilters(that.options.columns));
                         data=sortRows(data,that.options.printSortColumn,that.options.printSortOrder);
-                        var table=buildTable(data,that.options.columns[0]);
+                        var table=buildTable(data,that.options.columns);
                         var newWin = window.open("");
                         newWin.document.write(that.options.printPageBuilder.call(this, table));
                         newWin.print();

data/vendor/assets/javascripts/extensions/bootstrap-table-reorder-columns.js

@@ -141,8 +141,8 @@
                     }
                 }
 
-                for (var i = 0; i < ths.length; i++ ) {
-                    columnIndex = $.fn.bootstrapTable.utils.getFieldIndex(that.columns, ths[i]);
+                for (var i = 0; i < this.length; i++ ) {
+                    columnIndex = that.fieldsColumnsIndex[ths[i]];
                     if (columnIndex !== -1) {
                         that.columns[columnIndex].fieldIndex = i;
                         columns.push(that.columns[columnIndex]);

data/vendor/assets/javascripts/extensions/bootstrap-table-resizable.js

@@ -20,7 +20,8 @@
             hoverCursor: that.options.hoverCursor,
             dragCursor: that.options.dragCursor,
             onResize: that.onResize,
-            onDrag: that.options.onResizableDrag
+            onDrag: that.options.onResizableDrag,
+            resizeMode: that.options.resizeMode
         });
     };
 

data/vendor/assets/javascripts/extensions/bootstrap-table-select2-filter.js

@@ -1,9 +1,9 @@
 /**
  * @author: Jewway
- * @version: v1.0.0
+ * @version: v1.1.1
  */
 
-!function ($) {
+! function ($) {
   'use strict';
 
   function getCurrentHeader(that) {
@@ -15,23 +15,26 @@
     return header;
   }
 
-  function getFilterFields(that) {
-    return getCurrentHeader(that).find('[data-filter-field]');
-  }
-
-  function setFilterValues(that) {
-    var $filterElms = getFilterFields(that);
+  function initFilterValues(that) {
     if (!$.isEmptyObject(that.filterColumnsPartial)) {
-      $filterElms.each(function (index, ele) {
-        var $ele = $(ele),
-            field = $ele.attr('data-filter-field'),
-            value = that.filterColumnsPartial[field];
+      var $header = getCurrentHeader(that);
 
-        if ($ele.is("select")) {
-          $ele.val(value).trigger('change');
-        }
-        else {
-          $ele.val(value);
+      $.each(that.columns, function (idx, column) {
+        var value = that.filterColumnsPartial[column.field];
+
+        if (column.filter) {
+          if (column.filter.setFilterValue) {
+            var $filter = $header.find('[data-field=' + column.field + '] .filter');
+            column.filter.setFilterValue($filter, column.field, value);
+          } else {
+            var $ele = $header.find('[data-filter-field=' + column.field + ']');
+            switch (column.filter.type) {
+              case 'input':
+                $ele.val(value);
+              case 'select':
+                $ele.val(value).trigger('change');
+            }
+          }
         }
       });
     }
@@ -39,89 +42,109 @@
 
   function createFilter(that, header) {
     var enableFilter = false,
-        isVisible,
-        html,
-        timeoutId = 0;
+      isVisible,
+      html,
+      timeoutId = 0;
 
     $.each(that.columns, function (i, column) {
       isVisible = 'hidden';
-      html = [];
+      html = null;
 
       if (!column.visible) {
         return;
       }
 
       if (!column.filter) {
-        html.push('<div class="no-filter"></div>');
+        html = $('<div class="no-filter"></div>');
       } else {
         var filterClass = column.filter.class ? ' ' + column.filter.class : '';
-        html.push('<div style="margin: 0px 2px 2px 2px;" class="filter' + filterClass + '">');
+        html = $('<div style="margin: 0px 2px 2px 2px;" class="filter' + filterClass + '">');
 
         if (column.searchable) {
           enableFilter = true;
           isVisible = 'visible'
         }
 
-        switch (column.filter.type.toLowerCase()) {
-          case 'input' :
-            html.push('<input type="text" data-filter-field="' + column.field + '" style="width: 100%; visibility:' + isVisible + '">');
-            break;
-          case 'select':
-            html.push('<select data-filter-field="' + column.field + '" style="width: 100%; visibility:' + isVisible + '"></select>');
-            break;
+        if (column.filter.template) {
+          html.append(column.filter.template(that, column, isVisible));
+        } else {
+          var $filter = $(that.options.filterTemplate[column.filter.type.toLowerCase()](that, column, isVisible));
+
+          switch (column.filter.type) {
+            case 'input':
+              var cpLock = true;
+              $filter.off('compositionstart').on('compositionstart', function (event) {
+                cpLock = false;
+              });
+
+              $filter.off('compositionend').on('compositionend', function (event) {
+                cpLock = true;
+                var $input = $(this);
+                clearTimeout(timeoutId);
+                timeoutId = setTimeout(function () {
+                  that.onColumnSearch(event, column.field, $input.val());
+                }, that.options.searchTimeOut);
+              });
+
+              $filter.off('keyup').on('keyup', function (event) {
+                if (cpLock) {
+                  var $input = $(this);
+                  clearTimeout(timeoutId);
+                  timeoutId = setTimeout(function () {
+                    that.onColumnSearch(event, column.field, $input.val());
+                  }, that.options.searchTimeOut);
+                }
+              });
+
+              $filter.off('mouseup').on('mouseup', function (event) {
+                var $input = $(this),
+                  oldValue = $input.val();
+
+                if (oldValue === "") {
+                  return;
+                }
+
+                setTimeout(function () {
+                  var newValue = $input.val();
+
+                  if (newValue === "") {
+                    clearTimeout(timeoutId);
+                    timeoutId = setTimeout(function () {
+                      that.onColumnSearch(event, column.field, newValue);
+                    }, that.options.searchTimeOut);
+                  }
+                }, 1);
+              });
+              break;
+            case 'select':
+              $filter.on('select2:select', function (event) {
+                that.onColumnSearch(event, column.field, $(this).val());
+              });
+
+              $filter.on("select2:unselecting", function (event) {
+                var $select2 = $(this);
+                event.preventDefault();
+                $select2.val(null).trigger('change');
+                that.searchText = undefined;
+                that.onColumnSearch(event, column.field, $select2.val());
+              });
+              break;
+          }
+
+          html.append($filter);
         }
       }
 
       $.each(header.children().children(), function (i, tr) {
         tr = $(tr);
         if (tr.data('field') === column.field) {
-          tr.find('.fht-cell').append(html.join(''));
+          tr.find('.fht-cell').append(html);
           return false;
         }
       });
     });
 
-    if (enableFilter) {
-      var $inputs = header.find('input'),
-          $selects = header.find('select');
-
-
-      if ($inputs.length > 0) {
-        $inputs.off('keyup').on('keyup', function (event) {
-          clearTimeout(timeoutId);
-          timeoutId = setTimeout(function () {
-            that.onColumnSearch(event);
-          }, that.options.searchTimeOut);
-        });
-
-
-        $inputs.off('mouseup').on('mouseup', function (event) {
-          var $input = $(this),
-              oldValue = $input.val();
-
-          if (oldValue === "") {
-            return;
-          }
-
-          setTimeout(function () {
-            var newValue = $input.val();
-
-            if (newValue === "") {
-              clearTimeout(timeoutId);
-              timeoutId = setTimeout(function () {
-                that.onColumnSearch(event);
-              }, that.options.searchTimeOut);
-            }
-          }, 1);
-        });
-      }
-
-      if ($selects.length > 0) {
-        $selects.on('select2:select', function (event) {
-          that.onColumnSearch(event);
-        });
-      }
-    } else {
+    if (!enableFilter) {
       header.find('.filter').hide();
     }
   }
@@ -131,11 +154,9 @@
 
     $.each(that.columns, function (idx, column) {
       if (column.filter && column.filter.type === 'select') {
-        var $selectEle = $header.find('select[data-filter-field=' + column.field + ']');
+        var $selectEle = $header.find('select[data-filter-field="' + column.field + '"]');
 
         if ($selectEle.length > 0 && !$selectEle.data().select2) {
-          column.filter.data.unshift("");
-
           var select2Opts = {
             placeholder: "",
             allowClear: true,
@@ -144,12 +165,6 @@
           };
 
           $selectEle.select2(select2Opts);
-          $selectEle.on("select2:unselecting", function (event) {
-            event.preventDefault();
-            $selectEle.val(null).trigger('change');
-            that.searchText = undefined;
-            that.onColumnSearch(event);
-          });
         }
       }
     });
@@ -157,23 +172,42 @@
 
   $.extend($.fn.bootstrapTable.defaults, {
     filter: false,
-    filterValues: {}
+    filterValues: {},
+    filterTemplate: {
+      input: function (instance, column, isVisible) {
+        return '<input type="text" class="form-control" data-filter-field="' + column.field + '" style="width: 100%; visibility:' + isVisible + '">';
+      },
+      select: function (instance, column, isVisible) {
+        return '<select data-filter-field="' + column.field + '" style="width: 100%; visibility:' + isVisible + '"></select>';
+      }
+    },
+    onColumnSearch: function (field, text) {
+      return false;
+    }
   });
 
   $.extend($.fn.bootstrapTable.COLUMN_DEFAULTS, {
     filter: undefined
   });
 
+  $.extend($.fn.bootstrapTable.Constructor.EVENTS, {
+    'column-search.bs.table': 'onColumnSearch'
+  });
+
   var BootstrapTable = $.fn.bootstrapTable.Constructor,
-      _init = BootstrapTable.prototype.init,
-      _initHeader = BootstrapTable.prototype.initHeader,
-      _initSearch = BootstrapTable.prototype.initSearch;
+    _init = BootstrapTable.prototype.init,
+    _initHeader = BootstrapTable.prototype.initHeader,
+    _initSearch = BootstrapTable.prototype.initSearch;
 
   BootstrapTable.prototype.init = function () {
     //Make sure that the filtercontrol option is set
     if (this.options.filter) {
       var that = this;
 
+      if (that.options.filterTemplate) {
+        that.options.filterTemplate = $.extend({}, $.fn.bootstrapTable.defaults.filterTemplate, that.options.filterTemplate);
+      }
+
       if (!$.isEmptyObject(that.options.filterValues)) {
         that.filterColumnsPartial = that.options.filterValues;
         that.options.filterValues = {};
@@ -197,10 +231,10 @@
         initSelect2(that);
         clearTimeout(timeoutId);
         timeoutId = setTimeout(function () {
-          setFilterValues(that);
+          initFilterValues(that);
         }, that.options.searchTimeOut - 1000);
       }).on('column-switch.bs.table', function (field, checked) {
-        setFilterValues(that);
+        initFilterValues(that);
       });
     }
 
@@ -215,23 +249,20 @@
   };
 
   BootstrapTable.prototype.initSearch = function () {
-    _initSearch.apply(this, Array.prototype.slice.apply(arguments));
-
     var that = this,
-        filterValues = that.filterColumnsPartial;
+      filterValues = that.filterColumnsPartial;
 
     // Filter for client
     if (that.options.sidePagination === 'client') {
       this.data = $.grep(this.data, function (row, idx) {
         for (var field in filterValues) {
-          var column = that.columns[$.fn.bootstrapTable.utils.getFieldIndex(that.columns, field)],
-              filterValue = filterValues[field].toLowerCase(),
-              rowValue = row[field];
+          var column = that.columns[that.fieldsColumnsIndex[field]],
+            filterValue = filterValues[field].toLowerCase(),
+            rowValue = row[field];
 
           rowValue = $.fn.bootstrapTable.utils.calculateObjectValue(
-              that.header,
-              that.header.formatters[$.inArray(field, that.header.fields)],
-              [rowValue, row, idx], rowValue);
+            that.header,
+            that.header.formatters[$.inArray(field, that.header.fields)], [rowValue, row, idx], rowValue);
 
           if (column.filterStrictSearch) {
             if (!($.inArray(field, that.header.fields) !== -1 &&
@@ -251,12 +282,11 @@
         return true;
       });
     }
-  };
 
-  BootstrapTable.prototype.onColumnSearch = function (event) {
-    var field = $(event.currentTarget).attr('data-filter-field'),
-        value = $.trim($(event.currentTarget).val());
+    _initSearch.apply(this, Array.prototype.slice.apply(arguments));
+  };
 
+  BootstrapTable.prototype.onColumnSearch = function (event, field, value) {
     if ($.isEmptyObject(this.filterColumnsPartial)) {
       this.filterColumnsPartial = {};
     }
@@ -269,14 +299,13 @@
 
     this.options.pageNumber = 1;
     this.onSearch(event);
+    this.trigger('column-search', field, value);
   };
 
-  BootstrapTable.prototype.setFilterData = function (field, data) {
+  BootstrapTable.prototype.setSelect2Data = function (field, data) {
     var that = this,
-        $header = getCurrentHeader(that),
-        $selectEle = $header.find('select[data-filter-field=\"' + field + '\"]');
-
-    data.unshift("");
+      $header = getCurrentHeader(that),
+      $selectEle = $header.find('select[data-filter-field=\"' + field + '\"]');
     $selectEle.empty();
     $selectEle.select2({
       data: data,
@@ -297,7 +326,7 @@
     this.filterColumnsPartial = values;
   };
 
-  $.fn.bootstrapTable.methods.push('setFilterData');
+  $.fn.bootstrapTable.methods.push('setSelect2Data');
   $.fn.bootstrapTable.methods.push('setFilterValues');
 
-}(jQuery);
+}(jQuery);