From ef42f0dcd9805dec03a27f1aaa07dbcdba16ef64 Mon Sep 17 00:00:00 2001 From: Rob Garrison Date: Sun, 31 Jul 2016 21:08:05 -0500 Subject: [PATCH] Mark: Fix linting issues --- dist/js/widgets/widget-mark.min.js | 2 +- js/widgets/widget-mark.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/js/widgets/widget-mark.min.js b/dist/js/widgets/widget-mark.min.js index 6a1f8474..d4dcde9e 100644 --- a/dist/js/widgets/widget-mark.min.js +++ b/dist/js/widgets/widget-mark.min.js @@ -1,2 +1,2 @@ /*! Widget: mark.js - updated 7/31/2016 (v2.27.0) */ -!function(a){"use strict";var b=a.tablesorter;b.mark={init:function(c,d){if("function"==typeof a.fn.mark){var e,f=c.widgetOptions.mark_tsUpdate;c.$table.on("filterEnd.tsmark"+(f?" "+f:""),function(a,d){b.mark.update(c,"filterEnd"===a.type?"":d)}),e="(?:<|=|>|\\||\"|\\'|\\s+(?:&&|-|"+(b.language.and||"and")+"|"+(b.language.or||"or")+"|"+(b.language.to||"to")+")\\s+)",b.mark.regex.filter=new RegExp(e,"gim")}else console.warn('Widget-mark not initialized: missing "jquery.mark.js"')},regex:{mark:/^mark_(.+)$/,pure:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/},checkRegex:function(a){if(a instanceof RegExp){var b="".match(a);return null===b||b.length<5}return!1},cleanMatches:function(a){for(var b=[],c=a&&a.length||0;c--;)""!==a[c]&&(b[b.length]=a[c]);return b},update:function(c,d){var e={},f=b.mark.regex,g=c.$table.find("tbody tr").unmark().not("."+(c.widgetOptions.filter_filteredRow||"filtered")),d=d||a.tablesorter.getFilters(c.$table);a.each(d,function(a,d){if(d){var h=null,i=d,j=!1,k=a===c.columns?"":":nth-child("+(a+1)+")";if(f.pure.test(d)){i=f.pure.exec(d),".*"===i[1]&&(i[1]="");try{h=new RegExp(i[1],"gim"),i=new RegExp(i[1],i[2])}catch(a){i=null}return void(b.mark.checkRegex(h)&&g.children(k).markRegExp(i,e))}0===d.indexOf("~")?(j=!0,i=d.replace(/~/g,"").split("")):(d.indexOf("?")>-1&&(j=!0,d=d.replace(/\?/g,"\\S{1}")),d.indexOf("*")>-1&&(j=!0,d=d.replace(/\*/g,"\\S*")),i=d.split(f.filter)),j&&i&&i.length?(i=new RegExp(b.mark.cleanMatches(i).join(".*"),"gim"),b.mark.checkRegex(i)&&g.children(k).markRegExp(i,e)):g.children(k).mark(b.mark.cleanMatches(i),e)}})}},b.addWidget({id:"mark",options:{mark_tsUpdate:"markUpdate"},init:function(a,c,d,e){b.mark.init(d,e)},remove:function(a,b){var c=b.widgetOptions.mark_tsUpdate;b.$table.off("filterEnd.tsmark"+(c?" "+c:""))}})}(jQuery); \ No newline at end of file +!function(a){"use strict";var b=a.tablesorter;b.mark={init:function(c){if("function"==typeof a.fn.mark){var d,e=c.widgetOptions.mark_tsUpdate;c.$table.on("filterEnd.tsmark"+(e?" "+e:""),function(a,d){b.mark.update(c,"filterEnd"===a.type?"":d)}),d="(?:<|=|>|\\||\"|\\'|\\s+(?:&&|-|"+(b.language.and||"and")+"|"+(b.language.or||"or")+"|"+(b.language.to||"to")+")\\s+)",b.mark.regex.filter=new RegExp(d,"gim")}else console.warn('Widget-mark not initialized: missing "jquery.mark.js"')},regex:{mark:/^mark_(.+)$/,pure:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/},checkRegex:function(a){if(a instanceof RegExp){var b="".match(a);return null===b||b.length<5}return!1},cleanMatches:function(a){for(var b=[],c=a&&a.length||0;c--;)""!==a[c]&&(b[b.length]=a[c]);return b},update:function(c,d){var e={},f=b.mark.regex,g=c.$table.find("tbody tr").unmark().not("."+(c.widgetOptions.filter_filteredRow||"filtered"));d=d||a.tablesorter.getFilters(c.$table),a.each(d,function(a,d){if(d){var h=null,i=d,j=!1,k=a===c.columns?"":":nth-child("+(a+1)+")";if(f.pure.test(d)){i=f.pure.exec(d),".*"===i[1]&&(i[1]="");try{h=new RegExp(i[1],"gim"),i=new RegExp(i[1],i[2])}catch(a){i=null}return void(b.mark.checkRegex(h)&&g.children(k).markRegExp(i,e))}0===d.indexOf("~")?(j=!0,i=d.replace(/~/g,"").split("")):(d.indexOf("?")>-1&&(j=!0,d=d.replace(/\?/g,"\\S{1}")),d.indexOf("*")>-1&&(j=!0,d=d.replace(/\*/g,"\\S*")),i=d.split(f.filter)),j&&i&&i.length?(i=new RegExp(b.mark.cleanMatches(i).join(".*"),"gim"),b.mark.checkRegex(i)&&g.children(k).markRegExp(i,e)):g.children(k).mark(b.mark.cleanMatches(i),e)}})}},b.addWidget({id:"mark",options:{mark_tsUpdate:"markUpdate"},init:function(a,c,d,e){b.mark.init(d,e)},remove:function(a,b){var c=b.widgetOptions.mark_tsUpdate;b.$table.off("filterEnd.tsmark"+(c?" "+c:""))}})}(jQuery); \ No newline at end of file diff --git a/js/widgets/widget-mark.js b/js/widgets/widget-mark.js index 1411462d..d3847167 100644 --- a/js/widgets/widget-mark.js +++ b/js/widgets/widget-mark.js @@ -7,7 +7,7 @@ var ts = $.tablesorter; ts.mark = { - init : function( c, wo ) { + init : function( c ) { if ( typeof $.fn.mark === 'function' ) { var tmp, update = c.widgetOptions.mark_tsUpdate; @@ -43,7 +43,7 @@ var results = [], indx = matches && matches.length || 0; while ( indx-- ) { - if ( matches[indx] !== "" ) { + if ( matches[indx] !== '' ) { results[ results.length ] = matches[ indx ]; } } @@ -55,8 +55,8 @@ $rows = c.$table .find( 'tbody tr' ) .unmark() - .not( '.' + ( c.widgetOptions.filter_filteredRow || 'filtered' ) ), - filters = filters || $.tablesorter.getFilters( c.$table ); + .not( '.' + ( c.widgetOptions.filter_filteredRow || 'filtered' ) ); + filters = filters || $.tablesorter.getFilters( c.$table ); // extract & save mark options from widgetOptions (prefixed with "mark_") // update dynamically $.each( filters, function( indx, filter ) { @@ -121,7 +121,7 @@ ts.addWidget({ id: 'mark', options: { - mark_tsUpdate : "markUpdate" + mark_tsUpdate : 'markUpdate' }, init : function( table, thisWidget, c, wo ) { ts.mark.init( c, wo );