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
0c5081c7
Commit
0c5081c7
authored
Jun 03, 2016
by
vietdo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
コンテンツ間リンクのバッグを対応する
parent
c7c941af
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
2 deletions
+17
-2
abvw/js/contentview.js
+17
-2
No files found.
abvw/js/contentview.js
View file @
0c5081c7
...
...
@@ -6196,7 +6196,6 @@ CONTENTVIEW.panoLog = function(log, scheme){
CONTENTVIEW
.
receivePanoLog
=
function
(
e
)
{
var
log
=
JSON
.
parse
(
e
.
data
);
console
.
log
(
"log.scheme"
+
log
.
scheme
);
if
(
log
.
hasOwnProperty
(
'scheme'
)){
...
...
@@ -6256,7 +6255,7 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
CONTENTVIEW_CREATEOBJECT
.
showContentConfirmDialog
(
data
.
contentData
.
alertMessageLevel
,
data
.
contentData
.
contentType
);
}
else
if
(
data
.
contentData
.
alertMessageLevel
==
CONTENTVIEW_CREATEOBJECT
.
alertMessageLevel
.
None
){
console
.
log
(
"contentType:"
+
data
.
contentData
.
contentType
);
else
if
(
data
.
contentData
.
alertMessageLevel
==
CONTENTVIEW_CREATEOBJECT
.
alertMessageLevel
.
None
){
if
(
data
.
contentData
.
contentType
==
COMMON
.
ContentTypeKeys
.
Type_Link
){
HEADER
.
viewLinkContentById
(
targetContentId
);
...
...
@@ -6280,6 +6279,22 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
}
}
}
else
{
//コンテンツ警告サビースオプションがチェックされない
ClientData
.
common_preContentId
(
targetContentId
);
ClientData
.
common_prePageNo
(
page
);
//古いページを保存する
var
oldContent
=
{
oldContentID
:
CONTENTVIEW_GENERAL
.
contentID
,
oldPageIndex
:
CONTENTVIEW_GENERAL
.
panoPageNo
};
var
dataJump
=
ClientData
.
JumpQueue
();
dataJump
.
push
(
oldContent
);
ClientData
.
JumpQueue
(
dataJump
);
if
(
CONTENTVIEW_GENERAL
.
avwUserEnvObj
.
isMobile
()
&&
ClientData
.
isGetitsMode
())
{
AVWEB
.
avwScreenMove
(
COMMON
.
ScreenIds
.
ContentViewGetits
);
}
else
{
CONTENTVIEW
.
screenMove
();
}
}
},
...
...
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