Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor filter search from input[text] to input[search] #160

Merged
merged 7 commits into from Mar 4, 2013
Merged

Refactor filter search from input[text] to input[search] #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4577a52
replace input[text] with HTML5 input[search]
Feb 28, 2013
9b003e6
replace input[text] with HTML5 input[search]
Feb 28, 2013
b0a25eb
Merge branch 'master' of https://github.com/zeitiger/DataTables
Feb 28, 2013
8efdd92
Merge branch 'master' of https://github.com/zeitiger/DataTables
Feb 28, 2013
00568d0
Merge branch 'master' of https://github.com/zeitiger/DataTables
Mar 4, 2013
c2dd657
remove hacking
Mar 4, 2013
5abeb77
Merge branch 'master' of https://github.com/zeitiger/DataTables
Mar 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 13 additions & 13 deletions media/js/jquery.dataTables.js
View file
Open in desktop
Expand Up @@ -2134,40 +2134,40 @@
function _fnFeatureHtmlFilter ( oSettings )
{
var oPreviousSearch = oSettings.oPreviousSearch;

var sSearchStr = oSettings.oLanguage.sSearch;
sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ?
sSearchStr.replace('_INPUT_', '<input type="text" />') :
sSearchStr==="" ? '<input type="text" />' : sSearchStr+' <input type="text" />';
sSearchStr.replace('_INPUT_', '<input type="search" />') :
sSearchStr==="" ? '<input type="search" />' : sSearchStr+' <input type="search" />';

var nFilter = document.createElement( 'div' );
nFilter.className = oSettings.oClasses.sFilter;
nFilter.innerHTML = '<label>'+sSearchStr+'</label>';
if ( !oSettings.aanFeatures.f )
{
nFilter.id = oSettings.sTableId+'_filter';
}
var jqFilter = $('input[type="text"]', nFilter);

var jqFilter = $('input[type="search"]', nFilter);

// Store a reference to the input element, so other input elements could be
// added to the filter wrapper if needed (submit button for example)
nFilter._DT_Input = jqFilter[0];

jqFilter.val( oPreviousSearch.sSearch.replace('"','&quot;') );
jqFilter.bind( 'keyup.DT', function(e) {
jqFilter.bind( 'keyup.DT search.DT', function(e) {
/* Update all other filter input elements for the new display */
var n = oSettings.aanFeatures.f;
var val = this.value==="" ? "" : this.value; // mental IE8 fix :-(

for ( var i=0, iLen=n.length ; i<iLen ; i++ )
{
if ( n[i] != $(this).parents('div.dataTables_filter')[0] )
{
$(n[i]._DT_Input).val( val );
}
}

/* Now do the filter */
if ( val != oPreviousSearch.sSearch )
{
Expand All @@ -2179,7 +2179,7 @@
} );
}
} );

jqFilter
.attr('aria-controls', oSettings.sTableId)
.bind( 'keypress.DT', function(e) {
Expand All @@ -2190,7 +2190,7 @@
}
}
);

return nFilter;
}

Expand Down
8 changes: 4 additions & 4 deletions media/src/core/core.filter.js
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ function _fnFeatureHtmlFilter ( oSettings )

var sSearchStr = oSettings.oLanguage.sSearch;
sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ?
sSearchStr.replace('_INPUT_', '<input type="text" />') :
sSearchStr==="" ? '<input type="text" />' : sSearchStr+' <input type="text" />';
sSearchStr.replace('_INPUT_', '<input type="search" />') :
sSearchStr==="" ? '<input type="search" />' : sSearchStr+' <input type="search" />';

var nFilter = document.createElement( 'div' );
nFilter.className = oSettings.oClasses.sFilter;
Expand All @@ -22,14 +22,14 @@ function _fnFeatureHtmlFilter ( oSettings )
nFilter.id = oSettings.sTableId+'_filter';
}

var jqFilter = $('input[type="text"]', nFilter);
var jqFilter = $('input[type="search"]', nFilter);

// Store a reference to the input element, so other input elements could be
// added to the filter wrapper if needed (submit button for example)
nFilter._DT_Input = jqFilter[0];

jqFilter.val( oPreviousSearch.sSearch.replace('"','&quot;') );
jqFilter.bind( 'keyup.DT', function(e) {
jqFilter.bind( 'keyup.DT search.DT', function(e) {
/* Update all other filter input elements for the new display */
var n = oSettings.aanFeatures.f;
var val = this.value==="" ? "" : this.value; // mental IE8 fix :-(
Expand Down