#19490 360°Getits Webビューアツールバーの非表示

abvw/js/contentview.js

@@ -2123,28 +2123,7 @@ CONTENTVIEW.panoOldContent = function(){
 	return oldPageNo;
 };
 
-//Display overlay dialog for specify content type
-CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
-
-    var contentId = ClientData.contentInfo_contentId();
-    if( resourceUrl == null ){
-    	resourceUrl = CONTENTVIEW.downloadResourceById(CONTENTVIEW_GENERAL.contentID);
-    }
-    //CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html;
-    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){
-        CONTENTVIEW.handleForContentTypeMusic(resourceUrl);
-    }
-    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video){
-    	CONTENTVIEW.handleForContentTypeVideo(resourceUrl);
-    }
-    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
-    	var url = ClientData.conf_apiUrl();    	
-    	var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
-		var apiUrl = linkUrlTmp + "/createSession/";
-		
-		CONTENTVIEW.panoOldContent();
-		
-    	linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/play/" + CONTENTVIEW_GENERAL.contentID + "/";
+CONTENTVIEW.createSessionForPanoramaContent = function(apiUrl, func, linkUrlTmp){
 	
 	var params = {
 	        sid: ClientData.userInfo_sid()
@@ -2164,13 +2143,41 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
    		},
 		success:	function(data) {
 			var linkUrlTmp2 = linkUrlTmp + ";jsessionid=" + data;
-    	    	CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp2);
+	    	func(linkUrlTmp2);
 		},
 		error:		function(xmlHttpRequest, txtStatus, errorThrown) {
 			/* call custom error process */
-    			console.log("error" + errorThrown);
+			AVWEB.avwLog("error" + errorThrown);
 		}
 	});
+};
+
+//Display overlay dialog for specify content type
+CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
+
+    var contentId = ClientData.contentInfo_contentId();
+    if( resourceUrl == null ){
+    	resourceUrl = CONTENTVIEW.downloadResourceById(CONTENTVIEW_GENERAL.contentID);
+    }
+    //CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html;
+    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){
+        CONTENTVIEW.handleForContentTypeMusic(resourceUrl);
+    }
+    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video){
+    	CONTENTVIEW.handleForContentTypeVideo(resourceUrl);
+    }
+    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie){
+    	var url = ClientData.conf_apiUrl();    	
+    	var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
+		var apiUrl = linkUrlTmp + "/createSession/";
+		
+		CONTENTVIEW.panoOldContent();
+		
+    	linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/panorama/play/" + CONTENTVIEW_GENERAL.contentID + "/";
+    	
+    	CONTENTVIEW.createSessionForPanoramaContent(apiUrl,function(){
+    		CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp);
+    	}, linkUrlTmp);
     	    	    	   	  	
     }else if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){
 	    var url = ClientData.conf_apiUrl();    	
@@ -2186,32 +2193,9 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
 			linkUrlTmp = linkUrlTmp.substring(0, linkUrlTmp.length - 6) + "shop/vtour/play/" + CONTENTVIEW_GENERAL.contentID + "/";
 		}
 		
-    	var params = {
-    	        sid: ClientData.userInfo_sid()
-    	    };
-    	var sysSettings = AVWEB.avwSysSetting();
-    	// ajax によるAPIの実行（json）
-    	$.ajax( {
-    		async:		false,
-    		type:		'GET',
-    		url:		apiUrl,
-    		dataType:	'text',
-    		data:		params,
-    		crossDomain: true,
-	  		beforeSend:	function(xhr) {
-	  			xhr.setRequestHeader('X-AGT-AppId', sysSettings.appName);
-				xhr.setRequestHeader('X-AGT-AppVersion', sysSettings.appVersion);
-	   		},
-    		success:	function(data) {       			
-    			var linkUrlTmp2 = linkUrlTmp + ";jsessionid=" + data;
-    	    	CONTENTVIEW.handleForContentTypePanoImage(linkUrlTmp2);
-    		},
-    		error:		function(xmlHttpRequest, txtStatus, errorThrown) {
-    			/* call custom error process */
-    			console.log("error" + errorThrown);
-    		}
-    	});
-    	  	
+		CONTENTVIEW.createSessionForPanoramaContent(apiUrl,function(){
+			CONTENTVIEW.handleForContentTypePanoImage(linkUrlTmp);
+    	},linkUrlTmp);	
     }
     else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){
 

abvw/js/contentview_InitObjects.js

@@ -557,22 +557,12 @@ CONTENTVIEW_INITOBJECT.isHasPageBGM = function(){
 //END TRB00069
 
 CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
+	
     //$('#divImageLoading').css('display', 'block');
-	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();