Merge pull request DataTables#97 from timtucker/patch-13

Update media/src/core/core.info.js
bmac · Sep 4, 2012 · 30f936d · 30f936d
2 parents 6d11218 + af5c3d8
commit 30f936d
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/media/src/core/core.info.js b/media/src/core/core.info.js
@@ -49,25 +49,20 @@ function _fnUpdateInfo ( oSettings )
 		iTotal = oSettings.fnRecordsDisplay(),
 		sOut;
 
-	if ( iTotal === 0 && iTotal == iMax )
+	if ( iTotal === 0 )
 	{
 		/* Empty record set */
 		sOut = oLang.sInfoEmpty;
 	}
-	else if ( iTotal === 0 )
-	{
-		/* Empty record set after filtering */
-		sOut = oLang.sInfoEmpty +' '+ oLang.sInfoFiltered;
-	}
-	else if ( iTotal == iMax )
-	{
+	else {
 		/* Normal record set */
 		sOut = oLang.sInfo;
 	}
-	else
+
+	if ( iTotal != iMax )
 	{
 		/* Record set after filtering */
-		sOut = oLang.sInfo +' '+ oLang.sInfoFiltered;
+		sOut += ' ' + oLang.sInfoFiltered;
 	}
 
 	// Convert the macros