Merge pull request #92 from wenzhixin/develop

Develop

.gitignore

@@ -1,8 +1,12 @@
 node_modules
+bower_components
 
 # docs site
 _gh_pages
 
+# build the extensions
+extensions.js
+
 # deploy the docs
 deploy.sh
 

CONTRIBUTING.md

@@ -1,6 +1,8 @@
 # Contributing to Bootstrap Table
 
-Looking to contribute something to Bootstrap Table? **Here's how you can help.**
+Looking to contribute something to Bootstrap Table? 
+
+**Here's how you can help.**
 
 Please take a moment to review this document in order to make the contribution
 process easy and effective for everyone involved.
@@ -67,11 +69,12 @@ Guidelines for bug reports:
 2. **Check if the issue has been fixed** — try to reproduce it using the
    latest `master` or development branch in the repository.
 
-3. **Isolate the problem** — ideally create a live example.
-   [This jsfiddle](http://jsfiddle.net/) is a helpful tools. Consider to use these templates:
+3. **Isolate the problem** — ideally create a live example. 
+    The web tool [jsfiddle](http://jsfiddle.net/) is a very helpful for this. Consider to use these templates:
     * [Table from html](http://jsfiddle.net/wenyi/e3nk137y/11/light/)
     * [Table from data](http://jsfiddle.net/wenyi/e3nk137y/13/light/)
     * [Table from url](http://jsfiddle.net/wenyi/e3nk137y/14/light/)
+    * Other templates can also be found at [jsFiddle Bootstrap](http://bootstrap-table.wenzhixin.net.cn/examples/#basic)
 
 
 A good bug report shouldn't leave others needing to chase you up for more

README.md

@@ -7,7 +7,12 @@
 
 An extended Bootstrap table with radio, checkbox, sort, pagination, extensions and other added features.
 
-To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples), [Example issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aexample+is%3Aclosed), [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed) and [Questions / Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)!
+To get started, check out:
+
+* [Docs](http://bootstrap-table.wenzhixin.net.cn)
+* [Examples](https://github.com/wenzhixin/bootstrap-table-examples)
+* [Questions/Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)
+* [问题/帮助](http://segmentfault.com/t/bootstrap-table)
 
 
 [**List of donators**](https://github.com/wenzhixin/bootstrap-table/blob/master/DONATORS.md)
@@ -58,16 +63,27 @@ npm install bootstrap-table
 
 You can source bootstrap-table directly from a CDN like [CDNJS](http://www.cdnjs.com/libraries/bootstrap-table) or [bootcss](http://open.bootcss.com/bootstrap-table/) or [jsdelivr](http://www.jsdelivr.com/#!bootstrap.table).
 
-## Reporting issues
 
-Please provide jsFiddle when creating issues!
+## Contributing
+
+For feature requests, bug reports or submitting pull requests, please ensure you first read [CONTRIBUTING.md](https://github.com/wenzhixin/bootstrap-table/blob/master/CONTRIBUTING.md).
+
+
+## Reporting Issues
 
-It's really saves much time. Use this as template:
+As stated above, please read [CONTRIBUTING.md](https://github.com/wenzhixin/bootstrap-table/blob/master/CONTRIBUTING.md), especially [Bug Reports](https://github.com/wenzhixin/bootstrap-table/blob/master/CONTRIBUTING.md#bug-reports)
+
+And as stated there, please provide jsFiddle when creating issues!
+
+It's really saves much time.
+
+You can also use these for templates:
 
 [jsFiddle Bootstrap Table](http://bootstrap-table.wenzhixin.net.cn/examples/#basic)
 
 Your feedback is very appreciated!
 
+
 ## Acknowledgements
 
 Thanks to everyone who have given feedback and submitted pull requests. A list of all the contributors can be found [here](https://github.com/wenzhixin/bootstrap-table/graphs/contributors).

docs/_i18n/en.yml

@@ -26,4 +26,5 @@ pages:
     lead: "If you like Bootstrap Table, if your project uses Bootstrap Table, if you want Bootstrap Table do better..."
 common:
   social_tip: "If you like bootstrap table: "
+  help: "Questions/Helps: "
   qq_group: "QQ group: "

docs/_i18n/es.yml

@@ -26,4 +26,5 @@ pages:
     lead: "If you like Bootstrap Table, if your project uses Bootstrap Table, if you want Bootstrap Table do better..."
 common:
   social_tip: "If you like bootstrap table: "
+  help: "Questions/Helps: "
   qq_group: "QQ group: "

docs/_i18n/zh-cn.yml

@@ -26,4 +26,5 @@ pages:
     lead: "假如你喜欢 Bootstrap Table，假如你的项目使用到 Bootstrap Table，假如你想让 Bootstrap Table 更好……"
 common:
   social_tip: "假如您喜欢 Bootstrap Table："
+  help: "问题/帮助："
   qq_group: "QQ群："

docs/_includes/nav.html

@@ -31,9 +31,6 @@
                     <a href="{{ site.baseurl }}/faq/">{% t pages.faq.title %}</a>
                 </li>
                 <li>
-                    <a href="http://stackoverflow.com/questions/tagged/bootstrap-table" target="_blank">Questions / Helps</a>
-                </li>
-                <li>
                     <a href="{{ site.repo }}" target="_blank">GitHub</a>
                 </li>
             </ul>

docs/_includes/social-buttons.html

@@ -15,16 +15,25 @@
             <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=wenzhixin&type=follow&count=true"
                     width="175" height="20" title="Follow on GitHub"></iframe>
         </li>
-        <li>
+        <!--<li>-->
             <!-- https://about.twitter.com/resources/buttons#tweet -->
-            <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://wenzhixin.net.cn/p/bootstrap-table" data-via="BootstrapTable" data-related="BootstrapTable">Tweet</a>
-        </li>
+            <!--<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://wenzhixin.net.cn/p/bootstrap-table" data-via="BootstrapTable" data-related="BootstrapTable">Tweet</a>-->
+        <!--</li>-->
+        <!--<li>-->
+             <!--将此标记放置在你希望显示+1 按钮的位置。 -->
+            <!--<div class="g-plusone" data-annotation="inline" data-width="120"></div>-->
+        <!--</li>-->
+        <!--<li>-->
+            <!--<div>{% t common.qq_group %} 103558783</div>-->
+        <!--</li>-->
+    </ul>
+    {% t common.help %}
+    <ul class="bs-docs-social-buttons">
         <li>
-            <!-- 将此标记放置在你希望显示+1 按钮的位置。 -->
-            <div class="g-plusone" data-annotation="inline" data-width="120"></div>
+            <a class="help-btn" href="http://stackoverflow.com/questions/tagged/bootstrap-table">StackOverflow</a>
         </li>
         <li>
-            <div>{% t common.qq_group %} 103558783</div>
+            <a class="help-btn" href="http://segmentfault.com/t/bootstrap-table">SegmentFault</a>
         </li>
     </ul>
 </div>

docs/assets/css/style.css

@@ -23,4 +23,28 @@
 }
 .tc img {
     max-width: 100%;
+}
+.help-btn {
+    background-color: #eee;
+    background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0,#fcfcfc),color-stop(100%,#eee));
+    background-image: -webkit-linear-gradient(top,#fcfcfc 0,#eee 100%);
+    background-image: -moz-linear-gradient(top,#fcfcfc 0,#eee 100%);
+    background-image: -ms-linear-gradient(top,#fcfcfc 0,#eee 100%);
+    background-image: -o-linear-gradient(top,#fcfcfc 0,#eee 100%);
+    background-image: linear-gradient(to bottom,#fcfcfc 0,#eee 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#eeeeee', GradientType=0);
+    background-repeat: no-repeat;
+    border: 1px solid #d5d5d5;
+    padding: 2px 5px 2px 4px;
+    color: #333;
+    text-decoration: none;
+    text-shadow: 0 1px 0 #fff;
+    white-space: nowrap;
+    cursor: pointer;
+    border-radius: 3px;
+    font-weight: bold;
+    font-size: 12px;
+}
+.github-btn, .help-btn {
+    vertical-align: bottom;
 }

docs/data/extensions.json

@@ -1,51 +1,53 @@
 [
-  {
-    "name": "Table Editable",
-    "version": "1.1.0",
-    "description": "Use the x-editable to editable your table.",
-    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/editable",
-    "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/editable.html",
-
-    "plugins": [{
-      "name": "x-editable",
-      "url": "https://github.com/vitalets/x-editable"
-    }],
-
-    "author": {
-      "name": "wenzhixin",
-      "image": "https://avatars1.githubusercontent.com/u/2117018"
+    {
+        "name": "Table Editable",
+        "version": "1.1.0",
+        "description": "Use the x-editable to in-place editing your table.",
+        "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/editable",
+        "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/editable.html",
+        "plugins": [
+            {
+                "name": "x-editable",
+                "url": "https://github.com/vitalets/x-editable"
+            }
+        ],
+        "author": {
+            "name": "wenzhixin",
+            "image": "https://avatars1.githubusercontent.com/u/2117018"
+        }
+    },
+    {
+        "name": "Table Export",
+        "version": "1.1.0",
+        "description": "Export your table data to JSON, XML, CSV, TXT, SQL, Word, Excel, PNG, PDF.",
+        "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/export",
+        "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/export.html",
+        "plugins": [
+            {
+                "name": "tableExport.jquery.plugin",
+                "url": "https://github.com/hhurz/tableExport.jquery.plugin"
+            }
+        ],
+        "author": {
+            "name": "wenzhixin",
+            "image": "https://avatars1.githubusercontent.com/u/2117018"
+        }
+    },
+    {
+        "name": "Flat JSON",
+        "version": "1.3.0",
+        "description": "Plugin to flat the JSON object.",
+        "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/flat-json",
+        "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/flat-json.html",
+        "plugins": [
+            {
+                "name": "bootstrap-table-flat-json",
+                "url": "https://github.com/djhvscf/bootstrap-table-flat-json"
+            }
+        ],
+        "author": {
+            "name": "djhvscf",
+            "image": "https://avatars1.githubusercontent.com/u/4496763"
+        }
     }
-  }, {
-    "name": "Table Export",
-    "version": "1.1.0",
-    "description": "Export your table data to JSON, XML, CSV, TXT, SQL, Word, Excel, PNG, PDF.",
-    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/export",
-    "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/export.html",
-
-    "plugins": [{
-      "name": "tableExport.jquery.plugin",
-      "url": "https://github.com/hhurz/tableExport.jquery.plugin"
-    }],
-
-    "author": {
-      "name": "wenzhixin",
-      "image": "https://avatars1.githubusercontent.com/u/2117018"
-    }
-  }, {
-    "name": "Flat JSON",
-    "version": "1.3.0",
-    "description": "Plugin to flat the JSON object.",
-    "url": "https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions/flat-json",
-    "example": "http://issues.wenzhixin.net.cn/bootstrap-table/#extensions/flat-json.html",
-
-    "plugins": [{
-      "name": "bootstrap-table-flat-json",
-      "url": "https://github.com/djhvscf/bootstrap-table-flat-json"
-    }],
-
-    "author": {
-      "name": "djhvscf",
-      "image": "https://avatars1.githubusercontent.com/u/4496763"
-    }
-  }
 ]

src/bootstrap-table.js

@@ -619,7 +619,7 @@
         });
 
         // if options.data is setting, do not process tbody data
-        if (this.options.data.length) {
+        if (this.options.data) {
             return;
         }
 
@@ -790,8 +790,7 @@
         }
 
         this.$selectAll = this.$header.find('[name="btSelectAll"]');
-        this.$container.off('click', '[name="btSelectAll"]')
-            .on('click', '[name="btSelectAll"]', function () {
+        this.$selectAll.off('click').on('click', function () {
                 var checked = $(this).prop('checked');
                 that[checked ? 'checkAll' : 'uncheckAll']();
                 that.updateSelected();

src/extensions/export/README.md

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

src/extensions/export/bootstrap-table-export.js

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

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.
 * default: `false`
 
+### Icons
+* clear: 'glyphicon-trash icon-clear'
+
 ## Events
 
 ### onColumnSearch(column-search.bs.table)

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

@@ -9,6 +9,9 @@
     'use strict';
 
     var sprintf = $.fn.bootstrapTable.utils.sprintf;
+    $.extend($.fn.bootstrapTable.defaults.icons, {
+        clear: 'glyphicon-trash icon-clear'
+    });
 
     var addOptionToSelectControl = function (selectControl, value, text) {
         selectControl = $(selectControl.get(selectControl.length - 1));
@@ -134,7 +137,7 @@
                         break;
                     case 'select':
                         html.push(sprintf('<select class="%s form-control" style="width: 100%; visibility: %s"></select>',
-                            column.field, isVisible))
+                            column.field, isVisible));
                         break;
                     case 'datepicker':
                         html.push(sprintf('<input type="text" class="date-filter-control %s form-control" style="width: 100%; visibility: %s">',
@@ -258,7 +261,7 @@
         _initSearch = BootstrapTable.prototype.initSearch;
 
     BootstrapTable.prototype.init = function () {
-        //Make sure that the filtercontrol option is set
+        //Make sure that the filterControl option is set
         if (this.options.filterControl) {
             var that = this;
             //Make sure that the internal variables are set correctly
@@ -282,7 +285,7 @@
                 if (that.options.height) {
                     fixHeaderCSS(that);
                 }
-            }).on('column-switch.bs.table', function(field, checked) {
+            }).on('column-switch.bs.table', function() {
                 setValues(that);
             });
         }
@@ -304,7 +307,7 @@
               $btnClear = $([
                     '<button class="btn btn-default " ' +
                         'type="button">',
-                    '<i class="glyphicon glyphicon-trash icon-share"></i> ',
+                    sprintf('<i class="%s %s"></i> ', this.options.iconsPrefix, this.options.icons.clear),
                     '</button>',
                     '</ul>'].join('')).appendTo($btnGroup);
 

src/extensions/natural-sorting/README.md

@@ -8,6 +8,20 @@ Use Plugin: [bootstrap-table-natural-sorting](https://github.com/wenzhixin/boots
 <script src="extensions/natural-sorting/bootstrap-table-natural-sorting.js"></script>
 ```
 
-### Options
+add a data-sorter atribute to any th. 
+*e.g.* ``` <th data-sortable="true" data-sorter="alphanum">Price</th>```
+
+## Options
+
+### alphanum
+* sort alpha or numeric content naturally.
+* This can be used in columns that contain text or numeric content. 
+* Numbers will be sorted as expected and not in ASCII order 
+
+### numericOnly
+* extract numeric content and sort numerically.  
+* This can be used in columns that contain formated numeric content. 
+*  *e.g.* $ and , will be removed, then Numbers will be sorted as expected
+* an alpha sort crrently sorts these as ASCII so you get $1, $100, $2, $20
+  instead of $1, $2, $20, $100.
 
-* Just add data-sorter="alphanum" to any th

src/extensions/natural-sorting/bootstrap-table-natural-sorting.js

@@ -2,10 +2,11 @@
  * @author: Brian Huisman
  * @webSite: http://www.greywyvern.com
  * @version: v1.0.0
- * JS function to allow natural sorting on bootstrap-table columns
- * just add data-sorter="alphanum" to any th
+ * JS functions to allow natural sorting on bootstrap-table columns
+ * add data-sorter="alphanum" or data-sorter="numericOnly" to any th
  *
  * @update Dennis Hernández <http://djhvscf.github.io/Blog>
+ * @update Duane May
  */
 
 function alphanum(a, b) {
@@ -44,4 +45,13 @@ function alphanum(a, b) {
     }
   }
   return aa.length - bb.length;
+}
+
+function numericOnly(a, b) {
+    function stripNonNumber(s) {
+        s = s.replace(new RegExp(/[^0-9]/g), "");
+        return parseInt(s, 10);
+    }
+
+    return stripNonNumber(a) - stripNonNumber(b);
 }

src/locale/bootstrap-table-ca-ES.js

@@ -1,13 +1,14 @@
 /**
  * Bootstrap Table Catalan translation
- * Author: Marc Pina<iwalkalone69@gmail.com>
+ * Authors: Marc Pina<iwalkalone69@gmail.com>
+ *          Claudi Martinez<claudix.kernel@gmail.com>
  */
 (function ($) {
     'use strict';
 
     $.fn.bootstrapTable.locales['ca-ES'] = {
         formatLoadingMessage: function () {
-            return 'Si us plau esperi...';
+            return 'Espereu, si us plau...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' resultats per pàgina';
@@ -16,19 +17,19 @@
             return 'Mostrant de ' + pageFrom + ' fins ' + pageTo + ' - total ' + totalRows + ' resultats';
         },
         formatSearch: function () {
-            return 'Buscar';
+            return 'Cerca';
         },
         formatNoMatches: function () {
             return 'No s\'han trobat resultats';
         },
         formatPaginationSwitch: function () {
-            return 'Amagar/Mostrar paginació';
+            return 'Amaga/Mostra paginació';
         },
         formatRefresh: function () {
-            return 'Refrescar';
+            return 'Refresca';
         },
         formatToggle: function () {
-            return 'Amagar/Mostrar';
+            return 'Alterna formatació';
         },
         formatColumns: function () {
             return 'Columnes';

src/locale/bootstrap-table-en-US.js

@@ -10,7 +10,7 @@
             return 'Loading, please wait...';
         },
         formatRecordsPerPage: function (pageNumber) {
-            return pageNumber + ' records per page';
+            return pageNumber + ' rows per page';
         },
         formatShowingRows: function (pageFrom, pageTo, totalRows) {
             return 'Showing ' + pageFrom + ' to ' + pageTo + ' of ' + totalRows + ' rows';
@@ -40,4 +40,4 @@
 
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['en-US']);
 
-})(jQuery);
+})(jQuery);

src/locale/bootstrap-table-en-US.js.template

@@ -10,7 +10,7 @@
             return 'Loading, please wait...';
         },
         formatRecordsPerPage: function (pageNumber) {
-            return pageNumber + ' records per page';
+            return pageNumber + ' rows per page';
         },
         formatShowingRows: function (pageFrom, pageTo, totalRows) {
             return 'Showing ' + pageFrom + ' to ' + pageTo + ' of ' + totalRows + ' rows';

src/locale/bootstrap-table-nl-NL.js

@@ -10,7 +10,7 @@
             return 'Laden, even geduld...';
         },
         formatRecordsPerPage: function (pageNumber) {
-            return pageNumber + ' records per pagina';
+            return pageNumber + ' rows per pagina';
         },
         formatShowingRows: function (pageFrom, pageTo, totalRows) {
             return 'Toon ' + pageFrom + ' tot ' + pageTo + ' van ' + totalRows + ' records';