Skip to content

C
check
Commit 6c390cbb by Masaru Abe
Options

getitsでOnject360表示対応 

IFのOR表記記号の後ろに念のためスペース追加（ aaa || ）
parent e4363547
Showing with 13 additions and 9 deletions
abvw/common/js/common.js
...@@ -2472,8 +2472,8 @@ COMMON.SetPageLog = function(strContentId, strPageNo) { ...@@ -2472,8 +2472,8 @@ 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 == COMMON.ContentTypeKeys.Type_PanoImage || if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){ CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
pageLog.pageNo = strPageNo; pageLog.pageNo = strPageNo;
}else{ }else{
......
abvw/js/contentview.js
...@@ -2566,9 +2566,9 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){ ...@@ -2566,9 +2566,9 @@ CONTENTVIEW.handleForContentTypeEnquete = function(resourceUrl){
//Check type of content //Check type of content
CONTENTVIEW.isMediaAndHTMLContent = function(){ 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_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){ CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
return true; return true;
} }
...@@ -2583,7 +2583,7 @@ CONTENTVIEW.enableSpecifyControl = function(){ ...@@ -2583,7 +2583,7 @@ CONTENTVIEW.enableSpecifyControl = function(){
//Disable All control //Disable All control
CONTENTVIEW_GENERAL.disableAllControl(); 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_Video || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){ CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
...@@ -2711,8 +2711,8 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){ ...@@ -2711,8 +2711,8 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){
$container.css('background-color', 'white'); $container.css('background-color', 'white');
$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 == COMMON.ContentTypeKeys.Type_PanoMovie || }else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){ CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
$container.css('left','0%'); $container.css('left','0%');
$container.css('position','absolute'); $container.css('position','absolute');
......
abvw/js/login.js
...@@ -751,9 +751,12 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -751,9 +751,12 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
} else { } else {
// Go to Conten view page // Go to Conten view page
if(ClientData.isGetitsMode()){ if(ClientData.isGetitsMode()){
if(contentType == COMMON.ContentTypeKeys.Type_Html || contentType == COMMON.ContentTypeKeys.Type_Link || if(contentType == COMMON.ContentTypeKeys.Type_Html ||
contentType == COMMON.ContentTypeKeys.Type_PanoImage || contentType == COMMON.ContentTypeKeys.Type_PanoMovie || contentType == COMMON.ContentTypeKeys.Type_Link ||
contentType == COMMON.ContentTypeKeys.Type_PanoImage ||
contentType == COMMON.ContentTypeKeys.Type_PanoMovie ||
contentType == COMMON.ContentTypeKeys.Type_ObjectVR){ contentType == COMMON.ContentTypeKeys.Type_ObjectVR){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath()); var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType); var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType);
if(htmlUrl){ if(htmlUrl){
...@@ -767,6 +770,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -767,6 +770,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
return; return;
} }
} }
// アラート表示組み込めるか // アラート表示組み込めるか
LIMIT_ACCESS_CONTENT.messageLevel[data.contentData.contentId] = { LIMIT_ACCESS_CONTENT.messageLevel[data.contentData.contentId] = {
alertMessageLevel : data.contentData.alertMessageLevel, alertMessageLevel : data.contentData.alertMessageLevel,
......
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