Merge branch 'adambyer-adambyer-select-control-class-fix' into develop

CHANGELOG.md

@@ -1,30 +1,47 @@
 ChangeLog
 ---------
 
-### 1.10.2
+### 1.11.0
 
 - fix(js): fix cardVisible doesn't work bug
-- feat(js): add support for transfer from rowspan / colspan table
 - fix(js): int field break toggleColumn
+- fix(js): table elements inside bootstrap table bug
+- fix(js): move formatter after cellStyle
+- fix(js): the footer is hidden in card view
+- fix(js): fix sorting rows not working bug
+- fix(js): return field from visible cells
+- fix(js): onSearch event is not fire when we press the arrows keys
+- fix(js): fix fromHtml error
+- fix(js): fix event cannot work when some columns are hideen
+- fix(js): remove page size and number when pagination is false
+- fix(js): remove getFieldIndexFromColumnIndex because it cause events bug
+- fix(js): fix getSelections method bug
+- fix(js): update records to rows
 - fix(locale): update it-IT locale
 - fix(locale): add formatAllRows in template locale
-- fix(js): table elements inside bootstrap table bug
-- docs(filter-control extension): add documentation for filterData
+- fix(filter-control extension): add check for null values on existsOptionInSelectControl
+- fix(filter-control extension): fix show-clear button bug
+- feat(js): add support for transfer from rowspan / colspan table
 - feat(js): add data variable to post-body event
 - feat(js): add `buttonsClass` option
-- fix(js): move formatter after cellStyle
 - feat(js): add `getVisibleColumns` method
 - feat(js): add resize event to fit the header
-- fix(js): the footer is hidden in card view
-- fix(filter-control extension): add check for null values on existsOptionInSelectControl
-- fix(js): fix sorting rows not working bug
-- refactor(filter-control extension): refactor the filterDataType method
-- feat(angular extension): add constant in order to get it from angular scope
-- fix(js): return field from visible cells
 - feat(js): add `onRefresh` event
-- fix(js): onSearch event is not fire when we press the arrows keys
 - feat(js): add field parameter in the click and dblClick row events
+- feat(js): add div.card-views surrounds all the card view divs
+- feat(js): add `field` parameter to cellStyle
+- feat(js): add `sortStable` option
+- feat(js): add `footerStyle` option
+- feat(extension): add select2 filter and i18n enhance extensions
+- feat(extension): add multi-column-toggle extension
 - feat(filter-control extension): add select list data to be passed in as JSON string and filter control starts with search
+- feat(angular extension): add constant in order to get it from angular scope
+- feat(export extension): add `formatExport` locale
+- feat(multiple-sort extension): add `formatSortOrders` option
+- refactor(filter-control extension): refactor the filterDataType method
+- refactor(filter-control extension): adding all unique values to select control and performance improvements
+- refactor(extension): refactor filter cookies extension to avoid dbcalls
+- docs(filter-control extension): add documentation for filterData
 
 
 ### 1.10.1

src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -182,7 +182,7 @@
 
         $.each(that.header.fields, function (j, field) {
             var column = that.columns[$.fn.bootstrapTable.utils.getFieldIndex(that.columns, field)],
-                selectControl = $('.' + escapeID(column.field));
+                selectControl = $('.bootstrap-table-filter-control-' + escapeID(column.field));
 
             if (isColumnSearchableViaSelect(column) && isFilterDataNotGiven(column) && hasSelectControlElement(selectControl)) {
                 if (selectControl.get(selectControl.length - 1).options.length === 0) {
@@ -252,7 +252,7 @@
 
                 if (filterDataType !== null) {
                     filterDataSource = column.filterData.substring(column.filterData.indexOf(':') + 1, column.filterData.length);
-                    selectControl = $('.' + escapeID(column.field));
+                    selectControl = $('.bootstrap-table-filter-control-' + escapeID(column.field));
 
                     addOptionToSelectControl(selectControl, '', '');
                     filterDataType(filterDataSource, selectControl);
@@ -330,7 +330,7 @@
             if (header.find('.date-filter-control').length > 0) {
                 $.each(that.columns, function (i, column) {
                     if (column.filterControl !== undefined && column.filterControl.toLowerCase() === 'datepicker') {
-                        header.find('.date-filter-control.' + column.field).datepicker(column.filterDatepickerOptions)
+                        header.find('.date-filter-control.bootstrap-table-filter-control-' + column.field).datepicker(column.filterDatepickerOptions)
                             .on('changeDate', function (e) {
                                 //Fired the keyup event
                                 $(e.currentTarget).keyup();
@@ -407,14 +407,14 @@
         alignmentSelectControlOptions: undefined,
         filterTemplate: {
             input: function (that, field, isVisible) {
-                return sprintf('<input type="text" class="form-control %s" style="width: 100%; visibility: %s">', field, isVisible);
+                return sprintf('<input type="text" class="form-control bootstrap-table-filter-control-%s" style="width: 100%; visibility: %s">', field, isVisible);
             },
             select: function (that, field, isVisible) {
-                return sprintf('<select class="%s form-control" style="width: 100%; visibility: %s" dir="%s"></select>',
+                return sprintf('<select class="form-control bootstrap-table-filter-control-%s" style="width: 100%; visibility: %s" dir="%s"></select>',
                     field, isVisible, getDirectionOfSelectOptions(that.options.alignmentSelectControlOptions));
             },
             datepicker: function (that, field, isVisible) {
-                return sprintf('<input type="text" class="date-filter-control %s form-control" style="width: 100%; visibility: %s">', field, isVisible);
+                return sprintf('<input type="text" class="form-control date-filter-control bootstrap-table-filter-control-%s" style="width: 100%; visibility: %s">', field, isVisible);
             }
         },
         //internal variables