Merge branch 'master' into gh-pages

.gitattributes

@@ -21,3 +21,29 @@
 *.rtf  diff=astextplain
 *.RTF  diff=astextplain
 *.md   diss=astextplain
+
+# Exclude from export
+/.git                   export-ignore
+/addons                 export-ignore
+/beta-testing           export-ignore
+/css                    export-ignore
+/docs                   export-ignore
+/js                     export-ignore
+/testing                export-ignore
+.editorconfig           export-ignore
+.eslintignore           export-ignore
+.eslintrc               export-ignore
+.gitattributes          export-ignore
+.gitignore              export-ignore
+.jscsrc                 export-ignore
+.mailmap                export-ignore
+AUTHORS                 export-ignore
+bower.json              export-ignore
+composer.json           export-ignore
+CONTRIBUTING.md         export-ignore
+example.json            export-ignore
+Gruntfile.js            export-ignore
+index.html              export-ignore
+package.json            export-ignore
+tablesorter.jquery.json export-ignore
+test.html               export-ignore

README.md

@@ -9,7 +9,7 @@ tablesorter (FORK) is a jQuery plugin for turning a standard HTML table with THE
 ### [Documentation](https://mottie.github.io/tablesorter/docs/)
 
 * See the [full documentation](https://mottie.github.io/tablesorter/docs/).
-* All of the [original document pages](http://tablesorter.com/docs/) have been included.
+* All of the original documentation has been included.
 * Information from my blog post on [undocumented options](https://wowmotty.blogspot.com/2011/06/jquery-tablesorter-missing-docs.html) and lots of new demos have also been included.
 * Change log moved from included text file into the [wiki documentation](https://github.com/Mottie/tablesorter/wiki/Changes).
 

dist/js/jquery.tablesorter.combined.js

@@ -36,7 +36,7 @@
 			widthFixed       : false,      // adds colgroup to fix widths of columns
 			showProcessing   : false,      // show an indeterminate timer icon in the header when the table is sorted or filtered.
 
-			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i/> // class from cssIcon
+			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i></i> // class from cssIcon
 			onRenderTemplate : null,       // function( index, template ) { return template; }, // template is a string
 			onRenderHeader   : null,       // function( index ) {}, // nothing to return
 

dist/js/jquery.tablesorter.js

@@ -34,7 +34,7 @@
 			widthFixed       : false,      // adds colgroup to fix widths of columns
 			showProcessing   : false,      // show an indeterminate timer icon in the header when the table is sorted or filtered.
 
-			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i/> // class from cssIcon
+			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i></i> // class from cssIcon
 			onRenderTemplate : null,       // function( index, template ) { return template; }, // template is a string
 			onRenderHeader   : null,       // function( index ) {}, // nothing to return
 

docs/example-widget-align-character.html

@@ -63,7 +63,7 @@ td:nth-child(3) .ts-align-right i {
 		theme: 'blue',
 		widgets: ['zebra', 'alignChar'],
 		widgetOptions : {
-			alignChar_wrap         : '<i/>',
+			alignChar_wrap         : '<i></i>',
 			alignChar_charAttrib   : 'data-align-char',
 			alignChar_indexAttrib  : 'data-align-index',
 			alignChar_adjustAttrib : 'data-align-adjust' // percentage width adjustments

js/jquery.tablesorter.combined.js

@@ -42,7 +42,7 @@
 			widthFixed       : false,      // adds colgroup to fix widths of columns
 			showProcessing   : false,      // show an indeterminate timer icon in the header when the table is sorted or filtered.
 
-			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i/> // class from cssIcon
+			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i></i> // class from cssIcon
 			onRenderTemplate : null,       // function( index, template ) { return template; }, // template is a string
 			onRenderHeader   : null,       // function( index ) {}, // nothing to return
 

js/jquery.tablesorter.js

@@ -33,7 +33,7 @@
 			widthFixed       : false,      // adds colgroup to fix widths of columns
 			showProcessing   : false,      // show an indeterminate timer icon in the header when the table is sorted or filtered.
 
-			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i/> // class from cssIcon
+			headerTemplate   : '{content}',// header layout template (HTML ok); {content} = innerHTML, {icon} = <i></i> // class from cssIcon
 			onRenderTemplate : null,       // function( index, template ) { return template; }, // template is a string
 			onRenderHeader   : null,       // function( index ) {}, // nothing to return
 

js/widgets/widget-grouping.js

@@ -179,7 +179,7 @@
 				'" unselectable="on" ' + ( c.tabIndex ? 'tabindex="0" ' : '' ) + 'data-group-index="' +
 				data.groupIndex + '">' +
 				'<td colspan="' + c.columns + '">' +
-					( wo.group_collapsible ? '<i/>' : '' ) +
+					( wo.group_collapsible ? '<i></i>' : '' ) +
 					'<span class="group-name">' + name + '</span>' +
 					'<span class="group-count"></span>' +
 				'</td></tr>';