Skip to content

C
check
Commit 1d9e92a4 by Kim Eunchul
Options

#40386 【TECSS(Biz) webviewer 1.9】pdfコンテンツを回転した状態で、「マーキング」アイコンがクリッカブルになる

parent c4766d8b
Showing with 30 additions and 18 deletions
abvw/js/contentview_CreateObjects.js
...@@ -2194,7 +2194,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () { ...@@ -2194,7 +2194,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
} }
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
/* change title of page */ /* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) { if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
...@@ -2268,8 +2270,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () { ...@@ -2268,8 +2270,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
} }
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
/* change title of page */ /* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) { if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') { if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') {
...@@ -2357,8 +2360,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () { ...@@ -2357,8 +2360,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
} }
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
/* change title of page */ /* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) { if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') { if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') {
...@@ -2429,8 +2433,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () { ...@@ -2429,8 +2433,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
} }
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
/* change title of page */ /* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) { if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex]) {
if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') { if (CONTENTVIEW_GENERAL.dataPageTitle[CONTENTVIEW_GETDATA.getContent().pageIndex] != '') {
...@@ -2463,7 +2468,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) { ...@@ -2463,7 +2468,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
if (index == CONTENTVIEW_GETDATA.getContent().pageIndex) { if (index == CONTENTVIEW_GETDATA.getContent().pageIndex) {
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
} else if (index < CONTENTVIEW_GETDATA.getContent().pageIndex) { } 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_GENERAL.context_main.clearRect(0, 0, CONTENTVIEW_GENERAL.canvas_main.width, CONTENTVIEW_GENERAL.canvas_main.height);
CONTENTVIEW.removeObject(); CONTENTVIEW.removeObject();
...@@ -2515,8 +2522,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) { ...@@ -2515,8 +2522,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
CONTENTVIEW.checkExistNextPrePage(); CONTENTVIEW.checkExistNextPrePage();
CONTENTVIEW.changeSlider(index); CONTENTVIEW.changeSlider(index);
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
/* change title of page */ CONTENTVIEW_INITOBJECT.initDisplayMarking();
} /* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[index]) { 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'); document.title = CONTENTVIEW_GENERAL.contentName + '_' + CONTENTVIEW_GENERAL.dataPageTitle[index] + ' | ' + I18N.i18nText('sysAppTitle');
...@@ -2594,8 +2602,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) { ...@@ -2594,8 +2602,9 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
CONTENTVIEW.checkExistNextPrePage(); CONTENTVIEW.checkExistNextPrePage();
CONTENTVIEW.changeSlider(index); CONTENTVIEW.changeSlider(index);
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
/* change title of page */ CONTENTVIEW_INITOBJECT.initDisplayMarking();
} /* change title of page */
if (CONTENTVIEW_GENERAL.dataPageTitle[index]) { 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'); document.title = CONTENTVIEW_GENERAL.contentName + '_' + CONTENTVIEW_GENERAL.dataPageTitle[index] + ' | ' + I18N.i18nText('sysAppTitle');
......
abvw/js/contentview_GetData.js
...@@ -1280,8 +1280,9 @@ CONTENTVIEW_GETDATA.getContentInfoTypeImage = function(){ ...@@ -1280,8 +1280,9 @@ CONTENTVIEW_GETDATA.getContentInfoTypeImage = function(){
CONTENTVIEW_INITOBJECT.initImageBookmark(); CONTENTVIEW_INITOBJECT.initImageBookmark();
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
/* check status */ /* check status */
CONTENTVIEW.checkStatusImageMarking(); CONTENTVIEW.checkStatusImageMarking();
......
abvw/js/contentview_InitObjects.js
...@@ -391,8 +391,9 @@ CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){ ...@@ -391,8 +391,9 @@ CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){
CONTENTVIEW_INITOBJECT.initImageAddMemo(); CONTENTVIEW_INITOBJECT.initImageAddMemo();
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
/* check status */ /* check status */
CONTENTVIEW.checkStatusImageMarking(); CONTENTVIEW.checkStatusImageMarking();
...@@ -517,8 +518,9 @@ CONTENTVIEW_INITOBJECT.ajaxComplete4 = function(){ ...@@ -517,8 +518,9 @@ CONTENTVIEW_INITOBJECT.ajaxComplete4 = function(){
CONTENTVIEW_INITOBJECT.initImageAddMemo(); CONTENTVIEW_INITOBJECT.initImageAddMemo();
/* init image had draw */ /* init image had draw */
CONTENTVIEW_INITOBJECT.initDisplayMarking(); if($('#rotatebtnR').attr('angle') == '0'){
CONTENTVIEW_INITOBJECT.initDisplayMarking();
}
/* check status */ /* check status */
CONTENTVIEW.checkStatusImageMarking(); CONTENTVIEW.checkStatusImageMarking();
......
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