diff --git a/media/css/seahub.css b/media/css/seahub.css index 748b113370..43d9c65488 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -719,6 +719,9 @@ table img { #svg-view { min-height:500px;/*for ff*/ } +#doc-view { + min-height:800px; +} #pdf { border:1px solid #cbcbcb; } diff --git a/templates/myhome.html b/templates/myhome.html index 6ea499cb63..8c96e8048a 100644 --- a/templates/myhome.html +++ b/templates/myhome.html @@ -50,8 +50,8 @@
' + jsonVal[0]['error'] + '
'); + var jsonVal = jQuery.parseJSON(xhr.responseText); + $('#file-view').html('' + jsonVal[0]['error'] + '
'); } }); } @@ -69,10 +67,10 @@ } }, error: function(xhr, ajaxOptions, thrownError) { - var jsonVal = jQuery.parseJSON(xhr.responseText); - $('#file-view').html('' + jsonVal[0]['error'] + '
'); - abortTimer(); - return false; + var jsonVal = jQuery.parseJSON(xhr.responseText); + $('#file-view').html('' + jsonVal[0]['error'] + '
'); + abortTimer(); + return false; } }); } @@ -83,11 +81,10 @@ contentType: 'application/json; charset=utf-8', success: function(data) { if (data.length > 0) { - uuid = data[0]['uuid']; - obj_id = data[0]['obj_id']; - $('#file-view').html('文档内容读取成功,开始转换...
'); - - tid = setTimeout(check_status, 1000); + uuid = data[0]['uuid']; + obj_id = data[0]['obj_id']; + $('#file-view').html('文档内容读取成功,开始转换...
'); + tid = setTimeout(check_status, 1000); } }, error: function(xhr, ajaxOptions, thrownError) { @@ -98,7 +95,7 @@ } else if (filetype == 'PDF') { $.getScript('{{MEDIA_URL}}js/pdf.js', function() { PDFJS.workerSrc = '{{MEDIA_URL}}js/pdf.js'; - $('#file-view').html('