summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-08-13 07:47:27 (EDT)
committer Stephan Born2013-09-23 05:00:12 (EDT)
commit18d9e7381cb37ca618a93f659f9db707b0ebf14d (patch)
tree9bea91278782ec78a478bc69dfbe66f6ca5289c5
parentc9fcf0bf8d0d2f7794a0d0fe1565c4c797cb1e80 (diff)
downloadorg.eclipse.stardust.ui.web-18d9e7381cb37ca618a93f659f9db707b0ebf14d.zip
org.eclipse.stardust.ui.web-18d9e7381cb37ca618a93f659f9db707b0ebf14d.tar.gz
org.eclipse.stardust.ui.web-18d9e7381cb37ca618a93f659f9db707b0ebf14d.tar.bz2
Jira-ID: CRNT-29841
Made changes to tiffViewerEventScript.js for resize tiff. Removed unwanted method call from TIFFViewer.java git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@66656 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/document/TIFFViewer.java3
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/scripts/tiffViewerEventScript.js10
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/views/document/documentView.xhtml6
3 files changed, 5 insertions, 14 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/document/TIFFViewer.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/document/TIFFViewer.java
index cf7857c..59c7283 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/document/TIFFViewer.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/document/TIFFViewer.java
@@ -342,9 +342,6 @@ public class TIFFViewer implements IDocumentViewer, ICustomDocumentSaveHandler,
String pagePath = docHolder.getDefaultPagePath();
pagePath += "&isEditable=" + documentInfo.isContentEditable();
- restoreTiffIframe();
- String anchor = "tiffViewerIframe";
-
String activateScript = "activateAndResizeIframe('" + frameId + "','" + pagePath + "')";
if (iframeDelay > 0)
{
diff --git a/views-common/src/main/resources/META-INF/xhtml/scripts/tiffViewerEventScript.js b/views-common/src/main/resources/META-INF/xhtml/scripts/tiffViewerEventScript.js
index 3a19347..392f999 100644
--- a/views-common/src/main/resources/META-INF/xhtml/scripts/tiffViewerEventScript.js
+++ b/views-common/src/main/resources/META-INF/xhtml/scripts/tiffViewerEventScript.js
@@ -26,14 +26,12 @@ function restoreTiffIframe(iframeId, anchorId) {
var windowHeight = document.body.clientHeight;
docWidth = parseInt((document.body.clientWidth - leftValue)) - 30;
- docHeight = parseInt(docWidth * 1.2) + 60;
- var canvasHeight = docHeight;
- var canvasWidth = docWidth;
+ docHeight = parseInt(docWidth * 1.2)+70;
docHeight -= topValue;
if (document.getElementById('tiffViewerIframe')) {
- document.getElementById('tiffViewerIframe').style.width = canvasWidth;
+ document.getElementById('tiffViewerIframe').style.width = docWidth;
+'px';
document.getElementById('tiffViewerIframe').style.height = docHeight;
+'px';
@@ -43,8 +41,8 @@ function restoreTiffIframe(iframeId, anchorId) {
this.parent.window.BridgeUtils.FrameManager.resizeAndReposition(
iframeId, {
anchorId : anchorId,
- canvasWidth : canvasWidth,
- canvasHeight : canvasHeight,
+ canvasWidth : docWidth,
+ canvasHeight : docHeight,
width : docWidth,
height : docHeight
});
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/document/documentView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/document/documentView.xhtml
index ac5024d..e8b86cb 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/document/documentView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/document/documentView.xhtml
@@ -37,7 +37,7 @@
value="#{documentHandlerBean.messages['details.label']}" />
</ice:panelGroup>
</f:facet>
- <ice:panelGroup styleClass="documentviewer-subpanel" style="padding: 5px;">
+ <ice:panelGroup>
<!-- Properties -->
<ice:panelGroup style="padding-bottom: 5px;">
@@ -169,15 +169,11 @@
<!-- Spacer -->
<ice:panelGroup>
- <ice:panelGroup styleClass="clearing" />
<hr style="color: lightblue;" />
- <ice:panelGroup styleClass="clearing" />
</ice:panelGroup>
</ice:panelGroup>
</ice:panelCollapsible>
- <ice:panelGroup styleClass="clearing" />
-
<!-- Document Content Panel -->
<ice:panelGroup id="contentPanel">
<f:facet name="header">