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
cf1bc623
Commit
cf1bc623
authored
Mar 28, 2016
by
Tatsuhiko Tsukada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
セミコロンがない部分を補正(難読化で問題となる)
parent
31f24cb6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
abvw/js/contentview.js
+14
-14
No files found.
abvw/js/contentview.js
View file @
cf1bc623
...
...
@@ -1670,7 +1670,7 @@ CONTENTVIEW.handleDisplayToolbar = function() {
if
(
ClientData
.
IsAddingMarking
()
==
true
)
{
CONTENTVIEW_GENERAL
.
imgDrawingTemp
=
canvas
.
toDataURL
(
"image/png"
);
CONTENTVIEW_GENERAL
.
imgMarkerTemp
=
CONTENTVIEW_GENERAL
.
canvas_marker
.
toDataURL
(
"image/png
;
"
);
CONTENTVIEW_GENERAL
.
imgMarkerTemp
=
CONTENTVIEW_GENERAL
.
canvas_marker
.
toDataURL
(
"image/png"
);
}
var
w
=
$
(
"#wrapper"
).
width
();
...
...
@@ -1866,7 +1866,7 @@ CONTENTVIEW.resizeScreen = function() {
if
(
ClientData
.
IsAddingMarking
()
==
true
)
{
CONTENTVIEW_GENERAL
.
imgDrawingTemp
=
canvas
.
toDataURL
(
"image/png"
);
CONTENTVIEW_GENERAL
.
imgMarkerTemp
=
CONTENTVIEW_GENERAL
.
canvas_marker
.
toDataURL
(
"image/png"
);
;
CONTENTVIEW_GENERAL
.
imgMarkerTemp
=
CONTENTVIEW_GENERAL
.
canvas_marker
.
toDataURL
(
"image/png"
);
}
CONTENTVIEW
.
sizingScreen
();
...
...
@@ -2123,7 +2123,7 @@ CONTENTVIEW.panoOldContent = function(){
}
return
oldPageNo
;
}
}
;
//Display overlay dialog for specify content type
CONTENTVIEW
.
displayOverlayForSpecifyContentType
=
function
(
resourceUrl
){
...
...
@@ -3564,7 +3564,7 @@ CONTENTVIEW.ContentPage.prototype.drawPage = function (context, opt) {
/* enable controls in page */
if
(
ClientData
.
IsAddingMarking
()
==
true
)
{
CONTENTVIEW_GENERAL
.
disableAllControl
();
CONTENTVIEW_MARKING
.
enableButtonMarking
()
CONTENTVIEW_MARKING
.
enableButtonMarking
()
;
}
else
{
//Start Function : No.4 - Summary : make sure next or prev page is loaded
...
...
@@ -4585,7 +4585,7 @@ CONTENTVIEW.flip = function(opt) {
CONTENTVIEW
.
srcRect
.
right
=
CONTENTVIEW
.
srcRect
.
left
+
CONTENTVIEW
.
srcRect
.
width
;
}
else
if
(
CONTENTVIEW
.
srcRect
.
right
>
offscreen
.
width
)
{
CONTENTVIEW
.
srcRect
.
left
=
offscreen
.
width
-
CONTENTVIEW
.
srcRect
.
width
;
CONTENTVIEW
.
srcRect
.
right
=
offscreen
.
width
CONTENTVIEW
.
srcRect
.
right
=
offscreen
.
width
;
}
if
(
CONTENTVIEW
.
srcRect
.
top
<
0
)
{
CONTENTVIEW
.
srcRect
.
top
=
0
;
...
...
@@ -4701,7 +4701,7 @@ CONTENTVIEW.flip = function(opt) {
CONTENTVIEW
.
srcRectNext
.
right
=
CONTENTVIEW
.
srcRectNext
.
left
+
CONTENTVIEW
.
srcRectNext
.
width
;
}
else
if
(
CONTENTVIEW
.
srcRectNext
.
right
>
offscreen
.
width
)
{
CONTENTVIEW
.
srcRectNext
.
left
=
offscreen
.
width
-
CONTENTVIEW
.
srcRectNext
.
width
;
CONTENTVIEW
.
srcRectNext
.
right
=
offscreen
.
width
CONTENTVIEW
.
srcRectNext
.
right
=
offscreen
.
width
;
}
if
(
CONTENTVIEW
.
srcRectNext
.
top
<
0
)
{
CONTENTVIEW
.
srcRectNext
.
top
=
0
;
...
...
@@ -4819,7 +4819,7 @@ CONTENTVIEW.flip = function(opt) {
CONTENTVIEW
.
srcRectPrev
.
right
=
CONTENTVIEW
.
srcRectPrev
.
left
+
CONTENTVIEW
.
srcRectPrev
.
width
;
}
else
if
(
CONTENTVIEW
.
srcRectNext
.
right
>
offscreen
.
width
)
{
CONTENTVIEW
.
srcRectPrev
.
left
=
offscreen
.
width
-
CONTENTVIEW
.
srcRectPrev
.
width
;
CONTENTVIEW
.
srcRectPrev
.
right
=
offscreen
.
width
CONTENTVIEW
.
srcRectPrev
.
right
=
offscreen
.
width
;
}
if
(
CONTENTVIEW
.
srcRectPrev
.
top
<
0
)
{
CONTENTVIEW
.
srcRectPrev
.
top
=
0
;
...
...
@@ -5318,7 +5318,7 @@ CONTENTVIEW.trackTransforms = function(ctx) {
ctx
.
transformedPoint
=
function
(
x
,
y
)
{
pt
.
x
=
x
;
pt
.
y
=
y
;
return
pt
.
matrixTransform
(
xform
.
inverse
());
}
}
;
};
/* zoomIn event */
...
...
@@ -6198,10 +6198,7 @@ CONTENTVIEW.panoLog = function(log, scheme){
}
};
//360コンテンツにhotspotをクリックする時にログを取得する
window
.
addEventListener
(
"message"
,
receivePanoLog
,
false
);
function
receivePanoLog
(
e
)
{
CONTENTVIEW
.
receivePanoLog
=
function
(
e
)
{
var
log
=
JSON
.
parse
(
e
.
data
);
console
.
log
(
"log.scheme"
+
log
.
scheme
);
...
...
@@ -6215,6 +6212,9 @@ function receivePanoLog(e) {
}
};
//360コンテンツにhotspotをクリックする時にログを取得する
window
.
addEventListener
(
"message"
,
CONTENTVIEW
.
receivePanoLog
,
false
);
CONTENTVIEW
.
panoContentLink
=
function
(
targetContentId
,
page
){
var
params
=
{
contentId
:
targetContentId
,
...
...
@@ -6316,11 +6316,11 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
);
};
window
.
addEventListener
(
"message"
,
receiveSize
,
false
);
function
receiveSize
(
e
)
{
CONTENTVIEW
.
receiveSize
=
function
(
e
)
{
//if (e.origin === "http://hogehoge.com") // for security: set this to the domain of the iframe - use e.uri if you need more specificity
// document.getElementById("bar").style.height = e.data + "px";
//console.log("receiveSize:" + e.data);
};
window
.
addEventListener
(
"message"
,
CONTENTVIEW
.
receiveSize
,
false
);
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