テスト対応

abvw/common/js/avweb.js

@@ -899,15 +899,11 @@ AVWEB.avwClearError = function() {
 /* ブラウザunload時に警告メッセージの出力設定を行う関数 */
 AVWEB.avwSetLogoutNortice = function() {
 
-	console.log("AVWEB.avwSetLogoutNortice:" + ClientData.serviceOpt_daihatsu());
-
 	window.onbeforeunload = function(event) {
 	
-		console.log("window.onbeforeunload");
-	
 		//DHカスタム
 		if( ClientData.serviceOpt_daihatsu() == 'Y'){
-			if( "CONTENTVIEW_GENERAL.contentID" in window ){
+			if( "CONTENTVIEW_GENERAL" in window ){
 				if(CONTENTVIEW_GENERAL.contentID != null ){
 					COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
 					COMMON.RegisterLog();

abvw/common/js/screenLock.js

@@ -170,9 +170,9 @@ SCREENLOCK.screenLock = function(options) {
 		
 		//DHカスタム
 		if( ClientData.serviceOpt_daihatsu() == 'Y'){
-			if( "CONTENTVIEW_GENERAL.contentID" in window ){
+			if( "CONTENTVIEW_GENERAL" in window ){
 				if( CONTENTVIEW_GENERAL.contentID != null ){
-					COMMON.SetEndLog(contentID);
+					COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
 					COMMON.RegisterLog();
 				}
 			}

abvw/css/layout/viewer.css

@@ -1331,7 +1331,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
     margin-left: auto;
     margin-top: auto;    
     padding: 15px;
-    z-index: 102;   
+    /*z-index: 102;*/
     z-index: 101; 
 }       
    

abvw/css/theme/viewer.css

@@ -1086,6 +1086,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
     font-family: Verdana;
     font-size: 10pt;
     border-radius: 10px;
+    word-break: break-all;
+    /*word-wrap: break-word;*/
     
     -moz-box-shadow:-3px 3px 3px #777;
     -webkit-box-shadow:-3px 3px 3px #777;

abvw/js/bookmark.js

@@ -893,6 +893,10 @@ BOOKMARK.IsExistContent = function(strContentId) {
         contentId: strContentId,
         authCode: ClientData.authCode()
     };
+    
+    var method = "GET";
+    if( ClientData.authCode()
+    
     AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
                 function (data) {
                     isExisted = true;

abvw/js/contentsearch.js

@@ -848,7 +848,7 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
     else{
         //Go to Conten view page
     	//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
-    	
+        CONTENTSEARCH.drawEditImage(contentId);
     	CONTENTSEARCH.showContentView();
     	
     }

abvw/js/contentview.js

@@ -5484,28 +5484,30 @@ CONTENTVIEW.screenBack = function(){
 		$("#ws-body").show();
 		$("#topcontrol").show();
 		document.title = I18N.i18nText('dspHome') + ' | ' + I18N.i18nText('sysAppTitle');
-		
 	} else if( $('#bookmark').length ){
 		BOOKMARK.cssInit();
 		$("#header-ws").show();
 		$("#ws-body").show();
 		$("#topcontrol").show();
 	    document.title = I18N.i18nText('dspShiori') + ' | ' + I18N.i18nText('sysAppTitle');
-		
 	} else if( $('#history').length ){
 		HISTORY.cssInit();
 		$("#header-ws").show();
 		$("#ws-body").show();
 		$("#topcontrol").show();
 		document.title = I18N.i18nText('dspViewHistory') + ' | ' + I18N.i18nText('sysAppTitle');
-		
 	} else if( $('#contentsearch').length ){
 		CONTENTSEARCH.cssInit();
 		$("#header-ws").show();
 		$("#ws-body").show();
 		$("#topcontrol").show();
 	 	document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
-		
+	}
+	//プッシュメッセージ再開
+	// check new push message
+	if (COMMON.isAnonymousLogin() == false ) {
+		// continue check new push message
+		setTimeout(HEADER.getPushMessageNew, HEADER.getTimeWaitCheckNewPushMessage());
 	}
 	
 };
@@ -5607,6 +5609,8 @@ CONTENTVIEW.ready = function(){
          params,
          function (data) {
              
+    		console.log("data.contentData.contentType:" + data.contentData.contentType);
+    	
         	 CONTENTVIEW_GENERAL.contentType = data.contentData.contentType;
             
         	 if(ClientData.isStreamingMode()){

abvw/js/contentview_InitObjects.js

@@ -570,7 +570,7 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
     CONTENTVIEW.enableSpecifyControl();
     
     //ビデオコンテンツの場合はキャッシュ確認
-    if(contentType == ContentTypeKeys.Type_Video){
+    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video){
     	
     	//ファイルシステムが有効であればキャッシュ確認
     	if( CONTENTVIEW_FILESYSTEM.fs == null ){

abvw/js/header.js

@@ -854,11 +854,23 @@ HEADER.getTimeWaitCheckNewPushMessage = function()
 // get message new
 HEADER.getPushMessageNew = function()
 {
+	//ロック中かビューア画面ならチェックしない
+	if ($("#viewer").length) {
+		//表示状態か
+		if( $('#viewer').is(':visible')){
+			return;
+		}
+	}
 	//$('.notification-pushmessage').hide();
 	var params = { "sid": ClientData.userInfo_sid()};
-    AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "webPushMessageNew", "post", params,
+	AVWEB.avwCmsApi(
+			ClientData.userInfo_accountPath(),
+			"webPushMessageNew",
+			"post",
+			params,
 			HEADER.callbackGetPushMessageNewSuccess,
-        function (xhr, b, c) { });
+			function (xhr, b, c) { }
+	);
 };
 
 // callback get number new message success

abvw/js/history.js

@@ -701,6 +701,7 @@ HISTORY.readSubmenuFunction_callback = function(contentId){
         //Go to Conten view page
     	//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
     	
+        HISTORY.drawEditImage(contentId);
     	HISTORY.showContentView();
     	
     }

abvw/js/home.js

@@ -706,7 +706,8 @@ HOME.canvasClickFunction_callback = function(outputId){
             //Go to Conten view page
         	//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
         	
-        	//試験
+            HOME.drawEditImage(outputId);
+        	//ビュアーに切り替え
         	HOME.showContentView();
         	
         }