[Piwik-svn] r199 - trunk/plugins/Home/templates

[svnmaster at piwik.org]

Author: julien
Date: 2008-01-19 20:21:46 +0100 (Sat, 19 Jan 2008)
New Revision: 199

Modified:
   trunk/plugins/Home/templates/datatable.js
Log:
Bug with search box in datatable.js

Modified: trunk/plugins/Home/templates/datatable.js
===================================================================
--- trunk/plugins/Home/templates/datatable.js	2008-01-19 18:41:25 UTC (rev 198)
+++ trunk/plugins/Home/templates/datatable.js	2008-01-19 19:21:46 UTC (rev 199)
@@ -318,7 +318,7 @@
 		{
 			$('#dataTableSearchPattern', domElem)
 				.css('display','block')
-				.each(function(){			
+				.each(function(){
 					// when enter is pressed in the input field we submit the form
 					$('#keyword', domElem).not(':submit')
 						.keypress( 
@@ -333,16 +333,18 @@
 						.val(
 							function()
 							{
-								/*var currentPattern = self.param.filter_pattern;
-								if(typeof currentPattern == "undefined" && currentPattern.length > 0)
+								var currentPattern = self.param.filter_pattern;
+								if(typeof currentPattern != "undefined"
+								&& currentPattern.length > 0)
 								{
 									return currentPattern;
 								}
-								var currentPattern = self.param.filter_pattern_recursive;
-								if(typeof currentPattern == "undefined" && currentPattern.length > 0)
+								currentPattern = self.param.filter_pattern_recursive
+								if(typeof currentPattern != "undefined"
+								&& currentPattern.length > 0)
 								{
 									return currentPattern;
-								}*/
+								}
 								return '';
 							}
 						)