Skip to content

C
check
Commit 22f001de by Masaru Abe
Options

テスト対応

parent c48a078a
Showing with 199 additions and 165 deletions
abvw/common/js/avweb.js
...@@ -898,8 +898,13 @@ AVWEB.avwClearError = function() { ...@@ -898,8 +898,13 @@ AVWEB.avwClearError = function() {
}; };
/* ブラウザunload時に警告メッセージの出力設定を行う関数 */ /* ブラウザunload時に警告メッセージの出力設定を行う関数 */
AVWEB.avwSetLogoutNortice = function() { AVWEB.avwSetLogoutNortice = function() {
console.log("AVWEB.avwSetLogoutNortice:" + ClientData.serviceOpt_daihatsu());
window.onbeforeunload = function(event) { window.onbeforeunload = function(event) {
console.log("window.onbeforeunload");
//DHカスタム //DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){ if( ClientData.serviceOpt_daihatsu() == 'Y'){
if( "CONTENTVIEW_GENERAL.contentID" in window ){ if( "CONTENTVIEW_GENERAL.contentID" in window ){
......
abvw/css/layout/contentsearch.css
...@@ -150,7 +150,8 @@ ...@@ -150,7 +150,8 @@
} }
.cnt_section_list .text ul.pic li img { .cnt_section_list .text ul.pic li img {
position: relative; position: relative;
left: -18px; /*left: -18px;*/
left: 1px;
} }
.cnt_section_list .text ul.pic li a.read { .cnt_section_list .text ul.pic li a.read {
margin-top: 42px; margin-top: 42px;
......
abvw/css/layout/home.css
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
a:hover{ a:hover{
cursor: pointer; cursor: pointer;
} }
canvas:hover #main-ws canvas:hover
{ {
cursor: pointer; cursor: pointer;
} }
......
abvw/css/layout/list_shiori.css
...@@ -27,7 +27,7 @@ a ...@@ -27,7 +27,7 @@ a
font-size: 12px; font-size: 12px;
} }
.button{ float:right; margin-top:20px; margin-right:2px; } .button{ float:right; margin-top:20px; margin-right:2px; }
.delete { #ws-body .delete {
position: absolute; position: absolute;
top: 27px; top: 27px;
left: 20px; left: 20px;
...@@ -36,23 +36,24 @@ a ...@@ -36,23 +36,24 @@ a
padding: 2px 26px; padding: 2px 26px;
margin-left: 5px; margin-left: 5px;
}.delete:hover { }
#ws-body .delete:hover {
} }
.delete:active { #ws-body .delete:active {
/* position:relative; /* position:relative;
top:1px;*/ top:1px;*/
} }
a.delete:not(:target) { #ws-body a.delete:not(:target) {
/* background-image: url(button_back_off.svg);*/ /* background-image: url(button_back_off.svg);*/
} }
a.delete:hover:not(:target) { #ws-body a.delete:hover:not(:target) {
/* background-image: url(button_back_on.svg);*/ /* background-image: url(button_back_on.svg);*/
} }
.delete_hover { #ws-body .delete_hover {
display: inline-block; display: inline-block;
...@@ -60,9 +61,10 @@ a.delete:hover:not(:target) { ...@@ -60,9 +61,10 @@ a.delete:hover:not(:target) {
margin-left: 5px; margin-left: 5px;
background-position: center top; background-position: center top;
} }
.delete:hover:hover { #ws-body .delete:hover:hover {
}.delete:hover:active { }
#ws-body .delete:hover:active {
/* position:relative; /* position:relative;
top:1px;*/ top:1px;*/
} }
......
abvw/css/theme/home.css
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
a:hover{ a:hover{
} }
canvas:hover{ #main-ws canvas:hover{
} }
......
abvw/css/theme/list_shiori.css
...@@ -20,7 +20,7 @@ a ...@@ -20,7 +20,7 @@ a
font-size:12px; font-size:12px;
} }
.button{ } .button{ }
.delete { #ws-body .delete {
-moz-box-shadow: inset 0px 1px 0px 0px #C66; -moz-box-shadow: inset 0px 1px 0px 0px #C66;
-webkit-box-shadow: inset 0px 1px 0px 0px #C66; -webkit-box-shadow: inset 0px 1px 0px 0px #C66;
...@@ -40,27 +40,28 @@ a ...@@ -40,27 +40,28 @@ a
text-decoration: none; text-decoration: none;
background-position: center top; background-position: center top;
}.delete:hover { }
#ws-body .delete:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #CC0000), color-stop(1, #F33) ); background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #CC0000), color-stop(1, #F33) );
background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% ); background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33');
background-color:#F33; background-color:#F33;
} }
.delete:active { #ws-body .delete:active {
} }
a.delete:not(:target) { #ws-body a.delete:not(:target) {
filter: none; filter: none;
-ms-filter: none; -ms-filter: none;
/* background-image: url(button_back_off.svg);*/ /* background-image: url(button_back_off.svg);*/
} }
a.delete:hover:not(:target) { #ws-body a.delete:hover:not(:target) {
filter: none; filter: none;
-ms-filter: none; -ms-filter: none;
/* background-image: url(button_back_on.svg);*/ /* background-image: url(button_back_on.svg);*/
} }
.delete_hover { #ws-body .delete_hover {
-moz-box-shadow: inset 0px 1px 0px 0px #C66; -moz-box-shadow: inset 0px 1px 0px 0px #C66;
-webkit-box-shadow: inset 0px 1px 0px 0px #C66; -webkit-box-shadow: inset 0px 1px 0px 0px #C66;
box-shadow: inset 0px 1px 0px 0px #C66; box-shadow: inset 0px 1px 0px 0px #C66;
...@@ -81,12 +82,13 @@ a.delete:hover:not(:target) { ...@@ -81,12 +82,13 @@ a.delete:hover:not(:target) {
line-height: 20px; line-height: 20px;
background-position: center top; background-position: center top;
} }
.delete:hover:hover { #ws-body .delete:hover:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #CC0000), color-stop(1, #F33) ); background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #CC0000), color-stop(1, #F33) );
background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% ); background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33');
background-color:#F33; background-color:#F33;
}.delete:hover:active { }
#ws-body .delete:hover:active {
} }
......
abvw/js/bookmark.js
...@@ -95,6 +95,12 @@ $(document).ready(function () { ...@@ -95,6 +95,12 @@ $(document).ready(function () {
$("#dspTitleNmKn_Seperate").show(); $("#dspTitleNmKn_Seperate").show();
} }
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
}); });
/* /*
...@@ -641,7 +647,7 @@ BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pag ...@@ -641,7 +647,7 @@ BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pag
newRow +='<li>'; newRow +='<li>';
newRow += "<a class='read read_open lang' name='dspRead' value='{\"contentid\":\"" + contentid + "\", \"pageNo\":\"" + pageNo + "\", \"contentType\":\"" + contentType + "\" }' lang='txtRead'>" + I18N.i18nText('txtRead') + "</a>"; newRow += "<a class='read read_open lang' name='dspRead' value='{\"contentid\":\"" + contentid + "\", \"pageNo\":\"" + pageNo + "\", \"contentType\":\"" + contentType + "\" }' lang='txtRead'>" + I18N.i18nText('txtRead') + "</a>";
console.log("BOOKMARK.download[contentid]:" + BOOKMARK.download[contentid]); //console.log("BOOKMARK.download[contentid]:" + BOOKMARK.download[contentid]);
if( BOOKMARK.download[contentid] == '1' ){ if( BOOKMARK.download[contentid] == '1' ){
newRow += "<a class='read read_download' name='dspDownload' contentid='" + contentid + "'>ダウンロード</a>"; newRow += "<a class='read read_download' name='dspDownload' contentid='" + contentid + "'>ダウンロード</a>";
} }
...@@ -895,7 +901,7 @@ BOOKMARK.IsExistContent = function(strContentId) { ...@@ -895,7 +901,7 @@ BOOKMARK.IsExistContent = function(strContentId) {
result["isExisted"] = isExisted; result["isExisted"] = isExisted;
result["contentType"] = contentType; result["contentType"] = contentType;
console.log("API BOOKMARK.download:" + strContentId + ":" + data.download); //console.log("API BOOKMARK.download:" + strContentId + ":" + data.download);
// save content type // save content type
BOOKMARK.contentTypes[strContentId] = contentType; BOOKMARK.contentTypes[strContentId] = contentType;
......
abvw/js/contentsearch.js
...@@ -128,6 +128,12 @@ $(document).ready(function(){ ...@@ -128,6 +128,12 @@ $(document).ready(function(){
}); });
}); });
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
}); });
...@@ -193,7 +199,7 @@ CONTENTSEARCH.initialScreen = function(){ ...@@ -193,7 +199,7 @@ CONTENTSEARCH.initialScreen = function(){
///Render Content ///Render Content
CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to, cateid, grpid){ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to, cateid, grpid){
console.log("CONTENTSEARCH.renderContent"); //console.log("CONTENTSEARCH.renderContent");
var params = { var params = {
sid: id, sid: id,
...@@ -251,7 +257,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -251,7 +257,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml); htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml);
//ダイハツ対応 //ダイハツ対応
console.log("downloadHtml:" + post.download); //console.log("downloadHtml:" + post.download);
var downloadHtml = ""; var downloadHtml = "";
if( post.download == '1' ){ if( post.download == '1' ){
downloadHtml ='<li><a class="read button-download" contentid="' + post.contentId + '" >ダウンロード</a></li>'; downloadHtml ='<li><a class="read button-download" contentid="' + post.contentId + '" >ダウンロード</a></li>';
......
abvw/js/contentview.js
...@@ -1093,7 +1093,7 @@ CONTENTVIEW.changePage = function(page_index) { ...@@ -1093,7 +1093,7 @@ CONTENTVIEW.changePage = function(page_index) {
/* add event draw on canvas */ /* add event draw on canvas */
CONTENTVIEW.drawOnCanvas = function() { CONTENTVIEW.drawOnCanvas = function() {
console.log("CONTENTVIEW.drawOnCanvas start"); //console.log("CONTENTVIEW.drawOnCanvas start");
CONTENTVIEW_GENERAL.tool = new CONTENTVIEW.tool_drawing(); CONTENTVIEW_GENERAL.tool = new CONTENTVIEW.tool_drawing();
if (COMMON.isTouchDevice() == true) { if (COMMON.isTouchDevice() == true) {
...@@ -4828,8 +4828,8 @@ CONTENTVIEW.imageToScreen = function(x, y) { ...@@ -4828,8 +4828,8 @@ CONTENTVIEW.imageToScreen = function(x, y) {
/* Adjust Component size */ /* Adjust Component size */
CONTENTVIEW.sizingNotFull = function(width, height) { CONTENTVIEW.sizingNotFull = function(width, height) {
console.log("CONTENTVIEW.marginY:" + CONTENTVIEW.marginY); //console.log("CONTENTVIEW.marginY:" + CONTENTVIEW.marginY);
console.log("CONTENTVIEW.marginX:" + CONTENTVIEW.marginX); //console.log("CONTENTVIEW.marginX:" + CONTENTVIEW.marginX);
//START TRB //START TRB
if(CONTENTVIEW.isMediaAndHTMLContent()){ if(CONTENTVIEW.isMediaAndHTMLContent()){
...@@ -5329,21 +5329,21 @@ CONTENTVIEW.changeScale = function(scale) { ...@@ -5329,21 +5329,21 @@ CONTENTVIEW.changeScale = function(scale) {
//console.log("zoomX.Y " + zoomX + "," + zoomY); //console.log("zoomX.Y " + zoomX + "," + zoomY);
//詳細ログ作成 //詳細ログ作成
var objectLog = new ObjectLogEntity(); //var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID; //objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号 //objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = 0; //objectLog.objectId = 0;
objectLog.resourceId = ""; //objectLog.resourceId = "";
objectLog.mediaType = ""; //objectLog.mediaType = "";
objectLog.actionType = "101"; //拡大アクション定数 //objectLog.actionType = "101"; //拡大アクション定数
objectLog.actionValue = ""; //objectLog.actionValue = "";
objectLog.actionTime = "0"; //objectLog.actionTime = "0";
objectLog.locationX = zoomX; //objectLog.locationX = zoomX;
objectLog.locationY = zoomY; //objectLog.locationY = zoomY;
objectLog.locationHeight = ""; //objectLog.locationHeight = "";
objectLog.locationWidth = ""; //objectLog.locationWidth = "";
objectLog.eventType = "5"; //暫定でピンチアウト //objectLog.eventType = "5"; //暫定でピンチアウト
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog); //COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//--- //---
} }
...@@ -5474,6 +5474,42 @@ CONTENTVIEW.screenMove = function(){ ...@@ -5474,6 +5474,42 @@ CONTENTVIEW.screenMove = function(){
CONTENTVIEW.ready(); CONTENTVIEW.ready();
;} ;}
//戻る処理
CONTENTVIEW.screenBack = function(){
$("#viewer").hide();
if( $('#bookshelf').length || $('#list').length ){
HOME.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
document.title = I18N.i18nText('dspHome') + ' | ' + I18N.i18nText('sysAppTitle');
} else if( $('#bookmark').length ){
BOOKMARK.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
document.title = I18N.i18nText('dspShiori') + ' | ' + I18N.i18nText('sysAppTitle');
} else if( $('#history').length ){
HISTORY.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
document.title = I18N.i18nText('dspViewHistory') + ' | ' + I18N.i18nText('sysAppTitle');
} else if( $('#contentsearch').length ){
CONTENTSEARCH.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
}
};
$(function () { $(function () {
//CONTENTVIEW.ready(); //CONTENTVIEW.ready();
}); });
......
abvw/js/contentview_3d.js
...@@ -308,7 +308,7 @@ CONTENTVIEW_3D.get3DAction = function(lastFrame, currFrame){ ...@@ -308,7 +308,7 @@ CONTENTVIEW_3D.get3DAction = function(lastFrame, currFrame){
}; };
$(function () { $(function () {
CONTENTVIEW_3D.ready(); //CONTENTVIEW_3D.ready();
}); });
CONTENTVIEW_3D.ready = function(){ CONTENTVIEW_3D.ready = function(){
......
abvw/js/contentview_CallApi.js
...@@ -71,13 +71,13 @@ CONTENTVIEW_CALLAPI.getJsonContentInfoDone = function(doneFunc){ ...@@ -71,13 +71,13 @@ CONTENTVIEW_CALLAPI.getJsonContentInfoDone = function(doneFunc){
$.when( $.when(
ajax1,ajax2,ajax3,ajax4,ajax5,ajax6,ajax7 ajax1,ajax2,ajax3,ajax4,ajax5,ajax6,ajax7
).done(function(data1, data2, data3, data4, data5, data6, data7) { ).done(function(data1, data2, data3, data4, data5, data6, data7) {
console.log("done:data1:" + data1); //console.log("done:data1:" + data1);
console.log("done:data2:" + data2); //console.log("done:data2:" + data2);
console.log("done:data3:" + data3); //console.log("done:data3:" + data3);
console.log("done:data4:" + data4); //console.log("done:data4:" + data4);
console.log("done:data5:" + data5); //console.log("done:data5:" + data5);
console.log("done:data6:" + data6); //console.log("done:data6:" + data6);
console.log("done:data7:" + data7); //console.log("done:data7:" + data7);
if(data1){ if(data1){
CONTENTVIEW_CALLAPI.webGetContentDataDone(data1[0]); CONTENTVIEW_CALLAPI.webGetContentDataDone(data1[0]);
} }
......
abvw/js/contentview_ContentTypeNone.js
...@@ -14,9 +14,9 @@ CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function(doneFunc) { ...@@ -14,9 +14,9 @@ CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function(doneFunc) {
$.when( $.when(
ajax2,ajax3,ajax6 ajax2,ajax3,ajax6
).done(function(data2, data3, data6) { ).done(function(data2, data3, data6) {
console.log("done:data2:" + data2); //console.log("done:data2:" + data2);
console.log("done:data3:" + data3); //console.log("done:data3:" + data3);
console.log("done:data6:" + data6); //console.log("done:data6:" + data6);
if(data2){ if(data2){
CONTENTVIEW_CALLAPI.getSearchDataFromJsonDone(data2[0]); CONTENTVIEW_CALLAPI.getSearchDataFromJsonDone(data2[0]);
} }
......
abvw/js/contentview_CreateObjects.js
...@@ -2165,12 +2165,12 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () { ...@@ -2165,12 +2165,12 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
//#12373 //#12373
//console.log("tmpScale:" + tmpScale); //console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) { //if (tmpScale != 1) {
CONTENTVIEW.userScale = tmpScale; // CONTENTVIEW.userScale = tmpScale;
CONTENTVIEW.changeScale(CONTENTVIEW.userScale); // CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip(); // CONTENTVIEW.flip();
CONTENTVIEW.checkDisableButtonZoom(); // CONTENTVIEW.checkDisableButtonZoom();
} //}
} }
}); });
...@@ -2326,12 +2326,12 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () { ...@@ -2326,12 +2326,12 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
//#12373 //#12373
//console.log("tmpScale:" + tmpScale); //console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) { //if (tmpScale != 1) {
CONTENTVIEW.userScale = tmpScale; // CONTENTVIEW.userScale = tmpScale;
CONTENTVIEW.changeScale(CONTENTVIEW.userScale); // CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip(); // CONTENTVIEW.flip();
CONTENTVIEW.checkDisableButtonZoom(); // CONTENTVIEW.checkDisableButtonZoom();
} //}
} }
}); });
...@@ -2482,11 +2482,11 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) { ...@@ -2482,11 +2482,11 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
//#12373 //#12373
//console.log("tmpScale:" + tmpScale); //console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) { //if (tmpScale != 1) {
CONTENTVIEW.userScale = tmpScale; // CONTENTVIEW.userScale = tmpScale;
CONTENTVIEW.changeScale(CONTENTVIEW.userScale); // CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip(); // CONTENTVIEW.flip();
} //}
} }
} }
...@@ -2561,11 +2561,11 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) { ...@@ -2561,11 +2561,11 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
//#12373 //#12373
//console.log("tmpScale:" + tmpScale); //console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) { //if (tmpScale != 1) {
CONTENTVIEW.userScale = tmpScale; // CONTENTVIEW.userScale = tmpScale;
CONTENTVIEW.changeScale(CONTENTVIEW.userScale); // CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip(); // CONTENTVIEW.flip();
} //}
} }
}); });
...@@ -2954,7 +2954,7 @@ CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){ ...@@ -2954,7 +2954,7 @@ CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){
//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
$(function () { $(function () {
CONTENTVIEW_CREATEOBJECT.ready(); //CONTENTVIEW_CREATEOBJECT.ready();
}); });
CONTENTVIEW_CREATEOBJECT.ready = function(){ CONTENTVIEW_CREATEOBJECT.ready = function(){
......
abvw/js/contentview_Events.js
...@@ -1396,13 +1396,13 @@ CONTENTVIEW_EVENTS.mouseUp_CanvasMain = function(event) { ...@@ -1396,13 +1396,13 @@ CONTENTVIEW_EVENTS.mouseUp_CanvasMain = function(event) {
CONTENTVIEW_EVENTS.imgBack_click = function() { CONTENTVIEW_EVENTS.imgBack_click = function() {
console.log("CONTENTVIEW_EVENTS.imgBack_click"); //console.log("CONTENTVIEW_EVENTS.imgBack_click");
/* set end log */ /* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog(); COMMON.RegisterLog();
window.onbeforeunload = null; //window.onbeforeunload = null;
//画面クリア //画面クリア
CONTENTVIEW_INITOBJECT.clearViewerComponent(); CONTENTVIEW_INITOBJECT.clearViewerComponent();
...@@ -1422,29 +1422,8 @@ CONTENTVIEW_EVENTS.imgBack_click = function() { ...@@ -1422,29 +1422,8 @@ CONTENTVIEW_EVENTS.imgBack_click = function() {
// window.history.back(); // window.history.back();
//} //}
//試験 //元の画面に戻って画面復帰
$("#viewer").hide(); CONTENTVIEW.screenBack();
if( $('#bookshelf').length || $('#list').length ){
HOME.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
} else if( $('#bookmark').length ){
BOOKMARK.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
} else if( $('#history').length ){
HISTORY.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
} else if( $('#contentsearch').length ){
CONTENTSEARCH.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
}
} }
} else { } else {
/*check back */ /*check back */
...@@ -1454,13 +1433,8 @@ CONTENTVIEW_EVENTS.imgBack_click = function() { ...@@ -1454,13 +1433,8 @@ CONTENTVIEW_EVENTS.imgBack_click = function() {
// window.history.back(); // window.history.back();
//} //}
console.log("bbb"); //元の画面に戻って画面復帰
//試験 CONTENTVIEW.screenBack();
$("#viewer").hide();
HOME.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
} }
...@@ -2530,7 +2504,7 @@ TransitionObject.prototype.processNaviPage = function (currPos) { ...@@ -2530,7 +2504,7 @@ TransitionObject.prototype.processNaviPage = function (currPos) {
CONTENTVIEW_EVENTS._transitionObject = new TransitionObject(); CONTENTVIEW_EVENTS._transitionObject = new TransitionObject();
$(function () { $(function () {
CONTENTVIEW_EVENTS.ready(); //CONTENTVIEW_EVENTS.ready();
}); });
CONTENTVIEW_EVENTS.ready = function(){ CONTENTVIEW_EVENTS.ready = function(){
...@@ -2558,4 +2532,3 @@ CONTENTVIEW_EVENTS.ready = function(){ ...@@ -2558,4 +2532,3 @@ CONTENTVIEW_EVENTS.ready = function(){
}; };
abvw/js/contentview_FileSystem.js
...@@ -372,7 +372,7 @@ CONTENTVIEW_FILESYSTEM.errorHandler = function(e) { ...@@ -372,7 +372,7 @@ CONTENTVIEW_FILESYSTEM.errorHandler = function(e) {
}; };
$(function () { $(function () {
CONTENTVIEW_FILESYSTEM.ready(); //CONTENTVIEW_FILESYSTEM.ready();
}); });
CONTENTVIEW_FILESYSTEM.ready = function(){ CONTENTVIEW_FILESYSTEM.ready = function(){
......
abvw/js/contentview_General.js
...@@ -380,7 +380,7 @@ CONTENTVIEW_GENERAL.hideDialog = function() { ...@@ -380,7 +380,7 @@ CONTENTVIEW_GENERAL.hideDialog = function() {
}; };
$(function () { $(function () {
CONTENTVIEW_GENERAL.ready(); //CONTENTVIEW_GENERAL.ready();
}); });
CONTENTVIEW_GENERAL.ready = function(){ CONTENTVIEW_GENERAL.ready = function(){
......
abvw/js/contentview_GetData.js
...@@ -1064,14 +1064,10 @@ CONTENTVIEW_GETDATA.getContentID = function() { ...@@ -1064,14 +1064,10 @@ CONTENTVIEW_GETDATA.getContentID = function() {
/* init contentID */ /* init contentID */
if (ClientData.common_preContentId()) { if (ClientData.common_preContentId()) {
console.log("111");
CONTENTVIEW_GENERAL.contentID = ClientData.common_preContentId(); CONTENTVIEW_GENERAL.contentID = ClientData.common_preContentId();
ClientData.common_preContentId(null); ClientData.common_preContentId(null);
} else if (ClientData.IsJumpBack() == true) { } else if (ClientData.IsJumpBack() == true) {
console.log("222");
var dataJump = ClientData.JumpQueue(); var dataJump = ClientData.JumpQueue();
CONTENTVIEW_GENERAL.contentID = dataJump[dataJump.length - 1].oldContentID; CONTENTVIEW_GENERAL.contentID = dataJump[dataJump.length - 1].oldContentID;
...@@ -1081,12 +1077,10 @@ console.log("222"); ...@@ -1081,12 +1077,10 @@ console.log("222");
} }
} else { } else {
CONTENTVIEW_GENERAL.contentID = ClientData.contentInfo_contentId(); CONTENTVIEW_GENERAL.contentID = ClientData.contentInfo_contentId();
console.log("333:" + CONTENTVIEW_GENERAL.contentID);
} }
//console.log("CONTENTVIEW_GENERAL.contentID:" + CONTENTVIEW_GENERAL.contentID);
}; };
//Download resource //Download resource
...@@ -1580,9 +1574,9 @@ CONTENTVIEW_GETDATA.switchCanvas = function(nav){ ...@@ -1580,9 +1574,9 @@ CONTENTVIEW_GETDATA.switchCanvas = function(nav){
CONTENTVIEW.destRect = CONTENTVIEW.destRectNext; CONTENTVIEW.destRect = CONTENTVIEW.destRectNext;
//#12373 //#12373
CONTENTVIEW.userScale = 1; //CONTENTVIEW.userScale = 1;
CONTENTVIEW.changeScale(CONTENTVIEW.userScale); //CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip(); //CONTENTVIEW.flip();
//#12373 //#12373
//END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content //END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
} }
...@@ -1618,7 +1612,7 @@ CONTENTVIEW_GETDATA.switchCanvas = function(nav){ ...@@ -1618,7 +1612,7 @@ CONTENTVIEW_GETDATA.switchCanvas = function(nav){
CONTENTVIEW.destRect = CONTENTVIEW.destRectPrev; CONTENTVIEW.destRect = CONTENTVIEW.destRectPrev;
//#12373 //#12373
CONTENTVIEW.userScale = 1; //CONTENTVIEW.userScale = 1;
//#12373 //#12373
CONTENTVIEW.changeScale(CONTENTVIEW.userScale); CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip(); CONTENTVIEW.flip();
......
abvw/js/contentview_Gomu.js
...@@ -206,7 +206,7 @@ CONTENTVIEW_GOMU.touchStart_BtnCancel_Gomu = function(e){ ...@@ -206,7 +206,7 @@ CONTENTVIEW_GOMU.touchStart_BtnCancel_Gomu = function(e){
// Setting dialog // Setting dialog
$(function () { $(function () {
CONTENTVIEW_GOMU.ready(); //CONTENTVIEW_GOMU.ready();
}); });
CONTENTVIEW_GOMU.ready = function(){ CONTENTVIEW_GOMU.ready = function(){
......
abvw/js/contentview_ImagePreview.js
...@@ -457,7 +457,7 @@ CONTENTVIEW_IMAGEPREVIEW.handleDispNextPrevButton = function(){ ...@@ -457,7 +457,7 @@ CONTENTVIEW_IMAGEPREVIEW.handleDispNextPrevButton = function(){
}; };
$(function () { $(function () {
CONTENTVIEW_IMAGEPREVIEW.ready(); //CONTENTVIEW_IMAGEPREVIEW.ready();
}); });
CONTENTVIEW_IMAGEPREVIEW.ready = function(){ CONTENTVIEW_IMAGEPREVIEW.ready = function(){
......
abvw/js/contentview_InitObjects.js
...@@ -121,7 +121,7 @@ CONTENTVIEW_INITOBJECT.setLoadingSize = function(){ ...@@ -121,7 +121,7 @@ CONTENTVIEW_INITOBJECT.setLoadingSize = function(){
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image //END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
CONTENTVIEW_INITOBJECT.initPage = function() { CONTENTVIEW_INITOBJECT.initPage = function() {
console.log("CONTENTVIEW_INITOBJECT.initPage"); //console.log("CONTENTVIEW_INITOBJECT.initPage");
CONTENTVIEW_INITOBJECT.setLoadingSize(); CONTENTVIEW_INITOBJECT.setLoadingSize();
$('#divImageLoading').css('display', 'block'); $('#divImageLoading').css('display', 'block');
...@@ -294,7 +294,7 @@ CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){ ...@@ -294,7 +294,7 @@ CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){
CONTENTVIEW.isPendingContentBGM = false; CONTENTVIEW.isPendingContentBGM = false;
} }
console.log("CONTENTVIEW_GENERAL.isFullScreen:" + CONTENTVIEW_GENERAL.isFullScreen); //console.log("CONTENTVIEW_GENERAL.isFullScreen:" + CONTENTVIEW_GENERAL.isFullScreen);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages) CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages)
.setPageObjects(CONTENTVIEW_GENERAL.pageObjects) .setPageObjects(CONTENTVIEW_GENERAL.pageObjects)
...@@ -399,7 +399,7 @@ CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){ ...@@ -399,7 +399,7 @@ CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){
CONTENTVIEW.setViewportForWin8(); CONTENTVIEW.setViewportForWin8();
console.log("ajaxComp8 end"); //console.log("ajaxComp8 end");
}; };
......
abvw/js/contentview_Maker.js
...@@ -119,17 +119,17 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){ ...@@ -119,17 +119,17 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){
} }
}); });
//$('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction); $('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction);
$("#dlgMaker .colorpicker").on({ //$("#dlgMaker .colorpicker").on({
'click touchend': function(ev){ // 'click touchend': function(ev){
CONTENTVIEW_MAKER.Maker_colorPickerClickFunction(ev); // CONTENTVIEW_MAKER.Maker_colorPickerClickFunction(ev);
return false; // return false;
}, // },
'touchstart touchmove': function(){ // 'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる // //これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false; // return false;
} // }
}); //});
}; };
...@@ -361,7 +361,7 @@ CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction = function() { ...@@ -361,7 +361,7 @@ CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction = function() {
}; };
$(function () { $(function () {
CONTENTVIEW_MAKER.ready(); //CONTENTVIEW_MAKER.ready();
}); });
CONTENTVIEW_MAKER.ready = function(){ CONTENTVIEW_MAKER.ready = function(){
......
abvw/js/contentview_Marking.js
...@@ -459,7 +459,7 @@ CONTENTVIEW_MARKING.ShowMarking = function() { ...@@ -459,7 +459,7 @@ CONTENTVIEW_MARKING.ShowMarking = function() {
// Setting dialog // Setting dialog
$(function () { $(function () {
CONTENTVIEW_MARKING.ready(); //CONTENTVIEW_MARKING.ready();
}); });
CONTENTVIEW_MARKING.ready = function(){ CONTENTVIEW_MARKING.ready = function(){
......
abvw/js/contentview_Memo.js
...@@ -8,7 +8,7 @@ CONTENTVIEW_MEMO.createMemoDialog = function(){ ...@@ -8,7 +8,7 @@ CONTENTVIEW_MEMO.createMemoDialog = function(){
CONTENTVIEW_MEMO.targetDiv.append( CONTENTVIEW_MEMO.targetDiv.append(
'<aside id="memoWrapper" class="MemoIndexBox">' '<aside id="memoWrapper" class="MemoIndexBox">'
+ ' <h1 class="indexBoxHd">' + I18N.i18nText('txtMemo') + ' <h1 class="indexBoxHd">' + I18N.i18nText('txtMemo')
+' <a class="delete"></a>' +' <a id="memoClosing2" class="delete"></a>'
+' </h1>' +' </h1>'
+' <div id="memoArea" class="indexBoxBody_on">' +' <div id="memoArea" class="indexBoxBody_on">'
+' <textarea id="txaMemoContent" style="resize: none; height: 302px; width: 452px; margin-bottom: 10px"></textarea>' +' <textarea id="txaMemoContent" style="resize: none; height: 302px; width: 452px; margin-bottom: 10px"></textarea>'
...@@ -295,7 +295,7 @@ CONTENTVIEW_MEMO.editJqueryUIDialog = function(){ ...@@ -295,7 +295,7 @@ CONTENTVIEW_MEMO.editJqueryUIDialog = function(){
}; };
$(function () { $(function () {
CONTENTVIEW_MEMO.ready(); //CONTENTVIEW_MEMO.ready();
}); });
CONTENTVIEW_MEMO.ready = function(){ CONTENTVIEW_MEMO.ready = function(){
......
abvw/js/contentview_Pen.js
...@@ -125,17 +125,17 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() { ...@@ -125,17 +125,17 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() {
} }
}); });
//$('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction); $('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction);
$("#dlgPen .colorpicker").on({ //$("#dlgPen .colorpicker").on({
'click touchend': function(ev){ // 'click touchend': function(ev){
CONTENTVIEW_PEN.Pen_colorPickerClickFunction(ev); // CONTENTVIEW_PEN.Pen_colorPickerClickFunction(ev);
return false; // return false;
}, // },
'touchstart touchmove': function(){ // 'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる // //これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false; // return false;
} // }
}); //});
}; };
...@@ -366,7 +366,7 @@ CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction = function() { ...@@ -366,7 +366,7 @@ CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction = function() {
}; };
$(function () { $(function () {
CONTENTVIEW_PEN.ready(); //CONTENTVIEW_PEN.ready();
}); });
CONTENTVIEW_PEN.ready = function(){ CONTENTVIEW_PEN.ready = function(){
......
abvw/js/contentview_PopupText.js
...@@ -114,7 +114,7 @@ CONTENTVIEW_POPUPTEXT.MailTo = function(email, subject) { ...@@ -114,7 +114,7 @@ CONTENTVIEW_POPUPTEXT.MailTo = function(email, subject) {
}; };
$(function () { $(function () {
CONTENTVIEW_POPUPTEXT.ready(); //CONTENTVIEW_POPUPTEXT.ready();
}); });
CONTENTVIEW_POPUPTEXT.ready = function(){ CONTENTVIEW_POPUPTEXT.ready = function(){
......
abvw/js/history.js
...@@ -116,6 +116,12 @@ $(document).ready(function(){ ...@@ -116,6 +116,12 @@ $(document).ready(function(){
}); });
}); });
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
}); });
//Call API //Call API
...@@ -184,7 +190,7 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate ...@@ -184,7 +190,7 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate
htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml); htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml);
//ダイハツ対応 //ダイハツ対応
console.log("post.download:" + post.download); //console.log("post.download:" + post.download);
var downloadHtml = ""; var downloadHtml = "";
if( post.download == '1' ){ if( post.download == '1' ){
downloadHtml ='<li><a class="read button-download" contentid="' + post.contentId + '" >ダウンロード</a></li>'; downloadHtml ='<li><a class="read button-download" contentid="' + post.contentId + '" >ダウンロード</a></li>';
...@@ -1401,7 +1407,7 @@ HISTORY.renderContentAfterSort = function(contentSortArr){ ...@@ -1401,7 +1407,7 @@ HISTORY.renderContentAfterSort = function(contentSortArr){
htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml); htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml);
//ダイハツ対応 //ダイハツ対応
console.log("post.download2:" + post.download); //console.log("post.download2:" + post.download);
var downloadHtml = ""; var downloadHtml = "";
if( post.download == '1' ){ if( post.download == '1' ){
downloadHtml ='<li><a class="read button-download" contentid="' + post.contentId + '" >ダウンロード</a></li>'; downloadHtml ='<li><a class="read button-download" contentid="' + post.contentId + '" >ダウンロード</a></li>';
......
abvw/js/home.js
...@@ -265,11 +265,15 @@ $(document).ready(function () { ...@@ -265,11 +265,15 @@ $(document).ready(function () {
}); });
}); });
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
}); });
//グループ認証ここかか //グループ認証ここから
HOME.showDlgAuthCode = function(e){ HOME.showDlgAuthCode = function(e){
if( ClientData.authCode() == "" ){ if( ClientData.authCode() == "" ){
COMMON.lockLayout(); COMMON.lockLayout();
...@@ -277,6 +281,7 @@ HOME.showDlgAuthCode = function(e){ ...@@ -277,6 +281,7 @@ HOME.showDlgAuthCode = function(e){
$('#inputAuthCode').val(''); $('#inputAuthCode').val('');
$('#dlgAuthCode').show(); $('#dlgAuthCode').show();
$('#dlgAuthCode').center(); $('#dlgAuthCode').center();
$('#inputAuthCode').focus();
} }
}; };
HOME.authCodeOkFunction = function(e){ HOME.authCodeOkFunction = function(e){
...@@ -295,8 +300,7 @@ HOME.authCodeOkFunction = function(e){ ...@@ -295,8 +300,7 @@ HOME.authCodeOkFunction = function(e){
function (data) { function (data) {
if (data.result) { if (data.result) {
alert("data.result:"+data.result); //alert("data.result:"+data.result);
if("ok" == data.result){ if("ok" == data.result){
//authCode有効 //authCode有効
//画面再描画 //画面再描画
...@@ -572,10 +576,9 @@ HOME.canvasClickFunction = function(e) { ...@@ -572,10 +576,9 @@ HOME.canvasClickFunction = function(e) {
}; };
HOME.canvasClickFunction_callback = function(outputId) HOME.canvasClickFunction_callback = function(outputId){
{
console.log("HOME.canvasClickFunction_callback:" + outputId); //console.log("HOME.canvasClickFunction_callback:" + outputId);
var date = new Date(); var date = new Date();
var month = date.getMonth() + 1; var month = date.getMonth() + 1;
......
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