Skip to content

C
check
Commit cf1bc623 by Tatsuhiko Tsukada
Options

セミコロンがない部分を補正(難読化で問題となる）

parent 31f24cb6
Showing with 14 additions and 14 deletions
abvw/js/contentview.js
...@@ -1670,7 +1670,7 @@ CONTENTVIEW.handleDisplayToolbar = function() { ...@@ -1670,7 +1670,7 @@ CONTENTVIEW.handleDisplayToolbar = function() {
if (ClientData.IsAddingMarking() == true) { if (ClientData.IsAddingMarking() == true) {
CONTENTVIEW_GENERAL.imgDrawingTemp = canvas.toDataURL("image/png"); 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(); var w = $("#wrapper").width();
...@@ -1866,7 +1866,7 @@ CONTENTVIEW.resizeScreen = function() { ...@@ -1866,7 +1866,7 @@ CONTENTVIEW.resizeScreen = function() {
if (ClientData.IsAddingMarking() == true) { if (ClientData.IsAddingMarking() == true) {
CONTENTVIEW_GENERAL.imgDrawingTemp = canvas.toDataURL("image/png"); 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(); CONTENTVIEW.sizingScreen();
...@@ -2123,7 +2123,7 @@ CONTENTVIEW.panoOldContent = function(){ ...@@ -2123,7 +2123,7 @@ CONTENTVIEW.panoOldContent = function(){
} }
return oldPageNo; return oldPageNo;
} };
//Display overlay dialog for specify content type //Display overlay dialog for specify content type
CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
...@@ -3564,7 +3564,7 @@ CONTENTVIEW.ContentPage.prototype.drawPage = function (context, opt) { ...@@ -3564,7 +3564,7 @@ CONTENTVIEW.ContentPage.prototype.drawPage = function (context, opt) {
/* enable controls in page */ /* enable controls in page */
if (ClientData.IsAddingMarking() == true) { if (ClientData.IsAddingMarking() == true) {
CONTENTVIEW_GENERAL.disableAllControl(); CONTENTVIEW_GENERAL.disableAllControl();
CONTENTVIEW_MARKING.enableButtonMarking() CONTENTVIEW_MARKING.enableButtonMarking();
} }
else { else {
//Start Function : No.4 - Summary : make sure next or prev page is loaded //Start Function : No.4 - Summary : make sure next or prev page is loaded
...@@ -4585,7 +4585,7 @@ CONTENTVIEW.flip = function(opt) { ...@@ -4585,7 +4585,7 @@ CONTENTVIEW.flip = function(opt) {
CONTENTVIEW.srcRect.right = CONTENTVIEW.srcRect.left + CONTENTVIEW.srcRect.width; CONTENTVIEW.srcRect.right = CONTENTVIEW.srcRect.left + CONTENTVIEW.srcRect.width;
} else if (CONTENTVIEW.srcRect.right > offscreen.width) { } else if (CONTENTVIEW.srcRect.right > offscreen.width) {
CONTENTVIEW.srcRect.left = offscreen.width - CONTENTVIEW.srcRect.width; CONTENTVIEW.srcRect.left = offscreen.width - CONTENTVIEW.srcRect.width;
CONTENTVIEW.srcRect.right = offscreen.width CONTENTVIEW.srcRect.right = offscreen.width;
} }
if (CONTENTVIEW.srcRect.top < 0) { if (CONTENTVIEW.srcRect.top < 0) {
CONTENTVIEW.srcRect.top = 0; CONTENTVIEW.srcRect.top = 0;
...@@ -4701,7 +4701,7 @@ CONTENTVIEW.flip = function(opt) { ...@@ -4701,7 +4701,7 @@ CONTENTVIEW.flip = function(opt) {
CONTENTVIEW.srcRectNext.right = CONTENTVIEW.srcRectNext.left + CONTENTVIEW.srcRectNext.width; CONTENTVIEW.srcRectNext.right = CONTENTVIEW.srcRectNext.left + CONTENTVIEW.srcRectNext.width;
} else if (CONTENTVIEW.srcRectNext.right > offscreen.width) { } else if (CONTENTVIEW.srcRectNext.right > offscreen.width) {
CONTENTVIEW.srcRectNext.left = offscreen.width - CONTENTVIEW.srcRectNext.width; CONTENTVIEW.srcRectNext.left = offscreen.width - CONTENTVIEW.srcRectNext.width;
CONTENTVIEW.srcRectNext.right = offscreen.width CONTENTVIEW.srcRectNext.right = offscreen.width;
} }
if (CONTENTVIEW.srcRectNext.top < 0) { if (CONTENTVIEW.srcRectNext.top < 0) {
CONTENTVIEW.srcRectNext.top = 0; CONTENTVIEW.srcRectNext.top = 0;
...@@ -4819,7 +4819,7 @@ CONTENTVIEW.flip = function(opt) { ...@@ -4819,7 +4819,7 @@ CONTENTVIEW.flip = function(opt) {
CONTENTVIEW.srcRectPrev.right = CONTENTVIEW.srcRectPrev.left + CONTENTVIEW.srcRectPrev.width; CONTENTVIEW.srcRectPrev.right = CONTENTVIEW.srcRectPrev.left + CONTENTVIEW.srcRectPrev.width;
} else if (CONTENTVIEW.srcRectNext.right > offscreen.width) { } else if (CONTENTVIEW.srcRectNext.right > offscreen.width) {
CONTENTVIEW.srcRectPrev.left = offscreen.width - CONTENTVIEW.srcRectPrev.width; CONTENTVIEW.srcRectPrev.left = offscreen.width - CONTENTVIEW.srcRectPrev.width;
CONTENTVIEW.srcRectPrev.right = offscreen.width CONTENTVIEW.srcRectPrev.right = offscreen.width;
} }
if (CONTENTVIEW.srcRectPrev.top < 0) { if (CONTENTVIEW.srcRectPrev.top < 0) {
CONTENTVIEW.srcRectPrev.top = 0; CONTENTVIEW.srcRectPrev.top = 0;
...@@ -5318,7 +5318,7 @@ CONTENTVIEW.trackTransforms = function(ctx) { ...@@ -5318,7 +5318,7 @@ CONTENTVIEW.trackTransforms = function(ctx) {
ctx.transformedPoint = function (x, y) { ctx.transformedPoint = function (x, y) {
pt.x = x; pt.y = y; pt.x = x; pt.y = y;
return pt.matrixTransform(xform.inverse()); return pt.matrixTransform(xform.inverse());
} };
}; };
/* zoomIn event */ /* zoomIn event */
...@@ -6198,10 +6198,7 @@ CONTENTVIEW.panoLog = function(log, scheme){ ...@@ -6198,10 +6198,7 @@ CONTENTVIEW.panoLog = function(log, scheme){
} }
}; };
//360コンテンツにhotspotをクリックする時にログを取得する CONTENTVIEW.receivePanoLog = function(e) {
window.addEventListener("message", receivePanoLog, false);
function receivePanoLog(e) {
var log = JSON.parse(e.data); var log = JSON.parse(e.data);
console.log("log.scheme"+log.scheme); console.log("log.scheme"+log.scheme);
...@@ -6215,6 +6212,9 @@ function receivePanoLog(e) { ...@@ -6215,6 +6212,9 @@ function receivePanoLog(e) {
} }
}; };
//360コンテンツにhotspotをクリックする時にログを取得する
window.addEventListener("message", CONTENTVIEW.receivePanoLog, false);
CONTENTVIEW.panoContentLink = function(targetContentId, page){ CONTENTVIEW.panoContentLink = function(targetContentId, page){
var params = { var params = {
contentId: targetContentId, contentId: targetContentId,
...@@ -6316,11 +6316,11 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6316,11 +6316,11 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
); );
}; };
window.addEventListener("message", receiveSize, false); CONTENTVIEW.receiveSize = function(e) {
function receiveSize(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 //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"; // document.getElementById("bar").style.height = e.data + "px";
//console.log("receiveSize:" + e.data); //console.log("receiveSize:" + e.data);
}; };
window.addEventListener("message", CONTENTVIEW.receiveSize, false);
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