getitsでOnject360表示対応

IFのOR表記記号の後ろに念のためスペース追加（ aaa || ）

abvw/common/js/common.js

@@ -2472,8 +2472,8 @@ COMMON.SetPageLog = function(strContentId, strPageNo) {
             // PageLog追加
             var pageLog = new PageLogEntity();
             pageLog.contentid = strContentId;
-            if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
-            		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
+            if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || 
+            		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || 
             		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
             	pageLog.pageNo = strPageNo;
             }else{

abvw/js/contentview.js

@@ -2566,9 +2566,9 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){
 
 //Check type of content
 CONTENTVIEW.isMediaAndHTMLContent = function(){
-    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video ||
+    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video || 
     		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || 
-    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
+    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || 
     		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
         return true;
     }
@@ -2583,7 +2583,7 @@ CONTENTVIEW.enableSpecifyControl = function(){
     //Disable All control
     CONTENTVIEW_GENERAL.disableAllControl();
 
-    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music ||
+    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || 
     	CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || 
     	CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
 
@@ -2711,8 +2711,8 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){
         $container.css('background-color', 'white');
         $container.css('overflow', 'scroll');
         $container.css('-webkit-overflow-scrolling', 'touch');
-    }else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
-    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
+    }else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || 
+    		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || 
     		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
     	$container.css('left','0%');
         $container.css('position','absolute');

abvw/js/login.js

@@ -751,9 +751,12 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
 		} else {
 			// Go to Conten view page
 			if(ClientData.isGetitsMode()){
-				if(contentType == COMMON.ContentTypeKeys.Type_Html || contentType == COMMON.ContentTypeKeys.Type_Link || 
-						contentType == COMMON.ContentTypeKeys.Type_PanoImage || contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
+				if(contentType == COMMON.ContentTypeKeys.Type_Html || 
+						contentType == COMMON.ContentTypeKeys.Type_Link || 
+						contentType == COMMON.ContentTypeKeys.Type_PanoImage || 
+						contentType == COMMON.ContentTypeKeys.Type_PanoMovie || 
 						contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
+					
 					var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
 					var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType);
 					if(htmlUrl){
@@ -767,6 +770,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
 					return;
 				}
 			} 
+			
 			// アラート表示組み込めるか
 			LIMIT_ACCESS_CONTENT.messageLevel[data.contentData.contentId] = {
 				alertMessageLevel : data.contentData.alertMessageLevel,