Skip to content

C
check
Commit 15b10916 by Masaru Abe
Options

Merge branch 'topic/tsushima/1.8.1' into 'feature/1.8.1' 

テキストオブジェクトのレンダリングにhtml2canvasを使用

See merge request abook_web/web-viewer!13
parents 6c390cbb 98fbfd00
Showing with 130 additions and 35 deletions
abvw/bookmark.html
......@@ -48,6 +48,8 @@
<script type="text/javascript" src="./js/bookmark.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/common/js/html2canvas.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
abvw/common/js/promise-6.1.0.min.js 0 → 100644
!function n(t,e,o){function i(u,f){if(!e[u]){if(!t[u]){var c="function"==typeof require&&require;if(!f&&c)return c(u,!0);if(r)return r(u,!0);var s=new Error("Cannot find module '"+u+"'");throw s.code="MODULE_NOT_FOUND",s}var a=e[u]={exports:{}};t[u][0].call(a.exports,function(n){var e=t[u][1][n];return i(e?e:n)},a,a.exports,n,t,e,o)}return e[u].exports}for(var r="function"==typeof require&&require,u=0;u<o.length;u++)i(o[u]);return i}({1:[function(n,t){function e(){}var o=t.exports={};o.nextTick=function(){var n="undefined"!=typeof window&&window.setImmediate,t="undefined"!=typeof window&&window.postMessage&&window.addEventListener;if(n)return function(n){return window.setImmediate(n)};if(t){var e=[];return window.addEventListener("message",function(n){var t=n.source;if((t===window||null===t)&&"process-tick"===n.data&&(n.stopPropagation(),e.length>0)){var o=e.shift();o()}},!0),function(n){e.push(n),window.postMessage("process-tick","*")}}return function(n){setTimeout(n,0)}}(),o.title="browser",o.browser=!0,o.env={},o.argv=[],o.on=e,o.addListener=e,o.once=e,o.off=e,o.removeListener=e,o.removeAllListeners=e,o.emit=e,o.binding=function(){throw new Error("process.binding is not supported")},o.cwd=function(){return"/"},o.chdir=function(){throw new Error("process.chdir is not supported")}},{}],2:[function(n,t){"use strict";function e(n){function t(n){return null===c?void a.push(n):void r(function(){var t=c?n.onFulfilled:n.onRejected;if(null===t)return void(c?n.resolve:n.reject)(s);var e;try{e=t(s)}catch(o){return void n.reject(o)}n.resolve(e)})}function e(n){try{if(n===l)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if("function"==typeof t)return void i(t.bind(n),e,u)}c=!0,s=n,f()}catch(o){u(o)}}function u(n){c=!1,s=n,f()}function f(){for(var n=0,e=a.length;e>n;n++)t(a[n]);a=null}if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof n)throw new TypeError("not a function");var c=null,s=null,a=[],l=this;this.then=function(n,e){return new l.constructor(function(i,r){t(new o(n,e,i,r))})},i(n,e,u)}function o(n,t,e,o){this.onFulfilled="function"==typeof n?n:null,this.onRejected="function"==typeof t?t:null,this.resolve=e,this.reject=o}function i(n,t,e){var o=!1;try{n(function(n){o||(o=!0,t(n))},function(n){o||(o=!0,e(n))})}catch(i){if(o)return;o=!0,e(i)}}var r=n("asap");t.exports=e},{asap:4}],3:[function(n,t){"use strict";function e(n){this.then=function(t){return"function"!=typeof t?this:new o(function(e,o){i(function(){try{e(t(n))}catch(i){o(i)}})})}}var o=n("./core.js"),i=n("asap");t.exports=o,e.prototype=o.prototype;var r=new e(!0),u=new e(!1),f=new e(null),c=new e(void 0),s=new e(0),a=new e("");o.resolve=function(n){if(n instanceof o)return n;if(null===n)return f;if(void 0===n)return c;if(n===!0)return r;if(n===!1)return u;if(0===n)return s;if(""===n)return a;if("object"==typeof n||"function"==typeof n)try{var t=n.then;if("function"==typeof t)return new o(t.bind(n))}catch(i){return new o(function(n,t){t(i)})}return new e(n)},o.all=function(n){var t=Array.prototype.slice.call(n);return new o(function(n,e){function o(r,u){try{if(u&&("object"==typeof u||"function"==typeof u)){var f=u.then;if("function"==typeof f)return void f.call(u,function(n){o(r,n)},e)}t[r]=u,0===--i&&n(t)}catch(c){e(c)}}if(0===t.length)return n([]);for(var i=t.length,r=0;r<t.length;r++)o(r,t[r])})},o.reject=function(n){return new o(function(t,e){e(n)})},o.race=function(n){return new o(function(t,e){n.forEach(function(n){o.resolve(n).then(t,e)})})},o.prototype["catch"]=function(n){return this.then(null,n)}},{"./core.js":2,asap:4}],4:[function(n,t){(function(n){function e(){for(;i.next;){i=i.next;var n=i.task;i.task=void 0;var t=i.domain;t&&(i.domain=void 0,t.enter());try{n()}catch(o){if(c)throw t&&t.exit(),setTimeout(e,0),t&&t.enter(),o;setTimeout(function(){throw o},0)}t&&t.exit()}u=!1}function o(t){r=r.next={task:t,domain:c&&n.domain,next:null},u||(u=!0,f())}var i={task:void 0,next:null},r=i,u=!1,f=void 0,c=!1;if("undefined"!=typeof n&&n.nextTick)c=!0,f=function(){n.nextTick(e)};else if("function"==typeof setImmediate)f="undefined"!=typeof window?setImmediate.bind(window,e):function(){setImmediate(e)};else if("undefined"!=typeof MessageChannel){var s=new MessageChannel;s.port1.onmessage=e,f=function(){s.port2.postMessage(0)}}else f=function(){setTimeout(e,0)};t.exports=o}).call(this,n("_process"))},{_process:1}],5:[function(){"function"!=typeof Promise.prototype.done&&(Promise.prototype.done=function(){var n=arguments.length?this.then.apply(this,arguments):this;n.then(null,function(n){setTimeout(function(){throw n},0)})})},{}],6:[function(n){n("asap");"undefined"==typeof Promise&&(Promise=n("./lib/core.js"),n("./lib/es6-extensions.js")),n("./polyfill-done.js")},{"./lib/core.js":2,"./lib/es6-extensions.js":3,"./polyfill-done.js":5,asap:4}]},{},[6]);
//# sourceMappingURL=/polyfills/promise-6.1.0.min.js.map
\ No newline at end of file
abvw/contentpreview.html
......@@ -30,6 +30,9 @@
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentpreview.js?__UPDATEID__"></script>
......
abvw/contentsearch.html
......@@ -53,6 +53,8 @@
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/contentview.html
......@@ -59,6 +59,8 @@
<script type="text/javascript" src="./common/js/jquery.powertip.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/script.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/contentview_getits.html
......@@ -64,6 +64,8 @@
<script type="text/javascript" src="./common/js/jquery.powertip.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/script.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/contentview_openuri.html
......@@ -38,6 +38,8 @@
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_OpenUri.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/contentview_streaming.html
......@@ -64,6 +64,8 @@
<script type="text/javascript" src="./common/js/jquery.powertip.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/script.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/contentview_textcopy.html
......@@ -4,6 +4,8 @@
<meta charset="UTF-8" />
<title>Text Copy</title>
<script type="text/javascript" src="common/js/jquery-1.8.1.min.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<script>
$(document).ready(function () {
......
abvw/css/layout/viewer.css
......@@ -3181,3 +3181,10 @@ span.no-item{
background: url(../../img/login/close.png) 0 0 no-repeat;
}
#hiddenArea {
width: 100%;
height: 100%;
position: absolute;
top: 65px;
left: -1000px;
}
\ No newline at end of file
abvw/history.html
......@@ -54,6 +54,8 @@
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/home.html
......@@ -57,6 +57,8 @@
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
html{
......
abvw/js/contentview_CreateObjects.js
......@@ -379,8 +379,51 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
CONTENTVIEW.flip(opt);
}
if (mediaType == '7') {
var element = document.getElementById(this.objectId);
html2canvas(element, {backgroundColor: null, logging: false}).then(function(canvas) {
var imageUrl = canvas.toDataURL('image/png');
var img = new Image();
img.onload = function () {
CONTENTVIEW_GENERAL.nCountObjectLoad[opt]++;
/* create object store value image */
var objTemp = [];
objTemp.mediaType = mediaType;
objTemp.img = img;
objTemp.x = x;
objTemp.y = y;
objTemp.w = w;
objTemp.h = h;
objTemp.displayBorder = displayBorder;
if (this.imageUrl != '') {
/* push to array */
CONTENTVIEW_GENERAL.arrImage.push(objTemp);
var isSetTimeout = false;
if ( $.browser.msie && $.browser.version == 9) {
//ブラウザがIE9となっている場合対応する
isSetTimeout = true;
setTimeout(function(){
context.drawImage(img, x, y, w, h);
CONTENTVIEW.flip(opt);
},100);
} else {
context.drawImage(img, x, y, w, h);
}
//ブラウザがIE9となっている場合対応する
if(!isSetTimeout){
CONTENTVIEW.flip(opt);
}
CONTENTVIEW_CREATEOBJECT.finishLoading(opt, nObjectCnt);
};
img.src = imageUrl;
});
}
else if (this.imageUrl != '') {
/* init image */
var img = new Image();
......@@ -456,29 +499,20 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
CONTENTVIEW.flip(opt);
}
//console.log("CONTENTVIEW_GENERAL.nCountObjectLoad:" + opt + " "+ CONTENTVIEW_GENERAL.nCountObjectLoad[opt] + " nObjectCnt:" + nObjectCnt);
if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) {
CONTENTVIEW_CREATEOBJECT.finishLoading(opt, nObjectCnt);
};
img.src = this.imageUrl;
}
else {
//console.log("mediaType:" + mediaType);
//console.log("tempUrl:" + tempUrl);
if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) {
/* draw marking */
CONTENTVIEW.drawMarkingOnScreen(opt);
/*set status is loading page */
//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.isLoadingObject = false;
}
}
else{
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
}
else{
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
//End Function : No.4 - Summary : make sure all page is loaded
/* enable controls in page */
if (ClientData.IsAddingMarking() == true) {
CONTENTVIEW_GENERAL.disableAllControl();
......@@ -497,8 +531,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
CONTENTVIEW_MARKING.enableButtonMarking();
}
//End Function : No.4 - Summary : make sure all page is loaded
}
else {
} 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){
......@@ -513,7 +546,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
else{
CONTENTVIEW_GENERAL.enableAllControl();
}
//End Function : No.4 - Summary : make sure all page is loaded
//End Function : No.4 - Summary : mak
}
/*finish loading */
......@@ -531,24 +564,39 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
else{
$('#divImageLoading').css('display', 'none');
}
//End Functi
//End Func
/* set pos video */
CONTENTVIEW.zoomVideo();
}
};
img.src = this.imageUrl;
}
else {
}
};
//End Function: No.4 - Editor : Long - Date: 08/09/2013 - Summary : Edit function to draw object on next page
//console.log("mediaType:" + mediaType);
//console.log("tempUrl:" + tempUrl);
CONTENTVIEW_CREATEOBJECT.finishLoading = function(opt, nObjectCnt) {
//console.log("CONTENTVIEW_GENERAL.nCountObjectLoad:" + opt + " "+ CONTENTVIEW_GENERAL.nCountObjectLoad[opt] + " nObjectCnt:" + nObjectCnt);
if (CONTENTVIEW_GENERAL.nCountObjectLoad[opt] >= nObjectCnt) {
/* draw marking */
CONTENTVIEW.drawMarkingOnScreen(opt);
/*set status is loading page */
//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.isLoadingObject = false;
}
}
else{
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
}
else{
CONTENTVIEW_GENERAL.isLoadingObject = false;
}
//End Function : No.4 - Summary : make sure all page is loaded
/* enable controls in page */
if (ClientData.IsAddingMarking() == true) {
CONTENTVIEW_GENERAL.disableAllControl();
......@@ -567,7 +615,8 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
CONTENTVIEW_MARKING.enableButtonMarking();
}
//End Function : No.4 - Summary : make sure all page is loaded
} else {
}
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){
......@@ -582,7 +631,7 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
else{
CONTENTVIEW_GENERAL.enableAllControl();
}
//End Function : No.4 - Summary : mak
//End Function : No.4 - Summary : make sure all page is loaded
}
/*finish loading */
......@@ -600,14 +649,12 @@ CONTENTVIEW_CREATEOBJECT.PageObject.prototype.drawPageObject = function (context
else{
$('#divImageLoading').css('display', 'none');
}
//End Func
//End Functi
/* set pos video */
CONTENTVIEW.zoomVideo();
}
}
}
};
//End Function: No.4 - Editor : Long - Date: 08/09/2013 - Summary : Edit function to draw object on next page
//Start Function : No.9
......@@ -688,7 +735,8 @@ CONTENTVIEW_CREATEOBJECT.object3d.prototype = new CONTENTVIEW_CREATEOBJECT.PageO
/* mediaType = 7 write text object*/
CONTENTVIEW_CREATEOBJECT.text = function (mediaType, actionType, id, x, y, w, h, visible, actionFunction, content, objectId) {
//var imageUrl = displayText(x,y,w,h,id,content);
var imageUrl = TEXTOBJECT.getTextObjectImage(w, h, content);
//var imageUrl = TEXTOBJECT.getTextObjectImage(w, h, content);
var imageUrl = 'text';
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, null, objectId);
this.action = function () {
};
......
abvw/js/contentview_GetData.js
......@@ -23,6 +23,7 @@ CONTENTVIEW_GETDATA.getURLPageImage = function(apiName) {
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex = function(contentData, nIndexPage) {
CONTENTVIEW_GENERAL.pageObjects = [];
$("#hiddenArea").empty();
var currentPageObjects;
for (var nIndex = 0; nIndex < contentData.length; nIndex++) {
......@@ -71,6 +72,7 @@ CONTENTVIEW_GETDATA.getPageObjectsByPageIndex = function(contentData, nIndexPage
} else if (currentPageObjects[nIndex].mediaType == 7) { /*mediaType = 7*/
var pageObject = CONTENTVIEW_GETDATA.getMediaType7(currentPageObjects[nIndex]);
/*add object to page */
CONTENTVIEW_GETDATA.appendHiddenText(pageObject);
CONTENTVIEW_GENERAL.pageObjects.push(pageObject);
} else if (currentPageObjects[nIndex].mediaType == 8) { /*mediaType = 8*/
var pageObject = CONTENTVIEW_GETDATA.getMediaType8(currentPageObjects[nIndex]);
......@@ -97,6 +99,14 @@ CONTENTVIEW_GETDATA.getPageObjectsByPageIndex = function(contentData, nIndexPage
}
};
CONTENTVIEW_GETDATA.appendHiddenText = function(pageObject) {
$("#hiddenArea").append(
"<div id='" + pageObject.objectId +
"' style='width:" + pageObject.width + "px; height:" + pageObject.height + "px;'" + ">" +
pageObject.content +
"</div>");
};
/*get data mediaType = 1 */
CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) {
/*
......@@ -1483,6 +1493,7 @@ CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex = function(contentData, nIndex
} else if (currentPageObjects[nIndex].mediaType == 7) { /*mediaType = 7*/
var pageObject = CONTENTVIEW_GETDATA.getMediaType7(currentPageObjects[nIndex]);
/*add object to page */
CONTENTVIEW_GETDATA.appendHiddenText(pageObject);
CONTENTVIEW_GENERAL.nextPageObjects.push(pageObject);
} else if (currentPageObjects[nIndex].mediaType == 8) { /*mediaType = 8*/
var pageObject = CONTENTVIEW_GETDATA.getMediaType8(currentPageObjects[nIndex]);
......@@ -1562,6 +1573,7 @@ CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex = function(contentData, nIndex
} else if (currentPageObjects[nIndex].mediaType == 7) { /*mediaType = 7*/
var pageObject = CONTENTVIEW_GETDATA.getMediaType7(currentPageObjects[nIndex]);
/*add object to page */
CONTENTVIEW_GETDATA.appendHiddenText(pageObject);
CONTENTVIEW_GENERAL.prevPageObjects.push(pageObject);
} else if (currentPageObjects[nIndex].mediaType == 8) { /*mediaType = 8*/
var pageObject = CONTENTVIEW_GETDATA.getMediaType8(currentPageObjects[nIndex]);
......
abvw/js/contentview_InitObjects.js
......@@ -658,6 +658,7 @@ CONTENTVIEW_INITOBJECT.initializeViewerComponent = function(viewId) {
/* add some tags we need.*/
$('#' + viewId).prepend(
'<div id="canvasWrapper">' +
'<div id="hiddenArea"></div>' +
'<canvas id="mainPre"></canvas>' +
'<canvas id="main"></canvas>' +
'<canvas id="mainNext"></canvas>' +
......
abvw/settings.html
......@@ -34,6 +34,8 @@
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/settings.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
#slidebar-animation{
......
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