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
934573a6
Commit
934573a6
authored
Aug 09, 2017
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#26109 オブジェクト360対応
parent
d855560a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
90 additions
and
52 deletions
+90
-52
abvw/js/contentview.js
+79
-50
abvw/js/header.js
+5
-0
abvw/js/login.js
+6
-2
No files found.
abvw/js/contentview.js
View file @
934573a6
This diff is collapsed.
Click to expand it.
abvw/js/header.js
View file @
934573a6
...
...
@@ -1102,6 +1102,11 @@ HEADER.getIconTypeContent = function(contentType) {
src
=
'img/bookshelf/icon_12.png'
;
break
;
}
case
COMMON
.
ContentTypeKeys
.
Type_ObjectVR
:
{
src
=
'img/bookshelf/icon_13.png'
;
break
;
}
default
:
break
;
}
return
src
;
...
...
abvw/js/login.js
View file @
934573a6
...
...
@@ -751,7 +751,9 @@ 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
){
...
...
@@ -760,7 +762,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
location
.
href
=
htmlUrl
+
"?sid="
+
ClientData
.
userInfo_sid
()
+
"&apiurl="
+
apiUrl
+
"&cid="
+
strContentId
;
}
else
{
location
.
href
=
htmlUrl
;
}
}
}
return
;
}
...
...
@@ -822,6 +824,8 @@ LOGIN.htmlLinkById = function(contentId,contentType) {
resourceUrl
=
ClientData
.
siteUrl
()
+
ClientData
.
userInfo_accountPath
()
+
"/open/vtour/play/"
+
contentId
;
}
else
if
(
contentType
==
COMMON
.
ContentTypeKeys
.
Type_PanoMovie
){
resourceUrl
=
ClientData
.
siteUrl
()
+
ClientData
.
userInfo_accountPath
()
+
"/open/panorama/play/"
+
contentId
;
}
else
if
(
contentType
==
COMMON
.
ContentTypeKeys
.
Type_ObjectVR
){
resourceUrl
=
ClientData
.
siteUrl
()
+
ClientData
.
userInfo_accountPath
()
+
"/open/objectvr/play/"
+
contentId
;
}
else
{
AVWEB
.
avwCmsApiSync
(
ClientData
.
userInfo_accountPath
(),
"webGetContent"
,
'GET'
,
params
,
function
(
data
)
{
...
...
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