Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
6c390cbb
Commit
6c390cbb
authored
Nov 29, 2017
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
getitsでOnject360表示対応
IFのOR表記記号の後ろに念のためスペース追加( aaa || )
parent
e4363547
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
abvw/common/js/common.js
+0
-0
abvw/js/contentview.js
+0
-0
abvw/js/login.js
+6
-2
No files found.
abvw/common/js/common.js
View file @
6c390cbb
abvw/js/contentview.js
View file @
6c390cbb
abvw/js/login.js
View file @
6c390cbb
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment