ソース整理のみ

abvw/common/js/common.js

@@ -77,7 +77,8 @@ COMMON.ContentTypeKeys = {
     Type_Exam : 'exam',
     Type_Link : 'url',
     Type_PanoImage : 'panoImage',
-    Type_PanoMovie : 'panoMovie'
+    Type_PanoMovie : 'panoMovie',
+    Type_ObjectVR : 'objectvr'
 };
 
 /*
@@ -2405,7 +2406,7 @@ COMMON.SetStartLog = function(strContentId) {
 
         // PageLog 1ページ目セット（１レコードは必須）
         if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || 
-        		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile || CONTENTVIEW_GENERAL.contentType == 'panoImage'){
+        		CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
         	var pageLog = new PageLogEntity();
             pageLog.contentid = strContentId;
             log.pageLogArray.push(pageLog);
@@ -2469,7 +2470,7 @@ COMMON.SetPageLog = function(strContentId, strPageNo) {
             // PageLog追加
             var pageLog = new PageLogEntity();
             pageLog.contentid = strContentId;
-            if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){
+            if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
             	pageLog.pageNo = strPageNo;
             }else{
             	pageLog.pageNo = strPageNo + 1; // 0始まりのページ番号

abvw/js/contentview.js

@@ -2179,8 +2179,8 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
     		CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp);
     	}, linkUrlTmp);
     	    	    	   	  	
-    }else if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){
-	    var url = ClientData.conf_apiUrl();    	
+    }else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
+	    var url = ClientData.conf_apiUrl();
 		var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
 
 		var apiUrl = linkUrlTmp + "/createSession/";
@@ -2684,7 +2684,7 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){
         $container.css('overflow', 'scroll');
         $container.css('-webkit-overflow-scrolling', 'touch');
     }
-    else if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){
+    else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
     	$container.css('left','0%');
         $container.css('position','absolute');
         //$container.css('height','100%');
@@ -5983,9 +5983,9 @@ CONTENTVIEW.ready = function(initContentId){
                     //END TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type
                 }
                 else{
-                    if(CONTENTVIEW_GENERAL.contentType == "exam" || CONTENTVIEW_GENERAL.contentType == "enquete") {
+                    if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Enquete) {
                         var isShowResult, isSendResult;
-                        if(CONTENTVIEW_GENERAL.contentType == "exam") {
+                        if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam) {
                             if(data.contentData.showResult == 1){
                                 isShowResult = true;
                             } else {
@@ -5999,7 +5999,7 @@ CONTENTVIEW.ready = function(initContentId){
                         }
                         var contentId = data.contentData.contentId;
                         var url;
-                        if(CONTENTVIEW_GENERAL.contentType == "exam"){
+                        if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam){
                             url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
                         } else {
                             url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId;