Skip to content

C
check
Commit df5d8bd6 by Takumi Imai
Options

Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' 

Feature/1.0 check web dev kdh 2

See merge request !69
parents 50a80364 734633c5
Showing with 9 additions and 14 deletions
abweb/common/js/common.js
...@@ -58,12 +58,10 @@ COMMON.avwScreenMove = function (url) { ...@@ -58,12 +58,10 @@ COMMON.avwScreenMove = function (url) {
* @param {String} key * @param {String} key
*/ */
COMMON.showLoading = function () { COMMON.showLoading = function () {
// $(window).resize(function() {
$('#loader').css( { $('#loader').css( {
'width': $(window).width(), 'width': $(window).width(),
'height': $(window).height() 'height': $(window).height()
}); });
// });
document.getElementById('loader').style.display = 'block'; document.getElementById('loader').style.display = 'block';
}; };
......
abweb/common/json/lang/lang-ja.json
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"txtLastLoginTime":"最終ログイン時間:", "txtLastLoginTime":"最終ログイン時間:",
"msgPwdEmpty":"パスワードを入力してください", "msgPwdEmpty":"パスワードを入力してください",
"msgPwdOldWrong":"現在のパスワードに誤りがあります", "msgPwdOldWrong":"現在のパスワードに誤りがあります。",
"msgPwdNotMatch":"新しいパスワードと新しいパスワード（確認）が一致しません。", "msgPwdNotMatch":"新しいパスワードと新しいパスワード（確認）が一致しません。",
"msgInvaildLength":"パスワードの長さは6文字以上16文字以下の間でなければいけません。", "msgInvaildLength":"パスワードの長さは6文字以上16文字以下の間でなければいけません。",
"msgHasSeqChar":"新しいパスワードに同じ文字を3文字以上連続して使えません。", "msgHasSeqChar":"新しいパスワードに同じ文字を3文字以上連続して使えません。",
......
abweb/js/login/login.js
...@@ -113,45 +113,44 @@ LOGIN.checkDialogValidation = function () { ...@@ -113,45 +113,44 @@ LOGIN.checkDialogValidation = function () {
if (!ValidationUtil.CheckRequiredForText(currentPass)) { if (!ValidationUtil.CheckRequiredForText(currentPass)) {
LOGIN.login_errorMessage = ''; LOGIN.login_errorMessage = '';
msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdCurr')).toString());
msgError.html(I18N.i18nText('msgPwdEmpty')); msgError.html(I18N.i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckRequiredForText(newPass)) { } else if (!ValidationUtil.CheckRequiredForText(newPass)) {
LOGIN.login_errorMessage = ''; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgPwdEmpty')); msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdNew')).toString());
msgError.attr('lang', 'msgPwdEmpty'); msgError.show();
return false;
} else if (!ValidationUtil.CheckRequiredForText(confirmPass)) {
LOGIN.login_errorMessage = '';
msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdNewRe')).toString());
msgError.show(); msgError.show();
return false; return false;
} else { } else {
if (newPass != confirmPass) { if (newPass != confirmPass) {
LOGIN.login_errorMessage = ''; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgPwdNotMatch')); msgError.html(I18N.i18nText('msgPwdNotMatch'));
msgError.attr('lang', 'msgPwdNotMatch');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckMinLengthForByte(newPass, 6)) { } else if (!ValidationUtil.CheckMinLengthForByte(newPass, 6)) {
LOGIN.login_errorMessage = ''; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgInvaildLength')); msgError.html(I18N.i18nText('msgInvaildLength'));
msgError.attr('lang', 'msgInvaildLength');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckMaxLengthForByte(newPass, 16)) { } else if (!ValidationUtil.CheckMaxLengthForByte(newPass, 16)) {
LOGIN.login_errorMessage = ''; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgInvaildLength')); msgError.html(I18N.i18nText('msgInvaildLength'));
msgError.attr('lang', 'msgInvaildLength');
msgError.show(); msgError.show();
return false; return false;
} else if (ValidationUtil.HasSeqChar(newPass, 3)) { } else if (ValidationUtil.HasSeqChar(newPass, 3)) {
LOGIN.login_errorMessage = ''; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgHasSeqChar')); msgError.html(I18N.i18nText('msgHasSeqChar'));
msgError.attr('lang', 'msgHasSeqChar');
msgError.show(); msgError.show();
return false; return false;
} else if (ValidationUtil.ContainSameSeqChar(newPass, currentPass, 4)) { } else if (ValidationUtil.ContainSameSeqChar(newPass, currentPass, 4)) {
LOGIN.login_errorMessage = ''; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgContainSameSeqChar')); msgError.html(I18N.i18nText('msgContainSameSeqChar'));
msgError.attr('lang', 'msgContainSameSeqChar');
msgError.show(); msgError.show();
return false; return false;
} else { } else {
......
abweb/js/pdfPrint/pdfPrint.js
...@@ -16,8 +16,6 @@ PP.init = function () { ...@@ -16,8 +16,6 @@ PP.init = function () {
console.log('PP.init'); console.log('PP.init');
PP.loadCommon(); PP.loadCommon();
PP.initPdfList();
COMMON.closeLoading(); COMMON.closeLoading();
}; };
...@@ -40,7 +38,7 @@ PP.loadCommon = function () { ...@@ -40,7 +38,7 @@ PP.loadCommon = function () {
titleLang: CONSTANT.PAGE_NAME.PDF_PRINT, titleLang: CONSTANT.PAGE_NAME.PDF_PRINT,
} }
]; ];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.PDF_PRINT, navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.PDF_PRINT, navs, PP.initPdfList);
}; };
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment