Skip to content

Commit 79f1eea

Browse files
committed
Build: Filter filters for linting to exclude some to-be-rewritten ones. Fix lint in those remaining
1 parent a505192 commit 79f1eea

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

grunt.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,14 @@ grunt.initConfig({
261261
files: grunt.file.expandFiles( "tests/unit/**/*.html" ).filter(function( file ) {
262262
// disabling everything that doesn't (quite) work with PhantomJS for now
263263
// except for all|index|test, try to include more as we go
264-
return !( /(all|index|test|draggable|droppable|selectable|resizable|sortable|dialog|slider|datepicker|tabs|tabs_deprecated)\.html/ ).test( file );
264+
return !( /(all|all-active|index|test|draggable|droppable|selectable|resizable|sortable|dialog|slider|datepicker|tabs|tabs_deprecated)\.html/ ).test( file );
265265
})
266266
},
267267
lint: {
268-
ui: "ui/*",
268+
ui: grunt.file.expandFiles( "ui/*.js" ).filter(function( file ) {
269+
// remove items from this list once rewritten
270+
return !( /(effects.core|mouse|datepicker|draggable|droppable|resizable|selectable|sortable)\.js$/ ).test( file );
271+
}),
269272
grunt: "grunt.js",
270273
tests: "tests/unit/**/*.js"
271274
},

ui/jquery.ui.autocomplete.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ $.widget( "ui.autocomplete", {
107107
// which causes forms to submit
108108
suppressKeyPress = true;
109109
event.preventDefault();
110+
self.menu.select( event );
110111
}
111-
//passthrough - ENTER and TAB both select the current element
112+
break;
112113
case keyCode.TAB:
113-
if ( !self.menu.active ) {
114-
return;
114+
if ( self.menu.active ) {
115+
self.menu.select( event );
115116
}
116-
self.menu.select( event );
117117
break;
118118
case keyCode.ESCAPE:
119119
if ( self.menu.element.is(":visible") ) {
@@ -524,7 +524,7 @@ $.widget( "ui.autocomplete", {
524524

525525
$.extend( $.ui.autocomplete, {
526526
escapeRegex: function( value ) {
527-
return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
527+
return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
528528
},
529529
filter: function(array, term) {
530530
var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );

ui/jquery.ui.menu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ $.widget( "ui.menu", {
189189
character = prev + character;
190190
}
191191
function escape( value ) {
192-
return value.replace( /[-[\]{}()*+?.,\\^$|#\s]/g , "\\$&" );
192+
return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
193193
}
194194
match = this.activeMenu.children( ".ui-menu-item" ).filter( function() {
195195
return new RegExp("^" + escape(character), "i")

ui/jquery.ui.position.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $.ui = $.ui || {};
1313

1414
var rhorizontal = /left|center|right/,
1515
rvertical = /top|center|bottom/,
16-
roffset = /[+-]\d+%?/,
16+
roffset = /[\+\-]\d+%?/,
1717
rposition = /^\w+/,
1818
rpercent = /%$/,
1919
center = "center",

ui/jquery.ui.tabs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ $.widget( "ui.tabs", {
162162
},
163163

164164
_sanitizeSelector: function( hash ) {
165-
return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@[\]^`{|}~]/g, "\\$&" ) : "";
165+
return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
166166
},
167167

168168
refresh: function() {
@@ -841,7 +841,7 @@ if ( $.uiBackCompat !== false ) {
841841

842842
_tabId: function( a ) {
843843
return $( a ).attr( "aria-controls" ) ||
844-
a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF-]/g, "" ) ||
844+
a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF\-]/g, "" ) ||
845845
this.options.idPrefix + getNextTabId();
846846
}
847847
});

0 commit comments

Comments
 (0)