#19267 vtour対応

abvw/js/contentview.js

@@ -1641,7 +1641,7 @@ CONTENTVIEW.oldContent_Back = function() {
 
     /*move to page */
     //CONTENTVIEW.changePage(oldContent.oldPageIndex);
-    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
+    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
     	CONTENTVIEW.changePageWithoutSlide(oldContent.oldPageIndex);
     }
     
@@ -2597,7 +2597,7 @@ CONTENTVIEW.enableControlForMediaAndHtmlType = function(){
 
     $("#control_screen").bind('click', CONTENTVIEW.fullScreenForNotPdfType);
     $("#control_screen_2").bind('click', CONTENTVIEW.originalScreenForNotPdfType);
-
+    
     if (COMMON.isTouchDevice() == true) {/* set css for device */
         $('#imgHome').addClass('home_device');
         $('#imgBack').addClass('back_device');
@@ -2709,6 +2709,15 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){
         $container.css('overflow', 'scroll');
         $container.css('-webkit-overflow-scrolling', 'touch');
     }
+    else if(CONTENTVIEW_GENERAL.contentType == 'panoMovie'){
+    	$container.css('left','0%');
+        $container.css('position','absolute');
+        //$container.css('height','100%');
+        $container.css('width','100%');
+        $container.css('background-color', 'white');
+        $container.css('overflow', 'scroll');
+        $container.css('-webkit-overflow-scrolling', 'touch');
+    }
 
     //START TRB00068
     if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
@@ -6263,7 +6272,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
                         dataJump.push(oldContent);
                         ClientData.JumpQueue(dataJump);
                         
-                    	if (ClientData.isGetitsMode()) {
+                    	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
                     		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
                     	} else {
                     		CONTENTVIEW.screenMove();
@@ -6282,7 +6291,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
                     dataJump.push(oldContent);
                     ClientData.JumpQueue(dataJump);
 
-                	if (ClientData.isGetitsMode()) {
+                	if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
                 		AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewGetits);
                 	} else {
                 		CONTENTVIEW.screenMove();

abvw/js/contentview_InitObjects.js

@@ -558,11 +558,21 @@ CONTENTVIEW_INITOBJECT.isHasPageBGM = function(){
 
 CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
     //$('#divImageLoading').css('display', 'block');
-
-    /* init footer toolbar */
-    $('#footer_toolbar_2').hide();
-    $('#footer_toolbar_1').show();
-
+	if(ClientData.isGetitsMode()){
+		if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
+			var $container = $('#dialog');
+			$("#header_toolbar").hide();
+			$("#footer_toolbar_1").hide();
+			$container.css('top', '0%')
+            		  .css('left', '0%')
+            		  .css('height', '100%')
+            		  .css('width', '100%');
+	    }
+	}else{
+		/* init footer toolbar */
+	    $('#footer_toolbar_2').hide();
+	    $('#footer_toolbar_1').show();
+	}
     /* init pos bottom toolbar*/
     CONTENTVIEW_INITOBJECT.initDisplayToolbarDevice();
 
@@ -572,7 +582,10 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
     }
 
     //PdfコンテンツでメディアとHTMLボタンなどをクリックするprePageNoを消す
-    ClientData.common_prePageNo(null);
+    if(ClientData.common_prePageNo()){
+    	
+    	ClientData.common_prePageNo(null);
+    }
     
     //START TRB00094 - Editor : Long - Date : 09/26/2013 - Summary : Setting log
     CONTENTVIEW.StartTimerUpdateLog();