升级 jquery1.7.1 到 1.9.1 ; jquery validate 1.9.0 到 1.11.0

thinkgem · Mar 2, 2013 · 4d4938a · 4d4938a
1 parent 618aafe
commit 4d4938a
Show file tree

Hide file tree

Showing 127 changed files with 31,266 additions and 9,422 deletions.
diff --git a/README.md b/README.md
@@ -33,10 +33,10 @@ JeeSite提供了常用工具进行封装，包括日志工具、缓存工具、
 
 * MVC Framework：SpringMVC 3.2。
 * Layout Decoration：SiteMesh 2.4。
-* JavaScript Library：JQuery 1.7。
+* JavaScript Library：JQuery 1.9。
 * CSS Framework：Twitter Bootstrap 2.0.4。
 * JavaScript/CSS Compressor：YUI Compressor 2.4。
-* Front Validation：JQuery Validation Plugin 1.9。
+* Front Validation：JQuery Validation Plugin 1.11。
 
 3、Database相关
 

diff --git a/doc/JeeSite介绍演示.docx b/doc/JeeSite介绍演示.docx
diff --git a/src/main/java/com/thinkgem/jeesite/common/persistence/Page.java b/src/main/java/com/thinkgem/jeesite/common/persistence/Page.java
@@ -249,7 +249,7 @@ public String toString() {
 					+ "下一页 &#187;</a></li>\n");
 		}
 
-		sb.append("<li class=\"disabled\"><a href=\"javascript:\" style=\"border:0;padding-top:1px;\">当前 ");
+		sb.append("<li class=\"disabled\"><a href=\"javascript:\" style=\"border:0;padding-top:1px;_padding-top:7px;\">当前 ");
 		sb.append("<input type=\"text\" value=\""+pageNo+"\" style=\"width:30px;padding:0;margin:0 2px 3px 2px;text-align:center;\" ");
 		sb.append("onkeypress=\"if(window.event.keyCode==13) "+funcName+"(this.value,"+pageSize+");\"/> / ");
 		sb.append("<input type=\"text\" value=\""+pageSize+"\" style=\"width:30px;padding:0;margin:0 2px 3px 2px;text-align:center;\" ");

diff --git a/src/main/webapp/WEB-INF/views/include/head.jsp b/src/main/webapp/WEB-INF/views/include/head.jsp
@@ -5,10 +5,11 @@
 <meta http-equiv="Expires" content="0" />
 <meta name="author" content="thinkgem@163.com"/>
 <meta http-equiv="X-UA-Compatible" content="IE=7,IE=9" />
-<script src="${ctxStatic}/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
-<link href="${ctxStatic}/jquery-validation/1.9.0/validate.min.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/jquery-validation/1.9.0/jquery.validate.min.js" type="text/javascript"></script>
-<script src="${ctxStatic}/jquery-validation/1.9.0/messages_cn.min.js" type="text/javascript"></script>
+<script src="${ctxStatic}/jquery/jquery-1.9.1.min.js" type="text/javascript"></script>
+<script src="${ctxStatic}/jquery/jquery-migrate-1.1.1.min.js" type="text/javascript"></script>
+<link href="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.min.css" type="text/css" rel="stylesheet" />
+<script src="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
+<script src="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.method.min.js" type="text/javascript"></script>
 <link href="${ctxStatic}/bootstrap/2.0.4/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
 <script src="${ctxStatic}/bootstrap/2.0.4/js/bootstrap.min.js" type="text/javascript"></script>
 <!--[if IE 6]><link href="${ctxStatic}/bootstrap/2.0.4/css/ie6.min.css" rel="stylesheet">

diff --git a/src/main/webapp/WEB-INF/views/modules/cms/cmsIndex.jsp b/src/main/webapp/WEB-INF/views/modules/cms/cmsIndex.jsp
@@ -16,11 +16,11 @@
 			scrolling="yes" frameborder="no" width="100%"></iframe>
 	</div>
 	<script type="text/javascript"> 
-		var lw = "14.89%", rw = "82.80%"; // 左侧窗口展开大小
-		var lwClose = "0%", rwClose = "97.30%"; // 左侧窗口折叠大小
+		var lw = "14.89%", rw = "82%"; // 左侧窗口展开大小
+		var lwClose = "0%", rwClose = "97%"; // 左侧窗口折叠大小
 		function wSize(){
 			var strs=getWindowSize().toString().split(",");
-			$("#cmsMenuFrame, #cmsMainFrame, #openClose").height(strs[0]);
+			$("#cmsMenuFrame, #cmsMainFrame, #openClose").height(strs[0]-6);
 		}
 	</script>
 	<script src="${ctxStatic}/wsize.js" type="text/javascript"></script>

diff --git a/src/main/webapp/WEB-INF/views/modules/cms/front/include/head.jsp b/src/main/webapp/WEB-INF/views/modules/cms/front/include/head.jsp
@@ -5,6 +5,7 @@
 <meta http-equiv="Expires" content="0" />
 <meta name="author" content="thinkgem@163.com"/>
 <meta http-equiv="X-UA-Compatible" content="IE=7,IE=9" />
-<script src="${ctxStatic}/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
+<script src="${ctxStatic}/jquery/jquery-1.9.1.min.js" type="text/javascript"></script>
+<script src="${ctxStatic}/jquery/jquery-migrate-1.1.1.min.js" type="text/javascript"></script>
 <script src="${ctxStaticFront}/common.min.js" type="text/javascript"></script>
 <link href="${ctxStaticTheme}/style.min.css" type="text/css" rel="stylesheet" />
diff --git a/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontComment.jsp b/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontComment.jsp
@@ -1,8 +1,8 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/views/modules/cms/front/include/taglib.jsp"%>
-<link href="${ctxStatic}/jquery-validation/1.9.0/validate.min.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/jquery-validation/1.9.0/jquery.validate.min.js" type="text/javascript"></script>
-<script src="${ctxStatic}/jquery-validation/1.9.0/messages_cn.min.js" type="text/javascript"></script>
+<link href="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.min.css" type="text/css" rel="stylesheet" />
+<script src="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
+<script src="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.method.min.js" type="text/javascript"></script>
 <style type="text/css">.reply{border:1px solid #ddd;background:#fefefe;margin:10px;}</style>
 <script type="text/javascript">
 	$(document).ready(function() {

diff --git a/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontGuestbook.jsp b/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontGuestbook.jsp
@@ -7,9 +7,9 @@
 	<meta name="decorator" content="cms_default_${site.theme}"/>
 	<meta name="description" content="JeeSite ${site.desciption}" />
 	<meta name="keywords" content="JeeSite ${site.keywords}" />
-	<link href="${ctxStatic}/jquery-validation/1.9.0/validate.min.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/jquery-validation/1.9.0/jquery.validate.min.js" type="text/javascript"></script>
-	<script src="${ctxStatic}/jquery-validation/1.9.0/messages_cn.min.js" type="text/javascript"></script>
+	<link href="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.min.css" type="text/css" rel="stylesheet" />
+	<script src="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
+	<script src="${ctxStatic}/jquery-validation/1.11.0/jquery.validate.method.min.js" type="text/javascript"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			<c:if test="${not empty message}">alert("${message}");</c:if>

diff --git a/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp b/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp
@@ -59,7 +59,8 @@
 			if(strs[0]<550){
 				$("#main").css("height",550+"px");
 			}else{
-				$("#menuFrame, #mainFrame, #openClose").height(strs[0]-$("#header").height() - $("#footer").height() - 80);  
+				$("#menuFrame, #mainFrame, #openClose").height(strs[0]-$("#header").height() - $("#footer").height() - 80);
+				$("#openClose").height($("#openClose").height()-6);
 			}
 			if(strs[1]<980){
 				$("#main").css("width",970+"px");

diff --git a/src/main/webapp/static/compressor.bat b/src/main/webapp/static/compressor.bat
@@ -10,10 +10,12 @@ call compressor\compressor.bat wsize.js
 call compressor\compressor.bat bootstrap\2.0.4\css
 call compressor\compressor.bat bootstrap\2.0.4\js
 call compressor\compressor.bat jquery
-call compressor\compressor.bat jquery-validation
+call compressor\compressor.bat jquery-jbox\2.3\i18n
+call compressor\compressor.bat jquery-validation\1.11.0\jquery.validate.css
+call compressor\compressor.bat jquery-validation\1.11.0\jquery.validate.js
+call compressor\compressor.bat jquery-validation\1.11.0\jquery.validate.method.js
 call compressor\compressor.bat mztreeview\mz*
 call compressor\compressor.bat treeTable\*treeTable*
-call compressor\compressor.bat jquery-jbox\2.3\i18n
 call compressor\compressor.bat modules
 
 echo.

diff --git a/src/main/webapp/static/jquery-validation/1.11.0/README.md b/src/main/webapp/static/jquery-validation/1.11.0/README.md
@@ -0,0 +1,41 @@
+[jQuery Validation Plugin](http://bassistance.de/jquery-plugins/jquery-plugin-validation/) - Form validation made easy
+================================
+
+[![Build Status](https://secure.travis-ci.org/jzaefferer/jquery-validation.png)](http://travis-ci.org/jzaefferer/jquery-validation)
+
+The jQuery Validation Plugin provides drop-in validation for your existing forms, while making all kinds of customizations to fit your application really easy.
+
+## [Help the project](http://pledgie.com/campaigns/18159)
+
+[![Help the project](http://www.pledgie.com/campaigns/18159.png?skin_name=chrome)](http://pledgie.com/campaigns/18159)
+
+This project is looking for help! [You can donate to the ongoing pledgie campaign](http://pledgie.com/campaigns/18159)
+and help spread the word. If you've used the plugin, or plan to use, consider a donation - any amount will help.
+
+You can find the plan for how to spend the money on the [pledgie page](http://pledgie.com/campaigns/18159).
+
+## Getting Started
+
+Include jQuery and the plugin on a page. Then select a form to validate and call the `validate` method.
+
+```html
+<form>
+	<input required>
+</form>
+<script src="jquery.js"></script>
+<script src="jquery.validation.js"></script>
+<script>
+$("form").validate();
+</script>
+```
+
+For more information on how to setup a rules and customizations, [check the documentation](http://docs.jquery.com/Plugins/Validation).
+
+## Contributing
+Follow the [jQuery style guide](http://contribute.jquery.com/style-guides/js), even if existing code doesn't. Add unit tests for any new or changed functionality. Lint and test your code using [grunt](https://github.com/gruntjs/grunt/).
+
+If you've wrote custom methods that you'd like to contribute to additional-methods.js, create a branch, add the method there and send a pull request for that branch.
+
+## License
+Copyright (c) 2013 Jörn Zaefferer
+Licensed under the MIT license.