Update mysql lib, tablesorter and blockUI.

codesorc · Nov 29, 2014 · 815282d · 815282d
1 parent abfd70a
commit 815282d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/freeciv-web/pom.xml b/freeciv-web/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
-           <version>5.1.33</version>
+           <version>5.1.34</version>
         </dependency>
 
 

diff --git a/freeciv-web/src/main/webapp/css/theme.dark.css b/freeciv-web/src/main/webapp/css/theme.dark.css
@@ -83,10 +83,10 @@
 }
 
 /* Zebra Widget - row alternating colors */
-.tablesorter-dark tr.odd td {
+.tablesorter-dark tr.odd > td {
 	background-color: #202020;
 }
-.tablesorter-dark tr.even td {
+.tablesorter-dark tr.even > td {
 	background-color: #101010;
 }
 
@@ -146,7 +146,7 @@ caption {
 	line-height: 0;
 	cursor: pointer;
 }
-.tablesorter-dark .tablesorter-filter-row.hideme .tablesorter-filter {
+.tablesorter-dark .tablesorter-filter-row.hideme * {
 	height: 1px;
 	min-height: 0;
 	border: 0;
@@ -174,6 +174,10 @@ caption {
 	-o-transition: height 0.1s ease;
 	transition: height 0.1s ease;
 }
+/* rows hidden by filtering (needed for child rows) */
+.tablesorter .filtered {
+	display: none;
+}
 
 /* ajax error row */
 .tablesorter .tablesorter-errorRow td {

diff --git a/freeciv-web/src/main/webapp/javascript/jquery.blockUI.js b/freeciv-web/src/main/webapp/javascript/jquery.blockUI.js
@@ -1,6 +1,6 @@
 /*!
  * jQuery blockUI plugin
- * Version 2.66.0-2013.10.09
+ * Version 2.70.0-2014.11.23
  * Requires jQuery v1.7 or later
  *
  * Examples at: http://malsup.com/jquery/block/
@@ -107,7 +107,7 @@
 			});
 		};
 
-		$.blockUI.version = 2.66; // 2nd generation blocking at no extra cost!
+		$.blockUI.version = 2.70; // 2nd generation blocking at no extra cost!
 
 		// override these in your code to change the default behavior and style
 		$.blockUI.defaults = {
@@ -426,7 +426,7 @@
 				if (msg)
 					lyr3.show();
 				if (opts.onBlock)
-					opts.onBlock();
+					opts.onBlock.bind(lyr3)();
 			}
 
 			// bind key and mouse events
@@ -515,6 +515,7 @@
 			if (data && data.el) {
 				data.el.style.display = data.display;
 				data.el.style.position = data.position;
+				data.el.style.cursor = 'default'; // #59
 				if (data.parent)
 					data.parent.appendChild(data.el);
 				$el.removeData('blockUI.history');