Changeset 5766

Timestamp:

Sep 28, 2011, 8:46:08 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1627: The "test with file" function has annoying double scrollbars in "File data tab"

Location:

trunk/www/common/plugin

Files:

• parse_file.jsp (modified) (2 diffs)
• test_with_file.jsp (modified) (2 diffs)

trunk/www/common/plugin/parse_file.jsp

@@ -248 +248 @@
     </script>
   </base:head>
-  <base:body onload="window.parent.adjustIFrameSize()">
+  <base:body onload="window.parent.adjustIFrameSize()" style="padding-left: 0px;">
   <t:tabcontrol id="parsedFile" 
     contentstyle="<%="height: "+(int)(scale*400)+"px;"%>" autoheight="false">
@@ -285 +285 @@
       }
       %>
-      <table class="itemlist" border="0" cellspacing="0" cellpadding="0">
+      <table class="itemlist" border="0" cellspacing="0" cellpadding="0" style="padding-right: 1px;">
       <tr>
         <td class="data">

trunk/www/common/plugin/test_with_file.jsp

@@ -77 +77 @@
       
       var iframe = window.frames['parsed'];
+      var width = Main.getWindowWidth(iframe);
       var parsedFile = iframe.document.getElementById('parsedFile.content');
       if (parsedFile) 
       {
-        var width = Main.getWindowWidth(iframe);
         parsedFile.style.height = (height-40)+'px';
-        if (Browser.isIE) parsedFile.style.width = (width-30)+'px';
+        parsedFile.style.width = (width-20)+'px';
       }
       inCall = false;
@@ -431 +431 @@
       <iframe name="parsed" id="idParsed" src="parse_file.jsp?ID=<%=ID%>" width="100%" 
         frameborder="0" vspace="0" hspace="0"
-        marginwidth="0" marginheight="0" scrolling="no" style="overflow: visible;"></iframe>
+        marginwidth="0" marginheight="0" scrolling="no" style="overflow: hidden;;"></iframe>