Browse Source

预览出错时,有详细信息才显示"更多信息"按钮

sunyj 9 years ago
parent
commit
ef19256e2e

+ 2 - 2
src/main/webapp/WEB-INF/views/preview2.html

@@ -64,11 +64,11 @@
 	<div id="errorMessageContainer" hidden="true">
 		<p id="message"></p>
 		<button id="detailedMessageButton" class="viewerContainerButton"
-			title="获取更多错误信息">更多信息</button>
+			title="获取更多错误信息" hidden="true">更多信息</button>
 		<p id="detailedMessage" hidden="true"></p>
 	</div>
 
-	<iframe id="hiddenFrame" hidden='true'></iframe>
+	<iframe id="hiddenFrame" hidden="true"></iframe>
 </body>
 
 <script src="static/lib/pdf.js/build/pdf.js"></script>

+ 12 - 9
src/main/webapp/resources/js/preview2/app.js

@@ -304,23 +304,26 @@ function loadData() {
 		error : function(XMLHttpRequest) {
 			$("#theCanvas").remove();
 			$("#errorMessageContainer").removeAttr("hidden");
-			
-			//处理后台传输的自定义的换行标志
+
+			// 处理后台传输的自定义的换行标志
 			var result = JSON.parse(XMLHttpRequest.responseText);
 			var message = result.message;
 			console.log(message);
 			$("#message").html(message);
-			$("#detailedMessageButton").click(function(){
+			if (result.detailedMessage) {
+				$("#detailedMessageButton").removeAttr("hidden");
+			}
+			$("#detailedMessageButton").click(function() {
 				$("#detailedMessage").html(result.detailedMessage);
 				$("#detailedMessage").removeAttr("hidden");
 			});
-//			var p = document.createElement("p");
-//			p.style.color = "#fff";
-//			p.style.textAlign = "left";
-//			p.style.marginLeft = "20px";
+			// var p = document.createElement("p");
+			// p.style.color = "#fff";
+			// p.style.textAlign = "left";
+			// p.style.marginLeft = "20px";
 			// 将返回的错误信息显示在页面上
-//			p.textContent = XMLHttpRequest.responseText;
-//			viewerContainer.appendChild(p);
+			// p.textContent = XMLHttpRequest.responseText;
+			// viewerContainer.appendChild(p);
 		}
 	});
 };