<@netCommon.commonHeader />
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
index 4d82663e..b7f9714c 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/index.ftl
@@ -9,7 +9,7 @@
<@netCommon.commonHeader />
diff --git a/xxl-job-admin/src/main/webapp/static/js/common.1.js b/xxl-job-admin/src/main/webapp/static/js/common.1.js
index d7e4c6f3..05af6ddd 100644
--- a/xxl-job-admin/src/main/webapp/static/js/common.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/common.1.js
@@ -1,6 +1,6 @@
$(function(){
- // 导航栏,选中样式处理
+ // 导航栏,选中样式处理,js遍历匹配url(遗弃)
$(".nav-click").removeClass("active");
$(".nav-click").each(function(){
if( window.location.href.indexOf( $(this).find("a").attr("href") ) > -1){
@@ -30,9 +30,9 @@ $(function(){
});
});
- // adminlte_settings
+ // 左侧菜单状态,js + 后端 + cookie方式(新)
$('.sidebar-toggle').click(function(){
- var adminlte_settings = $.cookie('adminlte_settings');
+ var adminlte_settings = $.cookie('adminlte_settings'); // 左侧菜单展开状态[adminlte_settings]:on=展开,off=折叠
if ('off' == adminlte_settings) {
adminlte_settings = 'on';
} else {
@@ -40,8 +40,12 @@ $(function(){
}
$.cookie('adminlte_settings', adminlte_settings, { expires: 7 }); //$.cookie('the_cookie', '', { expires: -1 });
});
+ // 左侧菜单状态,js + cookie方式(遗弃)
+ /*
var adminlte_settings = $.cookie('adminlte_settings');
if (adminlte_settings == 'off') {
$('body').addClass('sidebar-collapse');
}
+ */
+
});
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
index 697366cf..e6479455 100644
--- a/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/jobcode.index.1.js
@@ -8,17 +8,20 @@ $(function() {
});
codeEditor.setValue( $("#demoCode").val() );
+ var height = Math.max(document.documentElement.clientHeight, document.body.offsetHeight);
+ $(".CodeMirror").attr('style', 'height:'+ height +'px');
+
$("#save").click(function() {
var codeSource = codeEditor.getValue();
var codeRemark = $("#codeRemark").val();
if (!codeRemark) {
- ComAlert.show(1, "请输入备注");
+ ComAlert.show(2, "请输入备注");
return;
}
if (codeRemark.length < 6|| codeRemark.length > 100) {
- ComAlert.show(1, "备注长度应该在6至100之间");
+ ComAlert.show(2, "备注长度应该在6至100之间");
return;
}
@@ -34,7 +37,7 @@ $(function() {
dataType : "json",
success : function(data){
if (data.code == 200) {
- ComAlert.show(1, '提交成功', function(){
+ ComAlert.show(1, '保存成功', function(){
//$(window).unbind('beforeunload');
window.location.reload();
});
diff --git a/xxl-job-client-demo/pom.xml b/xxl-job-client-demo/pom.xml
index 18443946..14f153d6 100644
--- a/xxl-job-client-demo/pom.xml
+++ b/xxl-job-client-demo/pom.xml
@@ -4,10 +4,10 @@
com.xxl
xxl-job
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
xxl-job-client-demo
-
1.2.1-SNAPSHOT
+
1.3.1-SNAPSHOT
war
@@ -55,7 +55,7 @@
com.xxl
xxl-job-client
- 1.2.1-SNAPSHOT
+ 1.3.1
diff --git a/xxl-job-client/pom.xml b/xxl-job-client/pom.xml
index 6e2e92c2..2315cb2d 100644
--- a/xxl-job-client/pom.xml
+++ b/xxl-job-client/pom.xml
@@ -4,10 +4,10 @@
com.xxl
xxl-job
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
xxl-job-client
- 1.2.1-SNAPSHOT
+ 1.3.1