Skip to content

C
check
Commit 7ea37699 by vietdo
Options

Merge branch 'feature/1.6.2_doutor' of… 

Merge branch 'feature/1.6.2_doutor' of git@gitlab.agentec.jp:abook_web/web-viewer.git into feature/1.6.2_doutor
parents e627dece 0d554839
Showing with 6 additions and 0 deletions
abvw/js/contentview_CreateObjects.js
...@@ -400,6 +400,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context ...@@ -400,6 +400,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
/* push to array */ /* push to array */
CONTENTVIEW_GENERAL.arrImage.push(objTemp); CONTENTVIEW_GENERAL.arrImage.push(objTemp);
var isSetTimeout = false;
if (mediaType == '2') {/* media */ if (mediaType == '2') {/* media */
img.width = 50; img.width = 50;
img.height = 50; img.height = 50;
...@@ -440,15 +441,20 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context ...@@ -440,15 +441,20 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
else { else {
if ( $.browser.msie && $.browser.version == 9) { if ( $.browser.msie && $.browser.version == 9) {
//ブラウザがIE9となっている場合対応する //ブラウザがIE9となっている場合対応する
isSetTimeout = true;
setTimeout(function(){ setTimeout(function(){
context.drawImage(img, x, y, w, h); context.drawImage(img, x, y, w, h);
CONTENTVIEW.flip(opt);
},100); },100);
} else { } else {
context.drawImage(img, x, y, w, h); context.drawImage(img, x, y, w, h);
} }
} }
//ブラウザがIE9となっている場合対応する
if(!isSetTimeout){
CONTENTVIEW.flip(opt); CONTENTVIEW.flip(opt);
}
//console.log("CONTENTVIEW_GENERAL.nCountObjectLoad:" + opt + " "+ CONTENTVIEW_GENERAL.nCountObjectLoad[opt] + " nObjectCnt:" + nObjectCnt); //console.log("CONTENTVIEW_GENERAL.nCountObjectLoad:" + opt + " "+ CONTENTVIEW_GENERAL.nCountObjectLoad[opt] + " nObjectCnt:" + nObjectCnt);
if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) { if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) {
......
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