Skip to content

C
check
Commit 9ca7afba by Masaru Abe
Options

ソース整理のみ

parent 005e8d8b
Showing with 10 additions and 9 deletions
abvw/common/js/common.js
...@@ -77,7 +77,8 @@ COMMON.ContentTypeKeys = { ...@@ -77,7 +77,8 @@ COMMON.ContentTypeKeys = {
Type_Exam : 'exam', Type_Exam : 'exam',
Type_Link : 'url', Type_Link : 'url',
Type_PanoImage : 'panoImage', Type_PanoImage : 'panoImage',
Type_PanoMovie : 'panoMovie' Type_PanoMovie : 'panoMovie',
Type_ObjectVR : 'objectvr'
}; };
/* /*
...@@ -2405,7 +2406,7 @@ COMMON.SetStartLog = function(strContentId) { ...@@ -2405,7 +2406,7 @@ COMMON.SetStartLog = function(strContentId) {
// PageLog 1ページ目セット（１レコードは必須） // PageLog 1ページ目セット（１レコードは必須）
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || 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(); var pageLog = new PageLogEntity();
pageLog.contentid = strContentId; pageLog.contentid = strContentId;
log.pageLogArray.push(pageLog); log.pageLogArray.push(pageLog);
...@@ -2469,7 +2470,7 @@ COMMON.SetPageLog = function(strContentId, strPageNo) { ...@@ -2469,7 +2470,7 @@ COMMON.SetPageLog = function(strContentId, strPageNo) {
// PageLog追加 // PageLog追加
var pageLog = new PageLogEntity(); var pageLog = new PageLogEntity();
pageLog.contentid = strContentId; pageLog.contentid = strContentId;
if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
pageLog.pageNo = strPageNo; pageLog.pageNo = strPageNo;
}else{ }else{
pageLog.pageNo = strPageNo + 1; // 0始まりのページ番号 pageLog.pageNo = strPageNo + 1; // 0始まりのページ番号
......
abvw/js/contentview.js
...@@ -2179,8 +2179,8 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2179,8 +2179,8 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp); CONTENTVIEW.handleForContentTypePanoMovie(linkUrlTmp);
}, linkUrlTmp); }, linkUrlTmp);
}else if(CONTENTVIEW_GENERAL.contentType == 'panoImage'){ }else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage){
var url = ClientData.conf_apiUrl(); var url = ClientData.conf_apiUrl();
var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath()); var linkUrlTmp = AVWEB.format(url, ClientData.userInfo_accountPath());
var apiUrl = linkUrlTmp + "/createSession/"; var apiUrl = linkUrlTmp + "/createSession/";
...@@ -2684,7 +2684,7 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){ ...@@ -2684,7 +2684,7 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){
$container.css('overflow', 'scroll'); $container.css('overflow', 'scroll');
$container.css('-webkit-overflow-scrolling', 'touch'); $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('left','0%');
$container.css('position','absolute'); $container.css('position','absolute');
//$container.css('height','100%'); //$container.css('height','100%');
...@@ -5983,9 +5983,9 @@ CONTENTVIEW.ready = function(initContentId){ ...@@ -5983,9 +5983,9 @@ CONTENTVIEW.ready = function(initContentId){
//END TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type //END TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type
} }
else{ 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; var isShowResult, isSendResult;
if(CONTENTVIEW_GENERAL.contentType == "exam") { if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam) {
if(data.contentData.showResult == 1){ if(data.contentData.showResult == 1){
isShowResult = true; isShowResult = true;
} else { } else {
...@@ -5999,7 +5999,7 @@ CONTENTVIEW.ready = function(initContentId){ ...@@ -5999,7 +5999,7 @@ CONTENTVIEW.ready = function(initContentId){
} }
var contentId = data.contentData.contentId; var contentId = data.contentData.contentId;
var url; 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; url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
} else { } else {
url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId; url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId=&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment