Index: branches/5.1.x/.htaccess
===================================================================
diff -u -N -r13750 -r14128
--- branches/5.1.x/.htaccess	(.../.htaccess)	(revision 13750)
+++ branches/5.1.x/.htaccess	(.../.htaccess)	(revision 14128)
@@ -6,6 +6,15 @@
   deny from all
 </Files>
 
+<IfModule mod_expires.c>
+	ExpiresActive on
+	ExpiresByType text/css "access plus 4 hours"
+	ExpiresByType application/x-javascript "access plus 4 hours"
+	ExpiresByType image/gif "access plus 4 hours"
+	ExpiresByType image/jpeg "access plus 4 hours"
+	ExpiresByType image/png "access plus 4 hours"
+</IfModule>
+
 ## Enable mod-rewrite
 RewriteEngine On
 
Index: branches/5.1.x/core/admin_templates/js/grid.js
===================================================================
diff -u -N -r13545 -r14128
--- branches/5.1.x/core/admin_templates/js/grid.js	(.../grid.js)	(revision 13545)
+++ branches/5.1.x/core/admin_templates/js/grid.js	(.../grid.js)	(revision 14128)
@@ -481,21 +481,7 @@
 	this.CheckDependencies('Grid.SetDependantToolbarButtons');
 }
 
-Grid.prototype.CheckDependencies = function($called_from, $run_now) {
-	if (!$run_now || $run_now === undefined) {
-		// schedule run via document.ready, so we manage to disable
-		// toolbar buttons after ToolBar class mass-enables them
-		var $me = this;
-
-		$(document).ready(
-			function () {
-				$me.CheckDependencies($called_from, true);
-			}
-		);
-
-		return ;
-	}
-
+Grid.prototype.CheckDependencies = function($called_from) {
 	var enabling = (this.CountSelected() > 0);
 
 	for (var i = 0; i < this.DependantButtons.length; i++) {