fix image search expand box, cut-off of 2nd capture line height

tested with IE11 and Firefox 32 (change worked for both to show 2nd line without cutting off height)

+fix charset parameter in metadataImageParser
+update start errMsgTxt to "java 1.7"
pull/1/head
reger 10 years ago
parent fa99b286cc
commit b0c87d8240

@ -1,8 +1,8 @@
/******************************************************************************
Name: Highslide JS
Version: 3.3.9 (February 15 2008)
Config: default
Author: Torstein Hønsi
Version: 3.3.9 (February 15 2008)
Config: default
Author: Torstein H<EFBFBD>nsi
Support: http://vikjavev.no/highslide/forum
Licence:
@ -1090,7 +1090,7 @@ setSize : function (to) {
try {
this.wrapper.style.width = (to.w + 2*this.offsetBorderW) +'px';
this.content.style.width =
((to.imgW && !isNaN(to.imgW)) ? to.imgW : to.w) +'px';
((to.imgW && !isNaN(to.imgW)) ? to.imgW : to.w) +'px';
if (hs.safari) this.content.style.maxWidth = this.content.style.width;
this.content.style.height = to.h +'px';
@ -1197,7 +1197,7 @@ writeCaption : function() {
null, null, true); // to get height
this.caption.innerHTML = '';
this.caption.appendChild(temp);
height = this.caption.childNodes[0].offsetHeight;
height = this.caption.offsetHeight;
this.caption.innerHTML = this.caption.childNodes[0].innerHTML;
}
hs.setStyles(this.caption, { overflow: 'hidden', height: 0, zIndex: 2, marginTop: 0 });

@ -157,7 +157,7 @@ public class metadataImageParser extends AbstractParser implements Parser {
return new Document[]{new Document(
location,
mimeType,
"UTF-8",
documentCharset,
this,
new HashSet<String>(0), // languages
keywords == null ? new String[]{} : keywords.split(keywords.indexOf(',') > 0 ? "," : " "), // keywords

@ -136,7 +136,7 @@ public final class yacy {
try {
"a".isEmpty(); // needs at least Java 1.6
} catch (final NoSuchMethodError e) {
System.err.println("STARTUP: Java Version too low. You need at least Java 1.6 to run YaCy");
System.err.println("STARTUP: Java Version too low. You need at least Java 1.7 to run YaCy");
System.exit(-1);
}

Loading…
Cancel
Save