KFNS#39913 IE11 bugfix en verbeterde weergave tabellen -> preview bijlagen plaatjes, nieuwe modal toegevoegd

svn path=/Website/trunk/; revision=37449
This commit is contained in:
2018-03-21 16:31:17 +00:00
parent f20bc471af
commit 05aa7b3907
2 changed files with 21 additions and 13 deletions

View File

@@ -65,12 +65,13 @@ function OpenFlexFile(module, niveau, key, kenmerk_key, fname, params)
<table class="preview" cellspacing="0" cellpadding="10">
<%
var lijst = [];
var mime_types = [];
var vAttachPath = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau).AttachPath + "/";
var fso = Server.CreateObject("Scripting.FileSystemObject")
if (vAttachPath && fso.FolderExists(vAttachPath))
{
var f, fc;
var f, fc, extension;
var regex = new RegExp(S("flexPreviewExt"));
fso = new ActiveXObject("Scripting.FileSystemObject");
f = fso.GetFolder(vAttachPath);
@@ -78,8 +79,12 @@ function OpenFlexFile(module, niveau, key, kenmerk_key, fname, params)
for (; !fc.atEnd(); fc.moveNext())
{
// Only preview the extensions as specified in S("flexPreviewExt")
if (regex.test("."+fso.GetExtensionName(fc.item())))
extension = fso.GetExtensionName(fc.item()); // Extension
if (regex.test("."+extension))
{
lijst.push(fc.item().Name);
mime_types.push(S("flex_mimetypes")[extension]);
}
}
}
@@ -92,22 +97,21 @@ function OpenFlexFile(module, niveau, key, kenmerk_key, fname, params)
picsPerLine = lijst.length < 4 ? lijst.length : Math.min(Math.round(Math.sqrt(lijst.length)), MAXPERLINE);
var href;
var tdWidth = parseInt(100/picsPerLine);
var imgWidth = parseInt((670-10*picsPerLine)/picsPerLine)+"px";
var tdWidth = parseInt(100/picsPerLine)+"%";
for (var i = 0; i < lijst.length; i++)
{
href = protectQS.create(OpenFlexFile(pModule, pNiveau, pKey, pKenmerk_key, lijst[i]));
href = protectQS.create(OpenFlexFile(pModule, pNiveau, pKey, pKenmerk_key, lijst[i], { mime_type: mime_types[i] }));
if (i % picsPerLine == 0)
{
%> <tr valign="top">
<% } %>
<td onclick="FcltMgr.windowopen('<%=safe.jsstring(href)%>', 'File')" style="width:<%=tdWidth%>%">
<div>
<img src="<%=safe.htmlattr(href)%>" class="preview" alt="<%=lijst[i]%>">
<br>
<%=lijst[i]%>
</div>
<td onclick="FcltMgr.windowopen('<%=safe.jsstring(href)%>', 'File')" style="width:<%=tdWidth%>">
<img src="<%=safe.htmlattr(href)%>" class="preview" alt="<%=lijst[i]%>" style="max-width:<%=imgWidth%>">
<br>
<%=lijst[i]%>
</td>
<% if ((i+1) % picsPerLine == 0)

View File

@@ -874,6 +874,7 @@ table.preview {
width: 100%;
}
table.preview tr td {
padding: 1px;
max-height: 170px;
height: 100%;
position: relative;
@@ -882,17 +883,20 @@ table.preview tr td {
cursor: pointer;
}
table.preview tr td > div > img {
table.preview tr td {
word-break: break-all;
}
table.preview tr td > img {
opacity: 1;
-webkit-transition: all 0.35s ease;
transition: all 0.35s ease;
}
table.preview tr td:hover > div > img {
table.preview tr td:hover > img {
opacity: 0.5;
-webkit-transition: all 0.35s ease;
transition: all 0.35s ease;
}
img.preview { max-width: 100%; }
/* uren registratie iconen. Moeten misschien een keer een autokleur krijgen */
.notperfect .fa-comment-o, .notperfect .fa-comment {