Browse Source

Merge pull request #1643 from SergeyOzeryaniy/develop

Fixed icons for ability customizing
文翼 10 years ago
parent
commit
3431c15b90

+ 1 - 0
.gitignore

@@ -1,4 +1,5 @@
 node_modules
 node_modules
+bower_components
 
 
 # docs site
 # docs site
 _gh_pages
 _gh_pages

+ 3 - 0
src/extensions/export/README.md

@@ -33,3 +33,6 @@ Use Plugin: [tableExport.jquery.plugin](https://github.com/hhurz/tableExport.jqu
 * type: Object
 * type: Object
 * description: export [options](https://github.com/hhurz/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
 * description: export [options](https://github.com/hhurz/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
 * default: `{}`
 * default: `{}`
+
+### Icons
+* export: 'glyphicon-export icon-share'

+ 6 - 1
src/extensions/export/bootstrap-table-export.js

@@ -5,6 +5,7 @@
 
 
 (function ($) {
 (function ($) {
     'use strict';
     'use strict';
+    var sprintf = $.fn.bootstrapTable.utils.sprintf;
 
 
     var TYPE_NAME = {
     var TYPE_NAME = {
         json: 'JSON',
         json: 'JSON',
@@ -27,6 +28,10 @@
         exportOptions: {}
         exportOptions: {}
     });
     });
 
 
+    $.extend($.fn.bootstrapTable.defaults.icons, {
+        export: 'glyphicon-export icon-share'
+    });
+
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
         _initToolbar = BootstrapTable.prototype.initToolbar;
         _initToolbar = BootstrapTable.prototype.initToolbar;
 
 
@@ -45,7 +50,7 @@
                     '<div class="export btn-group">',
                     '<div class="export btn-group">',
                         '<button class="btn btn-default dropdown-toggle" ' +
                         '<button class="btn btn-default dropdown-toggle" ' +
                             'data-toggle="dropdown" type="button">',
                             'data-toggle="dropdown" type="button">',
-                            '<i class="glyphicon glyphicon-export icon-share"></i> ',
+                            sprintf('<i class="%s %s"></i> ', this.options.iconsPrefix, this.options.icons.export),
                             '<span class="caret"></span>',
                             '<span class="caret"></span>',
                         '</button>',
                         '</button>',
                         '<ul class="dropdown-menu" role="menu">',
                         '<ul class="dropdown-menu" role="menu">',

+ 3 - 0
src/extensions/filter-control/README.md

@@ -42,6 +42,9 @@ Dependence if you use the datepicker option: [bootstrap-datepicker](https://gith
 * description: Set to true if you want to use the strict search mode.
 * description: Set to true if you want to use the strict search mode.
 * default: `false`
 * default: `false`
 
 
+### Icons
+* clear: 'glyphicon-trash icon-clear'
+
 ## Events
 ## Events
 
 
 ### onColumnSearch(column-search.bs.table)
 ### onColumnSearch(column-search.bs.table)

+ 4 - 1
src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -9,6 +9,9 @@
     'use strict';
     'use strict';
 
 
     var sprintf = $.fn.bootstrapTable.utils.sprintf;
     var sprintf = $.fn.bootstrapTable.utils.sprintf;
+    $.extend($.fn.bootstrapTable.defaults.icons, {
+        clear: 'glyphicon-trash icon-clear'
+    });
 
 
     var addOptionToSelectControl = function (selectControl, value, text) {
     var addOptionToSelectControl = function (selectControl, value, text) {
         selectControl = $(selectControl.get(selectControl.length - 1));
         selectControl = $(selectControl.get(selectControl.length - 1));
@@ -304,7 +307,7 @@
               $btnClear = $([
               $btnClear = $([
                     '<button class="btn btn-default " ' +
                     '<button class="btn btn-default " ' +
                         'type="button">',
                         'type="button">',
-                    '<i class="glyphicon glyphicon-trash icon-share"></i> ',
+                    sprintf('<i class="%s %s"></i> ', this.options.iconsPrefix, this.options.icons.clear),
                     '</button>',
                     '</button>',
                     '</ul>'].join('')).appendTo($btnGroup);
                     '</ul>'].join('')).appendTo($btnGroup);