Skip to content

C
check
Commit 2333695b by vietdo
Options

#9394 【Web 1.1】タップしてPlayで再生中に再度タップしても止まらない

parent bb946e0e
Showing with 423 additions and 397 deletions
abvw/js/contentview_CreateObjects.js
......@@ -5,7 +5,7 @@ var CONTENTVIEW_CREATEOBJECT = {};
CONTENTVIEW_CREATEOBJECT.alertMessageLevel = {
ShowAlert : '1',
RequirePassword : '2',
None : '0'
None : '0'
};
/* ----------------------------------- Create memo --------------------------------*/
......@@ -72,7 +72,7 @@ CONTENTVIEW_CREATEOBJECT.MemoObject.prototype.drawMemo = function (context, opt)
if( tempRatioHeight < 1 ){
tempRatioHeight = 1;
}
var posX = this.x * tempRatioWidth;
var posY = this.y * tempRatioHeight;
var objWidth = this.width * tempRatioWidth;
......@@ -167,7 +167,7 @@ CONTENTVIEW_CREATEOBJECT.WebGetContentTyp4Object.prototype.hitTest = function (p
/* draw Memo */
CONTENTVIEW_CREATEOBJECT.WebGetContentTyp4Object.prototype.drawObject = function (context, opt) {
//#11478
var canvasWidth = $('#offscreen').width();
var canvasHeight = $('#offscreen').height();
......@@ -179,7 +179,7 @@ CONTENTVIEW_CREATEOBJECT.WebGetContentTyp4Object.prototype.drawObject = function
if( tempRatioHeight < 1 ){
tempRatioHeight = 1;
}
var posX = this.x * tempRatioWidth;
var posY = this.y * tempRatioHeight;
var objWidth = this.width * tempRatioWidth;
......@@ -189,10 +189,10 @@ CONTENTVIEW_CREATEOBJECT.WebGetContentTyp4Object.prototype.drawObject = function
context.globalAlpha = 0.4;
context.drawImage(imageObj, posX, posY, objWidth, objHeigth);
//Start Function : No.4 - Editor: Long - Date : 08/14/2013 - Summary : handle lazy loading
CONTENTVIEW.flip(opt);
//Start Function : No.4 - Editor: Long - Date : 08/14/2013 - Summary : handle lazy loading
//Start Function : No.4 - Editor: Long - Date : 08/14/2013 - Summary : handle lazy loading
context.globalAlpha = 1;
};
imageObj.src = this.imageUrl;
......@@ -213,7 +213,7 @@ CONTENTVIEW_CREATEOBJECT.webContentType4 = function (id, x, y, w, h, imageUrl, l
setTimeout(function(){COMMON.ToogleLogoutNortice();}, 200);
//END TRB00070
}
}
}
else if (linkKind == "0") {
CONTENTVIEW.changePage(CONTENTVIEW.changePageNo(destPageNumber));
}
......@@ -224,7 +224,7 @@ CONTENTVIEW_CREATEOBJECT.webContentType4.prototype = new CONTENTVIEW_CREATEOBJEC
/* ----------------------------------- End create webGetContentType4 -----------------------------*/
/**
* PageObject Class Definition
* PageObject Class Definition
*/
/* constructor */
......@@ -248,9 +248,9 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.setup = function (mediaType, actio
if( this.imageUrl != null ){
this.image.src = this.imageUrl;
}
this.objectId = objectId;
};
/* prototype hitTest */
......@@ -271,7 +271,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.hitTest = function (px, py) {
var tmpY = this.y * tempRatioHeight;
var tmpW = this.width * tempRatioWidth;
var tmpH = this.height * tempRatioHeight;
if ( tmpX <= px && px <= (tmpX + tmpW)) {
if (tmpY <= py && py <= (tmpY + tmpH)) {
return true;
......@@ -287,23 +287,23 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.hitTest = function (px, py) {
/* draw page Object */
//Start Function: No.4 - Editor : Long - Date: 08/09/2013 - Summary : Edit function to draw object on next page
CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context, opt) {
if(opt == undefined || opt == null){
opt = 0;
}
var nObjectCnt = 0;
//#11478
var tempRatioWidth = 1;
var tempRatioHeight = 1;
var canvasWidth = 0;
var canvasHeight = 0;
//Check which pageObject to be count
if(opt == 0){
nObjectCnt = CONTENTVIEW_GENERAL.pageObjects.length;
//#11478
canvasWidth = $('#offscreen').width();
canvasHeight = $('#offscreen').height();
......@@ -315,11 +315,11 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
if( tempRatioHeight < 1 ){
tempRatioHeight = 1;
}
}
else if(opt == 1){
nObjectCnt = CONTENTVIEW_GENERAL.nextPageObjects.length;
//#11478
canvasWidth = $('#offscreenNext').width();
canvasHeight = $('#offscreenNext').height();
......@@ -331,11 +331,11 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
if( tempRatioHeight < 1 ){
tempRatioHeight = 1;
}
}
else if(opt == 2){
nObjectCnt = CONTENTVIEW_GENERAL.prevPageObjects.length;
//#11478
canvasWidth = $('#offscreenPre').width();
canvasHeight = $('#offscreenPre').height();
......@@ -347,36 +347,36 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
if( tempRatioHeight < 1 ){
tempRatioHeight = 1;
}
}
if (this.visible) {
/* init data */
var mediaType = this.mediaType;
var displayBorder = this.displayBorder;
//#11478
var x = this.x * tempRatioWidth;
var y = this.y * tempRatioHeight;
var w = this.width * tempRatioWidth;
var h = this.height * tempRatioHeight;
var tempUrl = this.imageUrl;
var isUsedTempImg = false;
//START TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
if(mediaType == '6' && tempUrl == 'img/iPad_video.png'){
isUsedTempImg = true;
}
//END TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
if (mediaType == '5') {
CONTENTVIEW_GENERAL.nCountObjectLoad[opt]++;
context.strokeStyle = "black";
context.lineWidth = "1";
context.strokeRect(x, y, w, h);
CONTENTVIEW.flip(opt);
}
......@@ -416,35 +416,35 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
}
}
}
}
else if (mediaType == '3') {/* audio */
img.width = 50;
img.height = 50;
//START TRB00035 - Editor : Long - Date: 09/17/2013 - Summary : Fix for draw audio object at center
context.drawImage(img, x + (w/2 - img.width/2), y + (h/2 - img.height/ 2), img.width, img.height);
//END TRB00035 - Editor : Long - Date: 09/17/2013 - Summary : Fix for draw audio object at center
context.drawImage(img, x + (w/2 - img.width/2), y + (h/2 - img.height/ 2), img.width, img.height);
//END TRB00035 - Editor : Long - Date: 09/17/2013 - Summary : Fix for draw audio object at center
}
else if(mediaType == '6' && isUsedTempImg){
img.width = 50;
img.height = 50;
//START TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
context.drawImage(img, x + (w/2 - img.width/2), y + (h/2 - img.height/ 2), img.width, img.height);
isUsedTempImg = false;
//END TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
context.drawImage(img, x + (w/2 - img.width/2), y + (h/2 - img.height/ 2), img.width, img.height);
isUsedTempImg = false;
//END TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
}
else {
context.drawImage(img, x, y, w, h);
}
CONTENTVIEW.flip(opt);
//console.log("CONTENTVIEW_GENERAL.nCountObjectLoad:" + opt + " "+ CONTENTVIEW_GENERAL.nCountObjectLoad[opt] + " nObjectCnt:" + nObjectCnt);
if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) {
if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) {
/* draw marking */
CONTENTVIEW.drawMarkingOnScreen(opt);
......@@ -459,7 +459,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
}
else{
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
}
}
else{
CONTENTVIEW_GENERAL.isLoadingObject = false;
......@@ -474,17 +474,17 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
if(CONTENTVIEW_GENERAL.totalPage > 1){
if(opt != 0 && opt != null){
CONTENTVIEW_MARKING.enableButtonMarking();
}
}
}
else{
CONTENTVIEW_MARKING.enableButtonMarking();
}
}
}
else{
CONTENTVIEW_MARKING.enableButtonMarking();
}
//End Function : No.4 - Summary : make sure all page is loaded
}
//End Function : No.4 - Summary : make sure all page is loaded
}
else {
//Start Function : No.4 - Summary : make sure all page is loaded
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
......@@ -495,12 +495,12 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
}
else{
CONTENTVIEW_GENERAL.enableAllControl();
}
}
}
else{
CONTENTVIEW_GENERAL.enableAllControl();
}
//End Function : No.4 - Summary : make sure all page is loaded
//End Function : No.4 - Summary : make sure all page is loaded
}
/*finish loading */
......@@ -513,7 +513,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
}
else{
$('#divImageLoading').css('display', 'none');
}
}
}
else{
$('#divImageLoading').css('display', 'none');
......@@ -525,9 +525,9 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
}
};
img.src = this.imageUrl;
}
}
else {
//console.log("mediaType:" + mediaType);
//console.log("tempUrl:" + tempUrl);
if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) {
......@@ -548,23 +548,23 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
}
else{
CONTENTVIEW_MARKING.enableButtonMarking();
}
}
}
else{
CONTENTVIEW_MARKING.enableButtonMarking();
}
//End Function : No.4 - Summary : make sure all page is loaded
//End Function : No.4 - Summary : make sure all page is loaded
} else {
//Start Function : No.4 - Summary : make sure all page is loaded
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
if(CONTENTVIEW_GENERAL.totalPage > 1){
if(opt != 0 && opt != null){
CONTENTVIEW_GENERAL.enableAllControl();
}
}
}
else{
CONTENTVIEW_GENERAL.enableAllControl();
}
CONTENTVIEW_GENERAL.enableAllControl();
}
}
else{
CONTENTVIEW_GENERAL.enableAllControl();
......@@ -572,17 +572,17 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
//End Function : No.4 - Summary : mak
}
/*finish loading */
/*finish loading */
//Start Function : No.4 - Summary : make sure all page is loaded
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
if(CONTENTVIEW_GENERAL.totalPage > 1){
if(opt != 0 && opt != null){
$('#divImageLoading').css('display', 'none');
}
}
}
else{
$('#divImageLoading').css('display', 'none');
}
}
}
else{
$('#divImageLoading').css('display', 'none');
......@@ -600,13 +600,13 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
/*mediaType = 8 3d object*/
CONTENTVIEW_CREATEOBJECT.object3d = function (mediaType, actionType, id, imageUrl, x, y, w, h, hCnt, vCnt, visible, imageObjects, objectId){
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function (imagePt){
this.action = function (imagePt){
//abe
//alert("object3d");
//#11478
var canvasWidth = $('#offscreen').width();
var canvasHeight = $('#offscreen').height();
......@@ -618,7 +618,7 @@ CONTENTVIEW_CREATEOBJECT.object3d = function (mediaType, actionType, id, imageUr
if( tempRatioHeight < 1 ){
tempRatioHeight = 1;
}
//#11478 操作側のイベント判定には逆に縮める対応が必要
var tempRatioWidth2 = CONTENTVIEW_GENERAL.widthEachPageApi / canvasWidth;
if( tempRatioWidth2 > 1 ){
......@@ -628,26 +628,26 @@ CONTENTVIEW_CREATEOBJECT.object3d = function (mediaType, actionType, id, imageUr
if( tempRatioHeight2 > 1 ){
tempRatioHeight2 = 1;
}
//console.log("tempRatioWidth:" + tempRatioWidth + " tempRatioHeight:" + tempRatioHeight);
//console.log("tempRatioWidth2:" + tempRatioWidth2 + " tempRatioHeight2:" + tempRatioHeight2);
var tmpX = x * tempRatioWidth;
var tmpY = y * tempRatioHeight;
var tmpW = w * tempRatioWidth;
var tmpH = h * tempRatioHeight;
if(CONTENTVIEW_3D._3dAction == CONTENTVIEW_3D._3dActionType.TouchStart_MouseDown){
CONTENTVIEW_3D.OnMouseDown3D(id, imagePt, tmpX, tmpY, tempRatioWidth2, tempRatioHeight2);
}
else if(CONTENTVIEW_3D._3dAction == CONTENTVIEW_3D._3dActionType.TouchMove_MouseMove){
CONTENTVIEW_3D.OnMouseMove3D(id, imagePt, tmpX, tmpY, tmpW, tmpH, hCnt, vCnt, tempRatioWidth2, tempRatioHeight2);
}
else if(CONTENTVIEW_3D._3dAction == CONTENTVIEW_3D._3dActionType.TouchEnd_MouseUp){
CONTENTVIEW_3D.OnMouseEnd3D(id, hCnt, vCnt);
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -664,8 +664,8 @@ CONTENTVIEW_CREATEOBJECT.object3d = function (mediaType, actionType, id, imageUr
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
}
}
};
};
CONTENTVIEW_CREATEOBJECT.object3d.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
......@@ -686,12 +686,12 @@ CONTENTVIEW_CREATEOBJECT.text.prototype = new CONTENTVIEW_CREATEOBJECT.PageObjec
CONTENTVIEW_CREATEOBJECT.listImage = function (mediaType, id, imageUrl, x, y, w, h, visible, imageObjects, triggerType, objectId) {
this.setup(mediaType, null, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
if (triggerType == '1') {
//abe
//alert("listImage triggerType=1");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -708,7 +708,7 @@ CONTENTVIEW_CREATEOBJECT.listImage = function (mediaType, id, imageUrl, x, y, w,
objectLog.locationWidth = w;
//COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
CONTENTVIEW_GENERAL.mediaType4_changeImage++;
/* check index bigger than length object */
......@@ -725,7 +725,7 @@ CONTENTVIEW_CREATEOBJECT.listImage = function (mediaType, id, imageUrl, x, y, w,
imageObj.onload = function () {
var canvasObject = document.getElementById("offscreen");
var contextObject = canvasObject.getContext("2d");
//#11478
var canvasWidth = $('#offscreen').width();
var canvasHeight = $('#offscreen').height();
......@@ -741,12 +741,12 @@ CONTENTVIEW_CREATEOBJECT.listImage = function (mediaType, id, imageUrl, x, y, w,
var tmpY = y * tempRatioHeight;
var tmpW = w * tempRatioWidth;
var tmpH = h * tempRatioHeight;
contextObject.drawImage(imageObj, tmpX, tmpY, tmpW, tmpH);
CONTENTVIEW.flip();
};
imageObj.src = imageObjects[CONTENTVIEW_GENERAL.mediaType4_changeImage].fileName;
}
};
};
......@@ -756,7 +756,7 @@ CONTENTVIEW_CREATEOBJECT.listImage.prototype = new CONTENTVIEW_CREATEOBJECT.Page
CONTENTVIEW_CREATEOBJECT.listVideo = function (mediaType, id, imageUrl, x, y, w, h, visible, videoObjects, objectId) {
this.setup(mediaType, null, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
//abe
//alert("listVideo");
};
};
......@@ -766,7 +766,7 @@ CONTENTVIEW_CREATEOBJECT.listVideo.prototype = new CONTENTVIEW_CREATEOBJECT.Page
CONTENTVIEW_CREATEOBJECT.trigger = function (mediaType, actionType, id, imageUrl, x, y, w, h, index, target, visible, actionFunction, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, null, objectId);
this.action = function () {
// draw object
// draw object
//abe
//alert("trigger:" + CONTENTVIEW_GETDATA.getPageIndex() + " id:" + id);
......@@ -799,51 +799,51 @@ CONTENTVIEW_CREATEOBJECT.trigger = function (mediaType, actionType, id, imageUrl
} else { /* video */
CONTENTVIEW.stopAllAudio();
CONTENTVIEW.showVideoObject(CONTENTVIEW.objType4_5[nIndex].x, CONTENTVIEW.objType4_5[nIndex].y, CONTENTVIEW.objType4_5[nIndex].width, CONTENTVIEW.objType4_5[nIndex].height, CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].fileName, false);
if(ClientData.isStreamingMode() || ClientData.isGetitsMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPage");
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPage");
if (myVideo.paused)
{
myVideo.play();
}
}
}
//詳細ログ用 動画なのでダミーで１以上
objectLog.actionTime = "1";
//リソースID
objectLog.resourceId = CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].resourceId;
}
break;
}
}
}
//詳細ログ格納
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
};
};
CONTENTVIEW_CREATEOBJECT.trigger.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//Start Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
//Start Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
CONTENTVIEW_CREATEOBJECT.htmlLinkButton = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, resourceUrl, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
//alert("htmlLinkButton");
//CONTENTVIEW_STREAMING.debugLog("htmlLinkButton:" + resourceUrl + ":" + objectId);
/*stop audio on page */
CONTENTVIEW.stopAllAudio();
if (resourceUrl != "") {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -860,10 +860,10 @@ CONTENTVIEW_CREATEOBJECT.htmlLinkButton = function (mediaType, actionType, id, i
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
CONTENTVIEW_CREATEOBJECT.showHtml(resourceUrl, objectId );
CONTENTVIEW_GENERAL.showDialog(true);
}
}
};
};
CONTENTVIEW_CREATEOBJECT.htmlLinkButton.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
......@@ -872,49 +872,49 @@ CONTENTVIEW_CREATEOBJECT.showHtml = function(url, objectId ){
//abe
//alert("showHtml");
var $container = $('#dialog');
$container.html('');
$container.attr('style', 'background-color: white; width:100%; left:0% !important');
$container.attr('style', 'background-color: white; width:100%; left:0% !important');
//START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
$container.html(
'<h1>'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
'<h1>'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
+ '</h1>'
+ '<div id="html-wrap" style="height: 95%; position: absolute; width: 100%;">'
+ '<iframe src="'+ url +'" style="position: absolute; width: 100%; height: 100%; ">'
+ '</iframe>'
+ '</div>'
);
$('#html-wrap').css('overflow', 'scroll');
$('#html-wrap').css('-webkit-overflow-scrolling', 'touch');
}
else{
$container.html(
'<h1>'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
'<h1>'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
+ '</h1>'
+ '<iframe src="'+ url +'" style="position: absolute; width: 100%; height: 95%; ">'
+ '</iframe>'
);
}
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
/*
$('#dialog h1 img').click(function(){
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime );
$container.removeAttr('style');
CONTENTVIEW_GENERAL.hideDialog();
});
*/
$("#dialog h1 img").on({
......@@ -923,7 +923,7 @@ CONTENTVIEW_CREATEOBJECT.showHtml = function(url, objectId ){
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime );
$container.removeAttr('style');
CONTENTVIEW_GENERAL.hideDialog();
},
......@@ -932,16 +932,16 @@ CONTENTVIEW_CREATEOBJECT.showHtml = function(url, objectId ){
return false;
}
});
var dateStart = new Date();
};
CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, questionNo, replyLimit, fullscreen, saveAs, resourceId, enquete, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -958,29 +958,29 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl,
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
/*stop audio on page */
CONTENTVIEW.stopAllAudio();
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
if(ClientData.isStreamingMode()){
//ストリーミング
url = url + "&isStreaming=true";
}
var isFullScreen = false;
if(parseInt(fullscreen) == 1){
isFullScreen = true;
}
CONTENTVIEW_ANKET.showAnket(url, isFullScreen, objectId);
CONTENTVIEW_GENERAL.showDialog(true);
};
};
CONTENTVIEW_CREATEOBJECT.anket.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
/* mediaType=3 Audio object : extends PageObject */
CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, audioFile, audioResourceId, playType, objectId) {
......@@ -988,10 +988,10 @@ CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, image
if (playType == "0") {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
//alert("audioType3_0");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1008,7 +1008,7 @@ CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, image
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
CONTENTVIEW_CREATEOBJECT.createAudio(audioFile, playType);
};
}
......@@ -1018,10 +1018,10 @@ CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, image
//
}
else{
//abe
//alert("audioType3_x");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1038,7 +1038,7 @@ CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, image
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
CONTENTVIEW_CREATEOBJECT.createAudio(audioFile, playType);
}
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
......@@ -1054,10 +1054,10 @@ CONTENTVIEW_CREATEOBJECT.audioType3.prototype = new CONTENTVIEW_CREATEOBJECT.Pag
CONTENTVIEW_CREATEOBJECT.jumpPage = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, jumpPage, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
//alert("jumpPage");
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1074,7 +1074,7 @@ CONTENTVIEW_CREATEOBJECT.jumpPage = function (mediaType, actionType, id, imageUr
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
if ((Number(jumpPage) - 1) != CONTENTVIEW_GETDATA.getPageIndex()) {
CONTENTVIEW_EVENTS.createLockLayout(true);
CONTENTVIEW.changePage(Number(jumpPage) - 1);
......@@ -1087,12 +1087,12 @@ CONTENTVIEW_CREATEOBJECT.jumpPage.prototype = new CONTENTVIEW_CREATEOBJECT.PageO
CONTENTVIEW_CREATEOBJECT.sendMail = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, emailSubject, emailAddress, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//ストリーミングなら反応しない
if(ClientData.isStreamingMode()){
return;
}
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1109,7 +1109,7 @@ CONTENTVIEW_CREATEOBJECT.sendMail = function (mediaType, actionType, id, imageUr
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
CONTENTVIEW_POPUPTEXT.MailTo(emailAddress, emailSubject);
};
};
......@@ -1119,10 +1119,10 @@ CONTENTVIEW_CREATEOBJECT.sendMail.prototype = new CONTENTVIEW_CREATEOBJECT.PageO
CONTENTVIEW_CREATEOBJECT.openPopUp = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, content, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
//alert("openPopUp:" + CONTENTVIEW_GETDATA.getPageIndex() + " id:" + objectId);
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1139,7 +1139,7 @@ CONTENTVIEW_CREATEOBJECT.openPopUp = function (mediaType, actionType, id, imageU
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
CONTENTVIEW_GENERAL.isOpenPopUpText = true;
var pt1 = CONTENTVIEW.imageToScreen(x, y + h / 2);
......@@ -1158,7 +1158,7 @@ CONTENTVIEW_CREATEOBJECT.openPopUp.prototype = new CONTENTVIEW_CREATEOBJECT.Page
CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, contentId, pageNo, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1175,68 +1175,68 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
///* set end log */
//COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
//COMMON.RegisterLog();
//START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
var params = {
contentId: contentId,
sid: CONTENTVIEW.getSessionId(),
getType: 1,
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
params,
function (data) {
/* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog();
if(data.contentData.alertMessageLevel){
if(data.contentData.alertMessageLevel){
if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
if(data.contentData.alertMessage){
if(data.contentData.alertMessage){
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() };
CONTENTVIEW_CREATEOBJECT.moveContentParam = {};
CONTENTVIEW_CREATEOBJECT.moveContentParam = {};
CONTENTVIEW_CREATEOBJECT.moveContentParam = {
'preContentId' : contentId,
'prePageNo' : pageNo,
'oldContent' : oldContent
};
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage);
};
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel, data.contentData.alertMessage);
}
}
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.RequirePassword){
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() };
CONTENTVIEW_CREATEOBJECT.moveContentParam = {};
CONTENTVIEW_CREATEOBJECT.moveContentParam = {
'preContentId' : contentId,
'prePageNo' : pageNo,
'oldContent' : oldContent
};
};
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog(data.contentData.alertMessageLevel);
}
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
ClientData.common_preContentId(contentId);
ClientData.common_prePageNo(pageNo);
/* store old page */
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() };
var dataJump = ClientData.JumpQueue();
/* store old page */
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() };
var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent);
ClientData.JumpQueue(dataJump);
if(ClientData.isStreamingMode()){
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
......@@ -1253,13 +1253,13 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
else{
ClientData.common_preContentId(contentId);
ClientData.common_prePageNo(pageNo);
/* store old page */
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() };
var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent);
/* store old page */
var oldContent = { oldContentID: CONTENTVIEW_GENERAL.contentID, oldPageIndex: CONTENTVIEW_GETDATA.getPageIndex() };
var dataJump = ClientData.JumpQueue();
dataJump.push(oldContent);
ClientData.JumpQueue(dataJump);
if(ClientData.isStreamingMode()){
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
......@@ -1271,7 +1271,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
}
}
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
if (xmlHttpRequest.status == 404) {
......@@ -1283,15 +1283,15 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
}
}
);
//END TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
//END TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
};
};
CONTENTVIEW_CREATEOBJECT.moveToContent.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
//START TRB00033 - EDITOR: Long - Date : 09/12/2013 - Summary : limit content
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg) {
CONTENTVIEW_CREATEOBJECT.showContentConfirmDialog = function(type, msg) {
if(type == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.ShowAlert){
CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog(msg);
CONTENTVIEW_GENERAL.showDialog(true);
......@@ -1311,31 +1311,31 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
$container.html(
' <h1 class="lang" lang="txtContentWarning">'+ I18N.i18nText("txtContentWarning") +'</h1>'
+' <p class="message">'
+ msg
+ msg
+' </p>'
+' <p class="deletebtn">'
+' <a lang="dspOK" class="ok lang" id="contentAlertOk">ＯＫ</a>'
+' <a lang="dspCancel" class="cancel lang" id="contentAlertCancel">キャンセル</a>'
+' </p>'
);
$container.center();
);
$container.center();
$('#dialog a#contentAlertCancel').click(function(){
CONTENTVIEW_GENERAL.hideDialog();
CONTENTVIEW_GENERAL.hideDialog();
var removeTimeOut = setTimeout(function(){
$container.removeClass('sectionLimitAccess');
}, 200);
}, 200);
});
$('#dialog a#contentAlertOk').click(function(){
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
/* store old page */
var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
/* store old page */
var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
ClientData.JumpQueue(dataJump);
if(ClientData.isStreamingMode()){
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
......@@ -1346,7 +1346,7 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
CONTENTVIEW.screenMove();
}
}
});
};
......@@ -1360,24 +1360,24 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
+' <p class="message">'
+' <label class="text lang" lang="txtContentPWMsg">'+ I18N.i18nText("txtContentPWMsg") +'</label>'
+' <input type="password" />'
+' <label class="error" id="lblMessageLimitError"></label> '
+' <label class="error" id="lblMessageLimitError"></label> '
+' </p>'
+' <p class="deletebtn">'
+' <a lang="dspOK" class="ok lang" id="contentAlertOk">ＯＫ</a>'
+' <a lang="dspCancel" class="cancel lang" id="contentAlertCancel">キャンセル</a>'
+' </p>'
);
$container.center();
);
$container.center();
$('#dialog a#contentAlertCancel').click(function(){
CONTENTVIEW_GENERAL.hideDialog();
CONTENTVIEW_GENERAL.hideDialog();
var removeTimeOut = setTimeout(function(){
$container.removeClass('sectionLimitAccess');
}, 200);
});
$('#dialog a#contentAlertOk').click(
function () {
var password = $('.sectionLimitAccess .message input').val();
......@@ -1399,21 +1399,21 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
AVWEB.avwCmsApiSyncWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params,
function (data) {
if (data.result == 'success') {
if (data.result == 'success') {
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
/* store old page */
var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
ClientData.JumpQueue(dataJump);
/* store old page */
var dataJump = ClientData.JumpQueue();
dataJump.push(CONTENTVIEW_CREATEOBJECT.moveContentParam.oldContent);
ClientData.JumpQueue(dataJump);
// update sid id
ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
//バックアップにも保持
ClientData.userInfo_sid_local_bak(data.sid);
if(ClientData.isStreamingMode()){
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
......@@ -1447,10 +1447,10 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, embed, objectId);
this.action = function () {
//abe
//alert("videoType2:" + CONTENTVIEW_GETDATA.getPageIndex());
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1467,23 +1467,23 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
/*stop audio on page */
CONTENTVIEW.stopAllAudio();
if (embed == "1") {
CONTENTVIEW.showVideoObject(x, y, w, h, mediaFile, false);
if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPage");
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPage");
if (myVideo.paused)
{
myVideo.play();
}
}
}
}
}
else {
if (media != '') {
$('#playvideo').children().remove();
......@@ -1503,7 +1503,7 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
return false;
}
});
//必要か　ここから
CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchstart', function(){},false);
CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchmove', function(){},false);
......@@ -1511,12 +1511,12 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchstart', function(){return false;}, false);
CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchmove', function(){return false;}, false);
CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchend', function(){return false;}, false);
$("#canvasWrapper").unbind('click');
$("#canvasWrapper").unbind('touchstart');
$("#canvasWrapper").unbind('touchmove');
$("#canvasWrapper").unbind('touchend');
document.getElementById('main').addEventListener('click', function(){return false;}, false);
document.getElementById('main').addEventListener('touchstart', function(){return false;}, false);
document.getElementById('main').addEventListener('touchmove', function(){return false;}, false);
......@@ -1524,21 +1524,21 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
document.getElementById('canvasWrapper').addEventListener('click', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchstart', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchmove', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchend', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchend', function(){return false;}, false);
//必要か　ここまで
CONTENTVIEW_GENERAL.showDialog(true);
if(ClientData.isStreamingMode() || CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPopUp");
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPopUp");
if (myVideo.paused)
{
myVideo.play();
}
}
}
}
}
};
......@@ -1558,9 +1558,9 @@ CONTENTVIEW_CREATEOBJECT.imageNoAction.prototype = new CONTENTVIEW_CREATEOBJECT.
CONTENTVIEW_CREATEOBJECT.videoType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, mediaFile, media, mediaResourceId, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
if (media != '') {
//abe
//alert("videoType1:" + CONTENTVIEW_GETDATA.getPageIndex());
//詳細ログ作成
......@@ -1579,7 +1579,7 @@ CONTENTVIEW_CREATEOBJECT.videoType1 = function (mediaType, actionType, id, image
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
/* stop all audio on page */
CONTENTVIEW.stopAllAudio();
......@@ -1602,12 +1602,12 @@ CONTENTVIEW_CREATEOBJECT.videoType1 = function (mediaType, actionType, id, image
}
});
CONTENTVIEW_GENERAL.showDialog(true);
}
//時間記録
var dateStart = new Date();
};
};
CONTENTVIEW_CREATEOBJECT.videoType1.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
......@@ -1616,7 +1616,6 @@ CONTENTVIEW_CREATEOBJECT.videoType1.prototype = new CONTENTVIEW_CREATEOBJECT.Pag
CONTENTVIEW_CREATEOBJECT.audioType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, audioFile, audio, audioResourceId, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
this.action = function () {
//abe
//alert("audioType1");
//詳細ログ作成
......@@ -1635,7 +1634,7 @@ CONTENTVIEW_CREATEOBJECT.audioType1 = function (mediaType, actionType, id, image
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
CONTENTVIEW_CREATEOBJECT.createAudio(audioFile, "0")
};
};
......@@ -1645,15 +1644,15 @@ CONTENTVIEW_CREATEOBJECT.audioType1.prototype = new CONTENTVIEW_CREATEOBJECT.Pag
CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, linkUrl, browserType, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, null, objectId);
this.action = function () {
//abe
//alert("linkURL");
//デフォルトでストリーミングなら表示しない
if( browserType == 1 && ClientData.isStreamingMode()){
return;
}
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
......@@ -1670,21 +1669,21 @@ CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
var linkUrlTmp = linkUrl;
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl ;
}
if( browserType == 0 ){
CONTENTVIEW_CREATEOBJECT.showHtml(linkUrlTmp, objectId );
CONTENTVIEW_GENERAL.showDialog(true);
} else {
window.open(linkUrlTmp, "_blank", "new window, scrollbars=yes");
}
};
};
CONTENTVIEW_CREATEOBJECT.linkURL.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
......@@ -1710,7 +1709,7 @@ CONTENTVIEW_CREATEOBJECT.imagePreview = function (mediaType, actionType, id, ima
objectLog.locationY = y;
objectLog.locationHeight = h;
objectLog.locationWidth = w;
//プレビュー画像のリソースIDカンマ区切りでセット
var actionVal = "";
if(imagePreviewResourceIds){
......@@ -1722,7 +1721,7 @@ CONTENTVIEW_CREATEOBJECT.imagePreview = function (mediaType, actionType, id, ima
}
}
objectLog.actionValue = actionVal;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
......@@ -1732,14 +1731,14 @@ CONTENTVIEW_CREATEOBJECT.imagePreview = function (mediaType, actionType, id, ima
$("#btnClose").on({
'click touchend': function(ev){
//時間記録
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime );
CONTENTVIEW_GENERAL.hideDialog();
return false;
},
'touchstart touchmove': function(){
......@@ -1747,12 +1746,12 @@ CONTENTVIEW_CREATEOBJECT.imagePreview = function (mediaType, actionType, id, ima
return false;
}
});
CONTENTVIEW_GENERAL.showDialog(true);
//時間記録
var dateStart = new Date();
};
};
CONTENTVIEW_CREATEOBJECT.imagePreview.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
......@@ -1781,7 +1780,7 @@ CONTENTVIEW_CREATEOBJECT.Rect.prototype.center = function () {
};
/**
* Content Class Definition
* Content Class Definition
*/
CONTENTVIEW_CREATEOBJECT.Content = function () {
......@@ -1832,7 +1831,7 @@ CONTENTVIEW_CREATEOBJECT.Content.prototype.hasNextPage = function () {
CONTENTVIEW_CREATEOBJECT.Content.prototype.nextPage = function () {
this.pageIndex++;
if (this.pageIndex > (this.pageCount - 1)) {
this.pageIndex = this.pageCount - 1;
}
this.setUpPage(this.pageIndex, 1);
......@@ -1864,7 +1863,7 @@ CONTENTVIEW_CREATEOBJECT.Content.prototype.toPage = function (index) {
this.pageIndex = 0;
}
this.setUpPage(this.pageIndex);
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
CONTENTVIEW_CREATEOBJECT.createPageBGM();
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
......@@ -1872,17 +1871,17 @@ CONTENTVIEW_CREATEOBJECT.Content.prototype.toPage = function (index) {
};
/**
* Transition Class Definition
* Transition Class Definition
*/
CONTENTVIEW_CREATEOBJECT.Transition = function(){ };
//Start Functon : No.4 - Editor : Long - Date : 08/09/2013 - Summary :
//Start Functon : No.4 - Editor : Long - Date : 08/09/2013 - Summary :
/* Flip Next Page Transition */
CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
//#12373
var tmpScale = 1;
var w = $('#canvasWrapper').width();
CONTENTVIEW.removeObject();
if(CONTENTVIEW_GENERAL.animateType == CONTENTVIEW_GENERAL.animateTypeKeys.Type_FadeIn){
......@@ -1893,61 +1892,61 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
else{
$('#mainNext').css('display', 'block');
}
if (CONTENTVIEW_GETDATA.getContent().hasNextPage()) {
tmpScale = CONTENTVIEW.userScale;
CONTENTVIEW.userScale = 1;
CONTENTVIEW.flip(1);
if(CONTENTVIEW_GENERAL.animateType == CONTENTVIEW_GENERAL.animateTypeKeys.Type_Slide){
$('#canvasWrapper').stop(true).animate(
{ left: '-' + w + 'px' },
{
duration: CONTENTVIEW_GENERAL.animatePeriod,
complete: function () {
complete: function () {
CONTENTVIEW_GETDATA.assignCurrentContentPage(1);
//Change id of canvas
CONTENTVIEW_GETDATA.switchCanvas(1);
//restore canvas event
CONTENTVIEW.setDefaultEvent();
//init image bookmark
//init image bookmark
CONTENTVIEW_INITOBJECT.initImageBookmark();
//Change slider
CONTENTVIEW.changeSlider(CONTENTVIEW_GETDATA.getContent().pageIndex);
//Draw marking on current screen
//CONTENTVIEW.drawMarkingOnScreen();
//CONTENTVIEW.drawMarkingOnScreen();
//Correct position of canvas for next flipping
CONTENTVIEW_GETDATA.correctCanvasPosition();
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
CONTENTVIEW_CREATEOBJECT.createPageBGM();
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
if(CONTENTVIEW_GETDATA.getPageIndex() < CONTENTVIEW_GENERAL.totalPage - 1){
//Get Next Page Object
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GETDATA.getPageIndex() + 1);
//Load Next
CONTENTVIEW_GETDATA.renderNextPage();
CONTENTVIEW_GETDATA.renderNextPage();
}else{
//Enable all control
CONTENTVIEW_GENERAL.enableAllControl();
CONTENTVIEW_GENERAL.enableAllControl();
$('#divImageLoading').css('display', 'none');
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
}
/* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking();
/* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') {
......@@ -1962,7 +1961,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_EVENTS.createLockLayout(false);
CONTENTVIEW_INITOBJECT.initImageCheckMarking();
//#12373
//console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) {
......@@ -1971,56 +1970,56 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
CONTENTVIEW.flip();
CONTENTVIEW.checkDisableButtonZoom();
}
}
});
}
else if(CONTENTVIEW_GENERAL.animateType == CONTENTVIEW_GENERAL.animateTypeKeys.Type_FadeIn){
$('#main').stop(true).fadeOut(
{
{
duration: CONTENTVIEW_GENERAL.animatePeriod,
complete: function () {
complete: function () {
CONTENTVIEW_GETDATA.assignCurrentContentPage(1);
//Change id of canvas
CONTENTVIEW_GETDATA.switchCanvas(1);
//restore canvas event
CONTENTVIEW.setDefaultEvent();
//init image bookmark
//init image bookmark
CONTENTVIEW_INITOBJECT.initImageBookmark();
//Change slider
CONTENTVIEW.changeSlider(CONTENTVIEW_GETDATA.getContent().pageIndex);
//Draw marking on current screen
//CONTENTVIEW.drawMarkingOnScreen();
//CONTENTVIEW.drawMarkingOnScreen();
//Correct position of canvas for next flipping
CONTENTVIEW_GETDATA.correctCanvasPosition();
if(CONTENTVIEW_GETDATA.getPageIndex() < CONTENTVIEW_GENERAL.totalPage - 1){
//Get Next Page Object
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GETDATA.getPageIndex() + 1);
//Load Next
CONTENTVIEW_GETDATA.renderNextPage();
}
else{
//Enable all control
CONTENTVIEW_GENERAL.enableAllControl();
CONTENTVIEW_GENERAL.enableAllControl();
$('#divImageLoading').css('display', 'none');
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
}
/* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking();
/* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') {
......@@ -2038,7 +2037,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
}
});
}
CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMarking();
}
};
/* Flip Previous Page Transition */
......@@ -2058,39 +2057,39 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
$('#mainPre').css('display', 'block');
}
if (CONTENTVIEW_GETDATA.getContent().hasPreviousPage()) {
tmpScale = CONTENTVIEW.userScale;
CONTENTVIEW.userScale = 1;
CONTENTVIEW.flip(2);
if(CONTENTVIEW_GENERAL.animateType == CONTENTVIEW_GENERAL.animateTypeKeys.Type_Slide){
$('#canvasWrapper').stop(true).animate(
{ left: w + 'px' },
{
duration: CONTENTVIEW_GENERAL.animatePeriod,
complete: function () {
complete: function () {
CONTENTVIEW_GETDATA.assignCurrentContentPage(2);
//Change id of canvas
CONTENTVIEW_GETDATA.switchCanvas(2);
//restore canvas event
CONTENTVIEW.setDefaultEvent();
//init image bookmark
//init image bookmark
CONTENTVIEW_INITOBJECT.initImageBookmark();
//Change slider
CONTENTVIEW.changeSlider(CONTENTVIEW_GETDATA.getContent().pageIndex);
//Draw marking on current screen
//CONTENTVIEW.drawMarkingOnScreen();
//CONTENTVIEW.drawMarkingOnScreen();
//Correct position of canvas for next flipping
CONTENTVIEW_GETDATA.correctCanvasPosition();
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
CONTENTVIEW_CREATEOBJECT.createPageBGM();
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
if(CONTENTVIEW_GETDATA.getPageIndex() > 0){
......@@ -2100,14 +2099,14 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
CONTENTVIEW_GETDATA.renderPrevPage();
}else{
//Enable all control
CONTENTVIEW_GENERAL.enableAllControl();
CONTENTVIEW_GENERAL.enableAllControl();
$('#divImageLoading').css('display', 'none');
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
}
/* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking();
/* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') {
......@@ -2118,12 +2117,12 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
} else {
document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle');
}
/* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_EVENTS.createLockLayout(false);
CONTENTVIEW_INITOBJECT.initImageCheckMarking();
//#12373
//console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) {
......@@ -2132,7 +2131,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
CONTENTVIEW.flip();
CONTENTVIEW.checkDisableButtonZoom();
}
}
});
}
......@@ -2140,46 +2139,46 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
$('#main').stop(true).fadeOut(
{
duration: CONTENTVIEW_GENERAL.animatePeriod,
complete: function () {
complete: function () {
CONTENTVIEW_GETDATA.assignCurrentContentPage(2);
//Change id of canvas
CONTENTVIEW_GETDATA.switchCanvas(2);
//restore canvas event
CONTENTVIEW.setDefaultEvent();
//init image bookmark
//init image bookmark
CONTENTVIEW_INITOBJECT.initImageBookmark();
//Change slider
CONTENTVIEW.changeSlider(CONTENTVIEW_GETDATA.getContent().pageIndex);
//Draw marking on current screen
//CONTENTVIEW.drawMarkingOnScreen();
//CONTENTVIEW.drawMarkingOnScreen();
//Correct position of canvas for next flipping
CONTENTVIEW_GETDATA.correctCanvasPosition();
if(CONTENTVIEW_GETDATA.getPageIndex() > 0){
//Get Next Page Object
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GETDATA.getPageIndex() - 1);
//Load Next
CONTENTVIEW_GETDATA.renderPrevPage();
}else{
//Enable all control
CONTENTVIEW_GENERAL.enableAllControl();
CONTENTVIEW_GENERAL.enableAllControl();
$('#divImageLoading').css('display', 'none');
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
}
/* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking();
/* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') {
......@@ -2197,10 +2196,10 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
}
});
}
}
};
//Start Functon : No.4 - Editor : Long - Date : 08/09/2013 - Summary :
//Start Functon : No.4 - Editor : Long - Date : 08/09/2013 - Summary :
/* Flip Page Transition */
CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
......@@ -2208,10 +2207,10 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
var tmpScale = CONTENTVIEW.userScale;
var w = $('#main').attr('width');
if (index == CONTENTVIEW_GETDATA.getContent().pageIndex) {
/* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking();
CONTENTVIEW_INITOBJECT.initDisplayMarking();
} else if (index < CONTENTVIEW_GETDATA.getContent().pageIndex) {
CONTENTVIEW_GENERAL.context_main.clearRect(0, 0, CONTENTVIEW_GENERAL.canvas_main.width, CONTENTVIEW_GENERAL.canvas_main.height);
CONTENTVIEW.removeObject();
......@@ -2233,39 +2232,39 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
CONTENTVIEW.userScale = 1;
CONTENTVIEW.userScaleNow = 1;
//START TRB00097
//CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
//CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.srcRect = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.srcRectNext = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.srcRectPrev = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.destRect = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.destRectNext = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.destRectPrev = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
//END TRB00097
//END TRB00097
CONTENTVIEW.checkDisableButtonZoom();
CONTENTVIEW_GETDATA.getContent().toPage(index);
CONTENTVIEW_GETDATA.getContent().toPage(index);
if(index > 0){
CONTENTVIEW_GENERAL.prevContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, index - 1);
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, index - 1);
CONTENTVIEW_GETDATA.renderPrevPage();
}
if(index < CONTENTVIEW_GENERAL.totalPage - 1){
CONTENTVIEW_GENERAL.nextContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, index + 1);
CONTENTVIEW_GETDATA.renderNextPage();
}
CONTENTVIEW_INITOBJECT.initImageBookmark();
CONTENTVIEW.checkExistNextPrePage();
CONTENTVIEW.changeSlider(index);
/* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking();
/* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[index]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[index]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[index] != '') {
document.title = CONTENTVIEW_GENERAL.contentName + '_' + CONTENTVIEW_GENERAL.dataPageTitle[index] + ' | ' + I18N.i18nText('sysAppTitle');
} else {
......@@ -2277,9 +2276,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
/* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_EVENTS.createLockLayout(false);
//#12373
//console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) {
......@@ -2287,11 +2286,11 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip();
}
}
}
);
}
}
else {
CONTENTVIEW_GENERAL.context_main.clearRect(0, 0, CONTENTVIEW_GENERAL.canvas_main.width, CONTENTVIEW_GENERAL.canvas_main.height);
CONTENTVIEW.removeObject();
......@@ -2312,26 +2311,26 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
//change pageIndex and image bookmark
CONTENTVIEW.userScale = 1;
//START TRB00097
//CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
//CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.srcRect = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.srcRectNext = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.srcRectPrev = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.destRect = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.destRectNext = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
CONTENTVIEW.destRectPrev = new CONTENTVIEW_CREATEOBJECT.Rect(0, 0, 0, 0);
//END TRB00097
//END TRB00097
CONTENTVIEW.checkDisableButtonZoom();
CONTENTVIEW_GETDATA.getContent().toPage(index);
CONTENTVIEW_GETDATA.getContent().toPage(index);
if(index > 0){
CONTENTVIEW_GENERAL.prevContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, index - 1);
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, index - 1);
CONTENTVIEW_GETDATA.renderPrevPage();
}
if(index < CONTENTVIEW_GENERAL.totalPage - 1){
CONTENTVIEW_GENERAL.nextContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, index + 1);
......@@ -2356,9 +2355,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
/* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_EVENTS.createLockLayout(false);
//#12373
//console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) {
......@@ -2366,11 +2365,11 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip();
}
}
});
}
}
};
CONTENTVIEW_CREATEOBJECT.createTextConfirmAudio = function() {
......@@ -2384,8 +2383,7 @@ CONTENTVIEW_CREATEOBJECT.createTextConfirmAudio = function() {
CONTENTVIEW_CREATEOBJECT.createPage = function(pageNumber, pageImage, pageObjects, onCompleteFunc) {
//abe 次のページを作成している
//console.log("CreateObj_createPage:" + pageNumber)
console.log("CreateObj_createPage:" + pageNumber);
var page = new CONTENTVIEW.ContentPage(pageNumber, pageImage);
/* add page Object */
//Start Function: No.12
......@@ -2395,7 +2393,7 @@ CONTENTVIEW_CREATEOBJECT.createPage = function(pageNumber, pageImage, pageObject
//End Function: No.12
/* load page */
page.load(onCompleteFunc);
return page;
};
......@@ -2418,7 +2416,7 @@ CONTENTVIEW_CREATEOBJECT.createVideoFulScreen = function(video, id) {
$('#dialog').css('box-shadow', '0px 0px 3px 1px #666');
$('#dialog').css('border', 'solid 1px #666');
$('#dialog').draggable({ handle: "h1" });
$('#dialog').children().remove();
if (ClientData.userOpt_videoMode() == "1") {/* loop video */
$('#dialog').html(
......@@ -2452,9 +2450,26 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
// if(CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox'){
// audio = audio.replace("webResourceDownload/", "webResourceDownload");
// }
if (audio != '') {
if (type == "0") { /* play when click */
//
if($('#play_audio_0').length){
//pouseできるようにする
var myAudio=document.getElementById("play_audio_0");
if (myAudio.paused)
{
myAudio.play();
} else {
myAudio.pause();
}
//CONTENTVIEW.stopAllAudio();
return;
}
CONTENTVIEW.stopAllAudio();
CONTENTVIEW.TypeAudio0 = type;
......@@ -2473,11 +2488,22 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
' </audio>'
);
} else {
$('#playaudio').html(
//既に再生中か判定
$('#playaudio').html(
' <audio id="play_audio_0" loop="loop" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>'
);
/* $('#playaudio').html(
' <audio id="play_audio_0" loop="loop" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>'
);
);*/
}
} else {
......@@ -2506,18 +2532,18 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
document.getElementById("play_audio_0").load();
document.getElementById("play_audio_0").play();
}
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myAudio=document.getElementById("play_audio_0");
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myAudio=document.getElementById("play_audio_0");
if (myAudio.paused)
{
myAudio.play();
}
}
}
else if (type == "1") { /* play all page */
}
else if (type == "1") { /* play all page */
if (document.getElementById("play_audio_1") != undefined) {
if (ClientData.userOpt_musicMode() == "1") {
......@@ -2526,12 +2552,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
$('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
);*/
}
}
else {
if(!CONTENTVIEW.isPendingContentBGM){
document.getElementById("play_audio_1").play();
}
}
}
}
else {
......@@ -2547,27 +2573,27 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
}
}
}
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
// var myAudio=document.getElementById("play_audio_1");
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
// var myAudio=document.getElementById("play_audio_1");
// if (myAudio.paused)
// {
// myAudio.play();
// }
//}
}
}
else {
CONTENTVIEW.TypeAudio1 = type;
CONTENTVIEW.srcAudioType1 = audio;
if (ClientData.userOpt_musicMode() == "1") {
if (ClientData.userOpt_musicMode() == "1") {
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
// $('#playaudioallpage').html(
// ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
// );
//
//}
//}
//else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
$('#playaudioallpage').html(
......@@ -2576,7 +2602,7 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
' </audio>'
);
}
else {
else {
if(CONTENTVIEW.isPendingContentBGM){
$('#playaudioallpage').html(
' <audio id="play_audio_1" loop="loop" >' +
......@@ -2585,7 +2611,7 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
);
document.getElementById('play_audio_1').load();
CONTENTVIEW.isPendingContentBGM = false;
}
else{
$('#playaudioallpage').html(
......@@ -2617,7 +2643,7 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
);
document.getElementById('play_audio_1').load();
CONTENTVIEW.isPendingContentBGM = false;
}
else{
$('#playaudioallpage').html(
......@@ -2656,11 +2682,11 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
}
//END TRB00069
}
}
}
else if (type == "2") { /* play on page */
else if (type == "2") { /* play on page */
if (document.getElementById("play_audio_2") == undefined) {
CONTENTVIEW.stopAllAudio();
......@@ -2722,11 +2748,11 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
document.getElementById('play_audio_2').play();
$("#bgmConfirm_page").hide();
});
$("#bgmConfirm_page").show();
$("#bgmConfirm_page").center();
}
}
}
}
......@@ -2738,24 +2764,24 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){
var currentPageObject = CONTENTVIEW_GETDATA.getContent().pageObjects;
var audioFile = '';
var playType = '';
$('#playaudiopage').html('');
for(var i = 0; i < currentPageObject.length; i++){
var BGMObject = currentPageObject[i];
if(BGMObject.mediaType == '3' && BGMObject.actionType=='2' && BGMObject.playType == '2'){
if(BGMObject.mediaType == '3' && BGMObject.actionType=='2' && BGMObject.playType == '2'){
audioFile = BGMObject.audioFile;
playType = BGMObject.playType;
CONTENTVIEW_CREATEOBJECT.createAudio(audioFile, playType);
break;
}
}
}
};
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
......
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