#13518 [AAT

1.5]大きさや色を様々なものにしたリッチテキストコンテンツをプレビュー表示すると、オブジェクト上では改行していないのに改行して表示されている

abvw/js/login.js

@@ -38,7 +38,7 @@ LOGIN.initialScreen = function() {
 };
 
 //check Save Login Info
-LOGIN.saveLoginInfo = function(paramLid, paramP, accountPath) {
+LOGIN.saveLoginInfo = function() {
 
     var lang = I18N.getCurrentLanguage();
     // load language
@@ -49,15 +49,10 @@ LOGIN.saveLoginInfo = function(paramLid, paramP, accountPath) {
 
 	var accountPath, loginId, password;
     var chkRemember = $('#chkRemember').attr('checked');
-    if(paramLid != '' && paramP != ''){
-    	accountPath = accountPath;
-    	loginId = paramLid;
-    	password = paramP;
-    } else {
-    	accountPath = $('#txtAccPath').val();
-    	loginId = $('#txtAccId').val();
-    	password = $('#txtPassword').val();
-    }
+	accountPath = $('#txtAccPath').val();
+	loginId = $('#txtAccId').val();
+	password = $('#txtPassword').val();
+
 	var date = new Date();
     ClientData.userInfo_accountPath(accountPath);
     ClientData.userInfo_loginId(loginId);
@@ -161,24 +156,18 @@ LOGIN.checkDialogValidation = function() {
 };
 
 //Login Process
-LOGIN.processLogin = function(paramLid, paramP) {
+LOGIN.processLogin = function() {
 	var accountPath = "";
 	var loginId = "";
 	var password = "";
 
-	if(paramLid){
-		loginId = paramLid;
-	} else {
-		loginId = $('#txtAccId').val();
-	}
+	loginId = $('#txtAccId').val();
 
-	if(paramP){
-		password = paramP;
-	} else {
-		password = $('#txtPassword').val();
-	}
+	password = $('#txtPassword').val();
 
 	accountPath = $('#txtAccPath').val();
+	console.log("fdfdfd");
+    console.log(loginId);
 	var requireChangePassword = 0;
 	var skipPwdDate;
 
@@ -217,7 +206,7 @@ LOGIN.processLogin = function(paramLid, paramP) {
         if (data.result == 'success') {
 
             // Save retrieved info
-            LOGIN.saveLoginInfo(paramLid, paramP, accountPath);
+            LOGIN.saveLoginInfo();
             // set number new push message to 0
             ClientData.pushInfo_newMsgNumber(0);
 
@@ -361,7 +350,6 @@ LOGIN.processLogin = function(paramLid, paramP) {
             $('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
         }
         $('#main-error-message').show();
-        $('#formlogin').show();
     });
 };
 
@@ -969,37 +957,21 @@ LOGIN.ready = function(){
             }, LOGIN.timeWaitSplashScreen);
     }
     else {
-    	//doutor
-    	var paramLid = COMMON.getUrlParam('lid', '');
-    	var paramP = COMMON.getUrlParam('p', '');
 
     	//引数でアカウントパスを受け取ったらセットする
-    	var urlPath = COMMON.getUrlParam('urlPath', '');
-    	if( urlPath != '' ){
-    		$('#txtAccPath').val(urlPath);
-    	}
 
         $('#normalUser').show();
         $('#formlogin').hide();
         $('#logologin').animate({ "margin-top": 0 }, LOGIN.timeWaitSplashScreen,
             function () {
-        		if(( paramLid == '' && paramP == '') || ( paramLid != '' && paramP != '' && LOGIN.login_error_flag == true)){
-        			$('#formlogin').show();
-        		}
+        		$('#formlogin').show();
         		$('#menu-language').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
-        		if( paramLid != '' && paramP != '' && LOGIN.login_error_flag == false){
-        			$('#formlogin').css("opacity","0");
-        		} else {
-        			$('#formlogin').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
-        		}
+        		$('#formlogin').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
         		$('.cnt_footer').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
             }
         );
-    	if( paramLid != '' && paramP != '' ){
-    		LOGIN.processLogin(paramLid, paramP);
-    	} else {
-            $('#formlogin').show();
-    	}
+        console.log("fdsfs");
+    	LOGIN.initLoginNormalUser();
     }
 };
 //});

login.html

@@ -73,16 +73,6 @@
 			<article>
 			<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
 			<section id="formlogin" style="display:none;">
-
-				<table id="msgdotoru" width="440" border="0" cellspacing="0" >
-				<tr>
-					<th width="100%" >ポータルサイトからログインしてください</th>
-				</tr>
-				</table>
-
-				<input type="hidden" id="txtAccPath" value="" />
-
-				<!--
 				<table width="440" border="0" cellspacing="0">
 				<tr>
 					<th width="33%" class="lang" lang="txtLoginAccPath">アカウントパス</th>
@@ -100,9 +90,7 @@
 				<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
 				<p class="memory"><input type="checkbox" id="chkRemember" /><label class="lang" lang="txtLoginPwdRbr" for="chkRemember">アカウントパスとログインIDを記憶する</label></p>
 				<a class="loginbtn lang" id="btnLogin" lang="dspLogin">ログイン</a>
-				-->
 			</section>
-
 			</article>
 		</div>
 	</div>