diff --git a/build.properties b/build.properties
index a4315b6ea..eb0ace2ca 100644
--- a/build.properties
+++ b/build.properties
@@ -3,7 +3,7 @@ javacSource=1.5
javacTarget=1.5
# Release Configuration
-releaseVersion=0.571
+releaseVersion=0.572
stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
diff --git a/htroot/js/highslide/graphics/controlbar2.gif b/htroot/js/highslide/graphics/controlbar2.gif
new file mode 100755
index 000000000..39ad65218
Binary files /dev/null and b/htroot/js/highslide/graphics/controlbar2.gif differ
diff --git a/htroot/js/highslide/graphics/controlbar3.gif b/htroot/js/highslide/graphics/controlbar3.gif
new file mode 100755
index 000000000..3eebb8110
Binary files /dev/null and b/htroot/js/highslide/graphics/controlbar3.gif differ
diff --git a/htroot/js/highslide/graphics/controlbar4-hover.gif b/htroot/js/highslide/graphics/controlbar4-hover.gif
new file mode 100755
index 000000000..ca08b59c2
Binary files /dev/null and b/htroot/js/highslide/graphics/controlbar4-hover.gif differ
diff --git a/htroot/js/highslide/graphics/controlbar4.gif b/htroot/js/highslide/graphics/controlbar4.gif
new file mode 100755
index 000000000..7a3ad3442
Binary files /dev/null and b/htroot/js/highslide/graphics/controlbar4.gif differ
diff --git a/htroot/js/highslide/graphics/fullexpand.gif b/htroot/js/highslide/graphics/fullexpand.gif
new file mode 100755
index 000000000..26d9ed02b
Binary files /dev/null and b/htroot/js/highslide/graphics/fullexpand.gif differ
diff --git a/htroot/js/highslide/graphics/geckodimmer.png b/htroot/js/highslide/graphics/geckodimmer.png
new file mode 100755
index 000000000..309bb2783
Binary files /dev/null and b/htroot/js/highslide/graphics/geckodimmer.png differ
diff --git a/htroot/js/highslide/graphics/loader.gif b/htroot/js/highslide/graphics/loader.gif
new file mode 100755
index 000000000..0b31f6f9e
Binary files /dev/null and b/htroot/js/highslide/graphics/loader.gif differ
diff --git a/htroot/js/highslide/graphics/loader.white.gif b/htroot/js/highslide/graphics/loader.white.gif
new file mode 100755
index 000000000..f2a1bc0c6
Binary files /dev/null and b/htroot/js/highslide/graphics/loader.white.gif differ
diff --git a/htroot/js/highslide/graphics/outlines/Outlines.psd b/htroot/js/highslide/graphics/outlines/Outlines.psd
new file mode 100755
index 000000000..540565151
Binary files /dev/null and b/htroot/js/highslide/graphics/outlines/Outlines.psd differ
diff --git a/htroot/js/highslide/graphics/outlines/beveled.png b/htroot/js/highslide/graphics/outlines/beveled.png
new file mode 100755
index 000000000..9ce68ef41
Binary files /dev/null and b/htroot/js/highslide/graphics/outlines/beveled.png differ
diff --git a/htroot/js/highslide/graphics/outlines/drop-shadow.png b/htroot/js/highslide/graphics/outlines/drop-shadow.png
new file mode 100755
index 000000000..f46b756cc
Binary files /dev/null and b/htroot/js/highslide/graphics/outlines/drop-shadow.png differ
diff --git a/htroot/js/highslide/graphics/outlines/glossy-dark.png b/htroot/js/highslide/graphics/outlines/glossy-dark.png
new file mode 100755
index 000000000..d862d6cff
Binary files /dev/null and b/htroot/js/highslide/graphics/outlines/glossy-dark.png differ
diff --git a/htroot/js/highslide/graphics/outlines/outer-glow.png b/htroot/js/highslide/graphics/outlines/outer-glow.png
new file mode 100755
index 000000000..46909345e
Binary files /dev/null and b/htroot/js/highslide/graphics/outlines/outer-glow.png differ
diff --git a/htroot/js/highslide/graphics/outlines/rounded-black.png b/htroot/js/highslide/graphics/outlines/rounded-black.png
new file mode 100755
index 000000000..3bf5d2177
Binary files /dev/null and b/htroot/js/highslide/graphics/outlines/rounded-black.png differ
diff --git a/htroot/js/highslide/graphics/outlines/rounded-white.png b/htroot/js/highslide/graphics/outlines/rounded-white.png
new file mode 100755
index 000000000..39432a798
Binary files /dev/null and b/htroot/js/highslide/graphics/outlines/rounded-white.png differ
diff --git a/htroot/js/highslide/graphics/resize.gif b/htroot/js/highslide/graphics/resize.gif
new file mode 100755
index 000000000..9100de776
Binary files /dev/null and b/htroot/js/highslide/graphics/resize.gif differ
diff --git a/htroot/js/highslide/graphics/zoomin.cur b/htroot/js/highslide/graphics/zoomin.cur
new file mode 100755
index 000000000..cb7912438
Binary files /dev/null and b/htroot/js/highslide/graphics/zoomin.cur differ
diff --git a/htroot/js/highslide/graphics/zoomout.cur b/htroot/js/highslide/graphics/zoomout.cur
new file mode 100755
index 000000000..acf619996
Binary files /dev/null and b/htroot/js/highslide/graphics/zoomout.cur differ
diff --git a/htroot/js/highslide.js b/htroot/js/highslide/highslide.js
similarity index 59%
rename from htroot/js/highslide.js
rename to htroot/js/highslide/highslide.js
index 60b043856..a7245f21b 100755
--- a/htroot/js/highslide.js
+++ b/htroot/js/highslide/highslide.js
@@ -1,7 +1,7 @@
-/******************************************************************************
+ /******************************************************************************
Name: Highslide JS
Version: 3.3.9 (February 15 2008)
-Config: default +positioning +events +unobtrusive +transitions +inline +ajax +iframe +flash
+Config: default
Author: Torstein Hønsi
Support: http://vikjavev.no/highslide/forum
@@ -28,7 +28,8 @@ Your fair use and other rights are in no way affected by the above.
var hs = {
-// Apply your own settings here, or override them in the html file.
+// Apply your own settings here, or override them in the html file.
+graphicsDir : '/js/highslide/graphics/',
restoreCursor : 'zoomout.cur', // necessary for preload
expandSteps : 10, // number of steps in zoom. Each step lasts for duration/step milliseconds.
expandDuration : 250, // milliseconds
@@ -59,29 +60,9 @@ creditsText : 'Powered by Highslide JS',
creditsHref : 'http://vikjavev.no/highslide/',
creditsTitle : 'Go to the Highslide JS homepage',
enableKeyListener : true,
-transitions : [],
-dimmingOpacity: 0, // Lightbox style dimming background
-dimmingDuration: 50, // 0 for instant dimming
-
-// HTML extension
-
-previousText : 'Previous',
-nextText : 'Next',
-moveText : 'Move',
-closeText : 'Close',
-closeTitle : 'Click to close',
-resizeTitle : 'Resize',
-allowWidthReduction : false,
-allowHeightReduction : true,
-preserveContent : true, // Preserve changes made to the content and position of HTML popups.
-objectLoadTime : 'before', // Load iframes 'before' or 'after' expansion.
-cacheAjax : true, // Cache ajax popups for instant display. Can be overridden for each popup.
+
// These settings can also be overridden inline for each image
-anchor : 'auto', // where the image expands from
-align : 'auto', // position in the client (overrides anchor)
-targetX: null, // the id of a target element
-targetY: null,
captionId : null,
spaceForCaption : 30, // leaves space below images with captions
slideshowGroup : null, // defines groups for next/previous links and keystrokes
@@ -100,31 +81,13 @@ continuePreloading: true,
expanders : [],
overrides : [
'allowSizeReduction',
- 'anchor',
- 'align',
- 'targetX',
- 'targetY',
'outlineType',
'outlineWhileAnimating',
'spaceForCaption',
'captionId',
'captionText',
'captionEval',
- 'transitions',
- 'dimmingOpacity',
-
- 'contentId',
- 'width',
- 'height',
- 'allowWidthReduction',
- 'allowHeightReduction',
- 'preserveContent',
- 'objectType',
- 'cacheAjax',
- 'objectWidth',
- 'objectHeight',
- 'objectLoadTime',
- 'swfObject',
+
'wrapperClassName',
'minWidth',
'minHeight',
@@ -137,10 +100,6 @@ overlays : [],
faders : [],
pendingOutlines : {},
-sleeping : [],
-preloadTheseAjax : [],
-cacheBindings : [],
-cachedGets : {},
clones : {},
ie : (document.all && !window.opera),
safari : /Safari/.test(navigator.userAgent),
@@ -185,28 +144,13 @@ ieVersion : function () {
getPageSize : function () {
var iebody = document.compatMode && document.compatMode != "BackCompat"
- ? document.documentElement : document.body;
-
-
- var b = document.body;
- var xScroll = (window.innerWidth && window.scrollMaxX)
- ? window.innerWidth + window.scrollMaxX :
- (b.scrollWidth > b.offsetWidth ? b.scrollWidth : b.offsetWidth),
- yScroll = (window.innerHeight && window.scrollMaxY)
- ? window.innerHeight + window.scrollMaxY :
- (b.scrollHeight > b.offsetHeight ? b.scrollHeight : b.offsetHeight),
- pageWidth = hs.ie ? iebody.scrollWidth :
- (document.documentElement.clientWidth || self.innerWidth);
- pageHeight = hs.ie ? iebody.clientHeight :
- (document.documentElement.clientHeight || self.innerHeight);
+ ? document.documentElement : document.body;
var width = hs.ie ? iebody.clientWidth :
(document.documentElement.clientWidth || self.innerWidth),
height = hs.ie ? iebody.clientHeight : self.innerHeight;
return {
- pageWidth: xScroll < pageWidth ? pageWidth : xScroll,
- pageHeight: yScroll < pageHeight ? pageHeight : yScroll,
width: width,
height: height,
scrollLeft: hs.ie ? iebody.scrollLeft : pageXOffset,
@@ -237,118 +181,6 @@ expand : function(a, params, custom) {
} catch (e) { return true; }
},
-htmlExpand : function(a, params, custom) {
- if (a.getParams) return params;
-
- for (var i = 0; i < hs.sleeping.length; i++) {
- if (hs.sleeping[i] && hs.sleeping[i].a == a) {
- hs.sleeping[i].awake();
- hs.sleeping[i] = null;
- return false;
- }
- }
- try {
- hs.hasHtmlexpanders = true;
- new hs.Expander(a, params, custom, 'html');
- return false;
- } catch (e) {
- return true;
- }
-},
-
-getElementByClass : function (el, tagName, className) {
- var els = el.getElementsByTagName(tagName);
- for (var i = 0; i < els.length; i++) {
- if (els[i].className == className) {
- return els[i];
- }
- }
-},
-
-getSelfRendered : function() {
- var s =
- ''
- +''
- +'';
- return hs.createElement('div', { className: 'highslide-html-content', innerHTML: s } );
-},
-
-
-setClickEvents : function () {
- var els = document.getElementsByTagName('A');
- for (var i = 0; i < els.length; i++) {
- if (/^highslide$/.test(els[i].rel)) {
- if (hs.fireEvent(hs, 'onSetClickEvent', { element: els[i] })) {
-
- els[i].onclick = function() { return hs.expand(this) };
- }
-
- els[i].removeAttribute('rel');
- }
-
- var match = /^highslide-(ajax|iframe)$/.exec(els[i].rel);
- if (match) {
- (function(){
- var t = match[1];
- if (hs.fireEvent(hs, 'onSetClickEvent', { element: els[i], type: t })) {
-
- els[i].onclick = function() {
- return hs.htmlExpand(this, { objectType: t } );
- };
- }
- })();
- els[i].removeAttribute('rel');
- }
- }
- if (!hs.pageLoaded) setTimeout( hs.setClickEvents, 50);
-},
-
-getCacheBinding : function (a) {
- for (var i = 0; i < hs.cacheBindings.length; i++) {
- if (hs.cacheBindings[i][0] == a) {
- var c = hs.cacheBindings[i][1];
- hs.cacheBindings[i][1] = c.cloneNode(1);
- return c;
- }
- }
-},
-
-preloadAjax : function (e) {
- var aTags = document.getElementsByTagName('A');
- var a, re;
- for (var i = 0; i < aTags.length; i++) {
- a = aTags[i];
- re = hs.isHsAnchor(a);
- if (re && re[0] == 'hs.htmlExpand' && hs.getParam(a, 'objectType') == 'ajax'
- && hs.getParam(a, 'cacheAjax')) {
- hs.push(hs.preloadTheseAjax, a);
- }
- }
- hs.preloadAjaxElement(0);
-},
-
-preloadAjaxElement : function (i) {
- if (!hs.preloadTheseAjax[i]) return;
- var a = hs.preloadTheseAjax[i];
- var cache = hs.getNode(hs.getParam(a, 'contentId'));
- if (!cache) cache = hs.getSelfRendered();
- var ajax = new hs.Ajax(a, cache, 1);
- ajax.onError = function () { };
- ajax.onLoad = function () {
- hs.push(hs.cacheBindings, [a, cache]);
- hs.preloadAjaxElement(i + 1);
- };
- ajax.run();
-},
-
focusTopmost : function() {
var topZ = 0, topmostKey = -1;
for (var i = 0; i < hs.expanders.length; i++) {
@@ -426,34 +258,6 @@ purge : function(d) {
}
}
},
-dim : function(exp) {
- if (!hs.dimmer) {
- hs.dimmer = hs.createElement ('div',
- { className: 'highslide-dimming', onclick: function() { hs.close() } },
- { position: 'absolute' }, hs.container, true);
- hs.addEventListener(window, 'resize', hs.setDimmerSize);
- }
- hs.dimmer.style.display = '';
- hs.setDimmerSize();
- hs.dimmer.owner = exp.key;
- hs.fade(hs.dimmer, 0, exp.dimmingOpacity, hs.dimmingDuration);
-},
-unDim : function(key) {
- if (!hs.dimmer) return;
- if (typeof key != 'undefined' && key != hs.dimmer.owner) return;
- if (hs.upcoming && hs.getParam(hs.upcoming, 'dimmingOpacity')) return;
- if (hs.geckoMac && hs.dimmingGeckoFix)
- hs.dimmer.style.background = 'none';
- else hs.fade(hs.dimmer, hs.dimmingOpacity, 0, hs.dimmingDuration);
- setTimeout( function() {
- hs.dimmer.style.display = 'none';
- }, 250);
-},
-setDimmerSize : function() {
- if (!hs.dimmer) return;
- var page = hs.getPageSize();
- hs.setStyles(hs.dimmer, { width: page.pageWidth +'px', height: page.pageHeight +'px'});
-},
previousOrNext : function (el, op) {
var exp = hs.last = hs.getExpander(el);
@@ -477,7 +281,6 @@ keyHandler : function(e) {
if (!e) e = window.event;
if (!e.target) e.target = e.srcElement; // ie
if (e.target.form) return; // form element has focus
- if (!hs.fireEvent(hs, 'onKeyDown', e)) return;
var op = null;
switch (e.keyCode) {
@@ -554,9 +357,6 @@ cleanUp : function () {
for (var i = 0; i < hs.expanders.length; i++)
if (hs.expanders[i] && hs.expanders[i].isExpanded) hs.focusTopmost();
},
-fireEvent : function (obj, evt, args) {
- return obj && obj[evt] ? (obj[evt](obj, args) !== false) : true;
-},
mouseClickHandler : function(e)
{
@@ -591,10 +391,6 @@ mouseClickHandler : function(e)
}
return false;
}
- else if (/highslide-html/.test(el.className) && hs.focusKey != exp.key) {
- exp.focus();
- exp.redoShowHide();
- }
} else if (e.type == 'mouseup') {
hs.removeEventListener(document, 'mousemove', hs.dragHandler);
@@ -607,19 +403,12 @@ mouseClickHandler : function(e)
var hasDragged = (Math.abs(hs.dragArgs.dX) + Math.abs(hs.dragArgs.dY) > 0);
if (!hasDragged &&!hs.hasFocused && !/(move|resize)/.test(hs.dragArgs.type)) {
- if (hs.fireEvent(exp, 'onImageClick'))
exp.close();
}
else if (hasDragged || (!hasDragged && hs.hasHtmlexpanders)) {
hs.dragArgs.exp.redoShowHide();
}
- if (hs.dragArgs.exp.releaseMask)
- hs.dragArgs.exp.releaseMask.style.display = 'none';
-
- if (hasDragged) hs.fireEvent(hs.dragArgs.exp, 'onDrop', hs.dragArgs);
- if (hasDragged) hs.setDimmerSize();
-
hs.hasFocused = false;
hs.dragArgs = null;
@@ -634,22 +423,11 @@ dragHandler : function(e)
if (!hs.dragArgs) return;
if (!e) e = window.event;
var exp = hs.dragArgs.exp;
- if (exp.iframe) {
- if (!exp.releaseMask) exp.releaseMask = hs.createElement('div', null,
- { position: 'absolute', width: exp.x.span+'px', height: exp.y.span+'px',
- left: 0, top: 0, zIndex: 4, background: (hs.ie ? 'white' : 'none'),
- opacity: 0.01 },
- exp.wrapper, true);
- if (exp.releaseMask.style.display == 'none')
- exp.releaseMask.style.display = '';
- }
hs.dragArgs.dX = e.clientX - hs.dragArgs.clickX;
hs.dragArgs.dY = e.clientY - hs.dragArgs.clickY;
- if (!hs.fireEvent(exp, 'onDrag', hs.dragArgs)) return false;
- if (hs.dragArgs.type == 'resize') exp.resize(hs.dragArgs);
- else exp.move(hs.dragArgs);
+ exp.move(hs.dragArgs);
return false;
},
@@ -703,6 +481,10 @@ preloadImages : function (number) {
// preload outlines
new hs.Outline(hs.outlineType, function () { hs.preloadFullImage(0)} );
+
+
+ // preload cursor
+ var cur = hs.createElement('img', { src: hs.graphicsDir + hs.restoreCursor });
},
@@ -728,8 +510,6 @@ genContainer : function () {
zIndex: 1
}, hs.container
);
- hs.clearing = hs.createElement('div', null,
- { clear: 'both', paddingTop: '1px' }, null, true);
// http://www.robertpenner.com/easing/
Math.linearTween = function (t, b, c, d) {
@@ -738,7 +518,6 @@ genContainer : function () {
Math.easeInQuad = function (t, b, c, d) {
return c*(t/=d)*t + b;
};
- hs.fireEvent(this, 'onActivate');
}
},
@@ -815,13 +594,17 @@ hs.Outline = function (outlineType, onLoad) {
};
hs.Outline.prototype = {
-preloadGraphic : function () {
+preloadGraphic : function () {
+ var src = hs.graphicsDir + (hs.outlinesDir || "outlines/")+ this.outlineType +".png";
+
var appendTo = hs.safari ? hs.container : null;
this.graphic = hs.createElement('img', null, { position: 'absolute', left: '-9999px',
top: '-9999px' }, appendTo, true); // for onload trigger
var pThis = this;
this.graphic.onload = function() { pThis.onGraphicLoad(); };
+
+ this.graphic.src = src;
},
onGraphicLoad : function () {
@@ -844,6 +627,8 @@ onGraphicLoad : function () {
},
div,
true);
+ } else {
+ hs.setStyles(this.td[i], { background: 'url('+ this.graphic.src +') '+ (pos[i][0]*o)+'px '+(pos[i][1]*o)+'px'});
}
if (window.opera && (i == 3 || i ==5))
@@ -886,7 +671,6 @@ hs.Expander = function(a, params, custom, contentType) {
this.a = a;
this.custom = custom;
this.contentType = contentType || 'image';
- this.isHtml = (contentType == 'html');
this.isImage = !this.isHtml;
hs.continuePreloading = false;
@@ -904,7 +688,6 @@ hs.Expander = function(a, params, custom, contentType) {
var el = this.thumb = (params ? hs.$(params.thumbnailId) : null)
|| a.getElementsByTagName('IMG')[0] || a;
this.thumbsUserSetId = el.id || a.id;
- if (!hs.fireEvent(this, 'onInit')) return;
// check if already open
for (var i = 0; i < hs.expanders.length; i++) {
@@ -995,9 +778,6 @@ displayLoading : function() {
this.loading.onclick = function() {
exp.cancelLoading();
};
-
-
- if (!hs.fireEvent(this, 'onShowLoading')) return;
this.loading.style.top = (this.thumbTop
+ (this.thumbHeight - this.loading.offsetHeight) / 2) +'px';
var exp = this, left = (this.thumbLeft + this.thumbOffsetBorderW
@@ -1028,61 +808,6 @@ imageCreate : function() {
this.displayLoading();
},
-htmlCreate : function () {
- if (!hs.fireEvent(this, 'onBeforeGetContent')) return;
- this.tempContainer = hs.createElement('div', { className: this.wrapperClassName },
- {
- padding: '0 '+ hs.marginRight +'px 0 '+ hs.marginLeft +'px',
- visibility: 'hidden'
- }, hs.container
- );
-
- this.content = hs.getCacheBinding(this.a);
- if (!this.content)
- this.content = hs.getNode(this.contentId);
- if (!this.content)
- this.content = hs.getSelfRendered();
-
- hs.fireEvent(this, 'onAfterGetContent');
- this.innerContent = this.content;
-
- if (this.swfObject || this.objectType == 'iframe') this.setObjContainerSize(this.innerContent);
- this.tempContainer.appendChild(this.innerContent); // to get full width
- hs.setStyles (this.innerContent, { position: 'relative', visibility: 'hidden' });
- this.innerContent.className += ' highslide-display-block';
- if (this.width) this.innerContent.style.width = this.width+'px';
- if (this.height) this.innerContent.style.height = this.height+'px';
- if (this.innerContent.offsetWidth < this.minWidth)
- this.innerContent.style.width = this.minWidth +'px';
-
- this.content = hs.createElement(
- 'div',
- { className: 'highslide-html' },
- {
- position: 'relative',
- zIndex: 3,
- overflow: 'hidden',
- width: this.thumbWidth +'px',
- height: this.thumbHeight +'px'
- }
- );
-
- if (this.objectType == 'ajax' && !hs.getCacheBinding(this.a)) {
- var ajax = new hs.Ajax(this.a, this.innerContent);
- var exp = this;
- ajax.onLoad = function () { if (hs.expanders[exp.key]) exp.contentLoaded(); };
- ajax.onError = function () { location.href = hs.getSrc(this.a); };
- ajax.run();
- }
- else
-
- if (this.objectType == 'iframe' && this.objectLoadTime == 'before') {
- this.writeExtendedContent();
- }
- else
- this.contentLoaded();
-},
-
contentLoaded : function() {
try {
if (!this.content) return;
@@ -1094,10 +819,8 @@ contentLoaded : function() {
this.loading.style.left = '-9999px';
this.loading = null;
this.a.style.cursor = this.originalCursor || '';
- hs.fireEvent(this, 'onHideLoading');
}
- this.marginBottom = hs.marginBottom;
- if (this.isImage) {
+ this.marginBottom = hs.marginBottom;
this.newWidth = this.content.width;
this.newHeight = this.content.height;
this.fullExpandWidth = this.newWidth;
@@ -1105,8 +828,7 @@ contentLoaded : function() {
this.content.style.width = this.thumbWidth +'px';
this.content.style.height = this.thumbHeight +'px';
- this.getCaption();
- } else if (this.htmlGetSize) this.htmlGetSize();
+ this.getCaption();
this.wrapper.appendChild(this.content);
@@ -1130,16 +852,6 @@ contentLoaded : function() {
var justify = { x: 'auto', y: 'auto' };
- if (this.align == 'center') {
- justify.x = 'center';
- justify.y = 'center';
- } else {
- if (this.anchor.match(/^top/)) justify.y = null;
- if (this.anchor.match(/right$/)) justify.x = 'max';
- if (this.anchor.match(/^bottom/)) justify.y = 'max';
- if (this.anchor.match(/left$/)) justify.x = null;
- }
-
var page = hs.getPageSize();
// justify
this.x = {
@@ -1147,8 +859,6 @@ contentLoaded : function() {
span: this.newWidth,
minSpan: (this.newWidth < minWidth && !hs.padToMinWidth)
? this.newWidth : minWidth,
- justify: justify.x,
- target: this.targetX,
marginMin: hs.marginLeft,
marginMax: modMarginRight,
scroll: page.scrollLeft,
@@ -1161,8 +871,6 @@ contentLoaded : function() {
min: parseInt(this.thumbTop) - this.offsetBorderH + this.thumbOffsetBorderH,
span: this.newHeight,
minSpan: this.newHeight < minHeight ? this.newHeight : minHeight,
- justify: justify.y,
- target: this.targetY,
marginMin: hs.marginTop,
marginMax: this.marginBottom,
scroll: page.scrollTop,
@@ -1171,9 +879,7 @@ contentLoaded : function() {
};
var oldBottom = this.y.min + parseInt(this.thumbHeight);
this.y = this.justify(this.y);
- if (this.isHtml) this.htmlSizeOperations();
- if (this.isImage)
this.correctRatio(ratio);
@@ -1186,176 +892,16 @@ contentLoaded : function() {
}
},
-
-setObjContainerSize : function(parent, auto) {
- var c = hs.getElementByClass(parent, 'DIV', 'highslide-body');
-
- if (this.objectType == 'iframe') {
- if (this.objectWidth) c.style.width = this.objectWidth +'px';
- if (this.objectHeight) c.style.height = this.objectHeight +'px';
- }
- if (this.swfObject) {
- c.style.width = this.swfObject.attributes.width +'px';
- c.style.height = this.swfObject.attributes.height +'px';
- }
-},
-
-writeExtendedContent : function (loadTime) {
- if (this.hasExtendedContent) return;
- var exp = this;
- this.body = hs.getElementByClass(this.innerContent, 'DIV', 'highslide-body');
- if (this.objectType == 'iframe') {
- this.displayLoading();
- this.ruler = hs.clearing.cloneNode(1);
- this.body.appendChild(this.ruler);
- this.newWidth = this.innerContent.offsetWidth;
- if (!this.objectWidth) this.objectWidth = this.ruler.offsetWidth;
- var hDiff = this.innerContent.offsetHeight - this.body.offsetHeight;
- var h = this.objectHeight || (hs.getPageSize()).height - hDiff - hs.marginTop - hs.marginBottom;
- var onload = (hs.ie && this.objectLoadTime == 'before') ?
- 'onload="if(hs.expanders['+ this.key +'])hs.expanders['+ this.key +'].contentLoaded();"' : '';
- var tag = hs.ie ? '' : 'iframe';
- this.iframe = hs.createElement(tag,
- { name: 'hsIframe'+ this.key, frameBorder: 0, allowTransparency: true },
- { width: this.objectWidth +'px', height: h +'px' },
- this.body);
- if (this.objectLoadTime == 'before') {
- if (!hs.ie) this.iframe.onload = function () { if (hs.expanders[exp.key]) exp.contentLoaded(); };
- }
- if (hs.safari) this.iframe.src = null;
- this.iframe.src = hs.getSrc(this.a);
-
- if (this.objectLoadTime == 'after') this.correctIframeSize();
-
- } else if (this.swfObject) {
- this.body.id = this.body.id || 'hs-flash-id-' + this.key;
- this.swfObject.write(this.body.id);
- }
- this.hasExtendedContent = true;
-},
-htmlGetSize : function() {
- if (this.iframe && !this.objectHeight) { // loadtime before
- try {
- var doc = this.iframe.contentDocument || this.iframe.contentWindow.document;
- var clearing = doc.createElement('div');
- clearing.style.clear = 'both';
- doc.body.appendChild(clearing);
- var h = clearing.offsetTop;
- if (hs.ie) h += parseInt(doc.body.currentStyle.marginTop)
- + parseInt(doc.body.currentStyle.marginBottom) - 1;
- this.iframe.style.height = this.body.style.height = h +'px';
- } catch (e) { // other domain
- this.iframe.style.height = '300px';
- }
- }
- this.innerContent.appendChild(hs.clearing);
- if (!this.newWidth) this.newWidth = this.innerContent.offsetWidth;
- this.newHeight = this.innerContent.offsetHeight;
- this.innerContent.removeChild(hs.clearing);
- if (hs.ie && this.newHeight > parseInt(this.innerContent.currentStyle.height)) { // ie css bug
- this.newHeight = parseInt(this.innerContent.currentStyle.height);
- }
-},
-
-correctIframeSize : function () {
- var wDiff = this.innerContent.offsetWidth - this.ruler.offsetWidth;
- if (wDiff < 0) wDiff = 0;
-
- var hDiff = this.innerContent.offsetHeight - this.body.offsetHeight;
-
- hs.setStyles(this.iframe, { width: (this.x.span - wDiff) +'px',
- height: (this.y.span - hDiff) +'px' });
- hs.setStyles(this.body, { width: this.iframe.style.width,
- height: this.iframe.style.height });
-
- this.scrollingContent = this.iframe;
- this.scrollerDiv = this.scrollingContent;
-},
-htmlSizeOperations : function () {
-
- this.setObjContainerSize(this.innerContent);
-
-
- if (this.swfObject && this.objectLoadTime == 'before') this.writeExtendedContent();
-
-
- // handle minimum size
- if (this.x.span < this.newWidth && !this.allowWidthReduction) this.x.span = this.newWidth;
- if (this.y.span < this.newHeight && !this.allowHeightReduction) this.y.span = this.newHeight;
- this.scrollerDiv = this.innerContent;
- this.mediumContent = hs.createElement('div', null,
- {
- width: this.x.span +'px',
- position: 'relative',
- left: (this.x.min - this.thumbLeft) +'px',
- top: (this.y.min - this.thumbTop) +'px'
- }, this.content, true);
-
- this.mediumContent.appendChild(this.innerContent);
- hs.container.removeChild(this.tempContainer);
- hs.setStyles(this.innerContent, { border: 'none', width: 'auto', height: 'auto' });
-
- var node = hs.getElementByClass(this.innerContent, 'DIV', 'highslide-body');
- if (node && !this.swfObject && this.objectType != 'iframe') {
- var cNode = node; // wrap to get true size
- node = hs.createElement(cNode.nodeName, null, {overflow: 'hidden'}, null, true);
- cNode.parentNode.insertBefore(node, cNode);
- node.appendChild(hs.clearing); // IE6
- node.appendChild(cNode);
-
- var wDiff = this.innerContent.offsetWidth - node.offsetWidth;
- var hDiff = this.innerContent.offsetHeight - node.offsetHeight;
- node.removeChild(hs.clearing);
-
- var kdeBugCorr = hs.safari || navigator.vendor == 'KDE' ? 1 : 0; // KDE repainting bug
- hs.setStyles(node, {
- width: (this.x.span - wDiff - kdeBugCorr) +'px',
- height: (this.y.span - hDiff) +'px',
- overflow: 'auto',
- position: 'relative'
- }
- );
- if (kdeBugCorr && cNode.offsetHeight > node.offsetHeight) {
- node.style.width = (parseInt(node.style.width) + kdeBugCorr) + 'px';
- }
- this.scrollingContent = node;
- this.scrollerDiv = this.scrollingContent;
-
- }
- if (this.iframe && this.objectLoadTime == 'before') this.correctIframeSize();
- if (!this.scrollingContent && this.y.span < this.mediumContent.offsetHeight) this.scrollerDiv = this.content;
-
- if (this.scrollerDiv == this.content && !this.allowWidthReduction && this.objectType != 'iframe') {
- this.x.span += 17; // room for scrollbars
- }
- if (this.scrollerDiv && this.scrollerDiv.offsetHeight > this.scrollerDiv.parentNode.offsetHeight) {
- setTimeout("try { hs.expanders["+ this.key +"].scrollerDiv.style.overflow = 'auto'; } catch(e) {}",
- hs.expandDuration);
- }
-},
-
justify : function (p) {
var tgt, dim = p == this.x ? 'x' : 'y';
- if (p.target && p.target.match(/ /)) {
- tgt = p.target.split(' ');
- p.target = tgt[0];
- }
- if (p.target && hs.$(p.target)) {
- p.min = hs.position(hs.$(p.target))[dim];
- if (tgt && tgt[1] && tgt[1].match(/^[-]?[0-9]+px$/)) p.min += parseInt(tgt[1]);
-
- } else if (p.justify == 'auto' || p.justify == 'center') {
-
var hasMovedMin = false;
var allowReduce = true;
// calculate p.min
- if (p.justify == 'center') p.min = Math.round(p.scroll + (p.clientSpan - p.span - p.marginMax) / 2);
- else
p.min = Math.round(p.min - ((p.span - p.thumbSpan) / 2)); // auto
if (p.min < p.scroll + p.marginMin) {
@@ -1392,10 +938,6 @@ justify : function (p) {
}
- } else if (p.justify == 'max') {
- p.min = Math.floor(p.min - p.span + p.thumbSpan);
- }
-
if (p.min < p.marginMin) {
tmpMin = p.min;
@@ -1439,16 +981,6 @@ correctRatio : function(ratio) {
}
},
-reflow : function () {
- hs.setStyles(this.scrollerDiv, { height: 'auto', width: 'auto' });
- this.x.span = this.innerContent.offsetWidth;
- this.y.span = this.innerContent.offsetHeight;
- var size = { width: this.x.span +'px', height: this.y.span +'px' };
- hs.setStyles(this.content, size);
- if (this.objOutline)
- this.objOutline.setPosition(this, this.x.min, this.y.min, this.x.span, this.y.span);
-},
-
show : function () {
// Selectbox bug
@@ -1467,8 +999,6 @@ show : function () {
if (this.x.imgSpan) this.content.style.margin = '0 auto';
- hs.fireEvent(this, 'onBeforeExpand');
-
// Apply size change
this.changeSize(
1,
@@ -1494,23 +1024,13 @@ show : function () {
},
changeSize : function(up, from, to, dur, steps) {
- // transition
- var trans = this.transitions,
- t = (trans[1] && hs.upcoming
- && hs.getParam(hs.upcoming, 'transitions')[1] == trans[1]) ?
- trans[1] : trans[0];
- if (this[t]) {
- this[t](up, from, to);
- return;
- }
if (up && this.objOutline && !this.outlineWhileAnimating)
this.objOutline.setPosition(this, this.x.min, this.y.min, this.x.span, this.y.span);
else if (!up && this.objOutline) {
if (this.outlineWhileAnimating) this.objOutline.setPosition(this, from.x, from.y, from.w, from.h);
- else this.objOutline.destroy(
- (this.isHtml && this.preserveContent));
+ else this.objOutline.destroy();
}
if (!up) { // remove children
@@ -1566,65 +1086,13 @@ changeSize : function(up, from, to, dur, steps) {
},
-fade : function(up, from, to) {
- this.outlineWhileAnimating = false;
- var exp = this, t = up ? 250 : 0;
-
- if (up) {
- hs.setStyles(this.wrapper, { opacity: 0 });
- this.setSize(to);
- if (this.caption) {
- var ss = hs.captionSlideSpeed;
- hs.captionSlideSpeed = 0;
- this.writeCaption();
- hs.captionSlideSpeed = ss;
- }
- this.content.style.visibility = 'visible';
-
- hs.fade (this.wrapper, 0, 1);
- }
-
- if (this.objOutline) {
- this.objOutline.table.style.zIndex = this.wrapper.style.zIndex;
- var dir = up || -1;
- for (var i = from.o; dir * i <= dir * to.o; i += dir, t += 25) {
- (function() {
- var o = up ? to.o - i : from.o - i;
- setTimeout(function() {
- exp.objOutline.setPosition(exp, (exp.x.min + o), (exp.y.min + o),
- (exp.x.span - 2 * o), (exp.y.span - 2 * o), 1, t);
- }, t);
- })();
- }
- }
-
-
- if (up) setTimeout(function() { exp.afterExpand(); }, t+50);
- else {
- setTimeout( function() {
- if (exp.objOutline) exp.objOutline.destroy(exp.preserveContent);
- hs.fade (exp.wrapper, 1, 0);
- setTimeout( function() {
- exp.afterClose();
- }, 250);
- }, t);
- }
-},
-
setSize : function (to) {
try {
- if (this.isHtml) {
- hs.setStyles(this.content, { width: to.w +'px', height: to.h +'px' });
- hs.setStyles(this.mediumContent, { left: (this.x.min - to.x) +'px',
- top: (this.y.min - to.y) +'px' });
- this.innerContent.style.visibility = 'visible';
- } else {
this.wrapper.style.width = (to.w + 2*this.offsetBorderW) +'px';
this.content.style.width =
((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';
- }
if (to.op) hs.setStyles(this.wrapper, { opacity: to.op });
@@ -1649,29 +1117,10 @@ afterExpand : function() {
this.isExpanded = true;
this.focus();
- if (this.isHtml && this.objectLoadTime == 'after') this.writeExtendedContent();
-
- if (this.isHtml) {
- if (this.iframe) {
- try {
- var exp = this,
- doc = this.iframe.contentDocument || this.iframe.contentWindow.document;
- hs.addEventListener(doc, 'mousedown', function () {
- if (hs.focusKey != exp.key) exp.focus();
- });
- } catch(e) {}
- if (hs.ie && typeof this.isClosing != 'boolean') // first open
- this.iframe.style.width = (this.objectWidth - 1) +'px'; // hasLayout
- }
- }
-
this.createOverlays();
if (hs.showCredits) this.writeCredits();
if (this.fullExpandWidth > this.x.span) this.createFullExpand();
- if (this.dimmingOpacity) hs.dim(this);
- if (hs.upcoming == this.a) hs.upcoming = null;
if (!this.caption) this.prepareNextOutline();
- if (!this.caption) hs.fireEvent(this, 'onAfterExpand');
},
@@ -1691,11 +1140,8 @@ preloadNext : function() {
cancelLoading : function() {
hs.expanders[this.key] = null;
- if (hs.upcoming == this.a) hs.upcoming = null;
- hs.unDim();
this.a.style.cursor = this.originalCursor;
if (this.loading) hs.loading.style.left = '-9999px';
- hs.fireEvent(this, 'onHideLoading');
},
writeCredits : function () {
@@ -1711,7 +1157,6 @@ writeCredits : function () {
},
getCaption : function() {
- if (!hs.fireEvent(this, 'onBeforeGetCaption')) return;
if (!this.captionId && this.thumbsUserSetId)
this.captionId = 'caption-for-'+ this.thumbsUserSetId;
if (this.captionId) this.caption = hs.getNode(this.captionId);
@@ -1732,8 +1177,7 @@ getCaption : function() {
}
}
if (this.caption) {
- this.marginBottom += this.spaceForCaption;
- hs.fireEvent(this, 'onAfterGetCaption');
+ this.marginBottom += this.spaceForCaption;
}
},
@@ -1789,8 +1233,6 @@ placeCaption : function(height, end) {
if (o.hasAlphaImageLoader) o.td[3].style.height = o.td[5].style.height = o.td[4].style.height;
}
if (end) this.prepareNextOutline();
-
- if (end) hs.fireEvent(this, 'onAfterExpand');
},
@@ -1810,11 +1252,10 @@ showHideElements : function (tagName, visibility, imgPos) {
var elPos = hs.position(els[i]);
elPos.w = els[i].offsetWidth;
elPos.h = els[i].offsetHeight;
- if (!this.dimmingOpacity) { // hide all if dimming
+
var clearsX = (elPos.x + elPos.w < imgPos.x || elPos.x > imgPos.x + imgPos.w);
var clearsY = (elPos.y + elPos.h < imgPos.y || elPos.y > imgPos.y + imgPos.h);
- }
var wrapperKey = hs.getWrapperKey(els[i]);
if (!clearsX && !clearsY && wrapperKey != this.key) { // element falls behind image
if (!hiddenBy) {
@@ -1848,11 +1289,8 @@ focus : function() {
blurExp.caption.className += ' highslide-caption-blur';
}
- if (blurExp.isImage) {
blurExp.content.style.cursor = hs.ie ? 'hand' : 'pointer';
- blurExp.content.title = hs.focusTitle;
- }
- hs.fireEvent(this, 'onBlur');
+ blurExp.content.title = hs.focusTitle;
}
}
@@ -1866,16 +1304,14 @@ focus : function() {
this.caption.className = this.caption.className.replace(' highslide-caption-blur', '');
}
- if (this.isImage) {
this.content.title = hs.restoreTitle;
- hs.styleRestoreCursor = 'pointer';
+ hs.styleRestoreCursor = window.opera ? 'pointer' : 'url('+ hs.graphicsDir + hs.restoreCursor +'), pointer';
if (hs.ie && hs.ieVersion() < 6) hs.styleRestoreCursor = 'hand';
this.content.style.cursor = hs.styleRestoreCursor;
- }
+
hs.focusKey = this.key;
hs.addEventListener(document, 'keydown', hs.keyHandler);
- hs.fireEvent(this, 'onFocus');
},
move : function (e) {
@@ -1889,45 +1325,13 @@ move : function (e) {
},
-resize : function (e) {
- this.x.span = e.width + e.dX;
- this.y.span = e.height + e.dY;
-
- if (this.x.span < this.minWidth) this.x.span = this.minWidth;
- if (this.y.span < this.minHeight) this.y.span = this.minHeight;
-
- var d = this.scrollerDiv;
- if (typeof this.wDiff == 'undefined') {
- this.wDiff = this.innerContent.offsetWidth - d.offsetWidth;
- this.hDiff = this.innerContent.offsetHeight - d.offsetHeight;
- }
- hs.setStyles(d, { width: (this.x.span - this.wDiff) +'px',
- height: (this.y.span - this.hDiff) +'px' });
-
- var size = { width: this.x.span +'px', height: this.y.span +'px' };
- hs.setStyles(this.content, size);
- if (this.releaseMask) hs.setStyles(this.releaseMask, size);
-
- this.mediumContent.style.width = 'auto';
- hs.setStyles(this.body, { width: 'auto', height: 'auto' });
-
-
- for (var i = 0; i < this.overlays.length; i++)
- this.positionOverlay(this.overlays[i]);
- if (this.objOutline)
- this.objOutline.setPosition(this, this.x.min, this.y.min, this.x.span, this.y.span);
-
-},
-
close : function() {
if (this.isClosing || !this.isExpanded) return;
this.isClosing = true;
- if (!hs.fireEvent(this, 'onBeforeClose')) return;
hs.removeEventListener(document, 'keydown', hs.keyHandler);
try {
- if (this.isHtml) this.htmlPrepareClose();
this.content.style.cursor = 'default';
@@ -1956,61 +1360,12 @@ close : function() {
} catch (e) { this.afterClose(); }
},
-htmlPrepareClose : function() {
- if (hs.geckoMac) { // bad redraws
- if (!hs.mask) hs.mask = hs.createElement('div', null,
- { position: 'absolute' }, hs.container);
- hs.setStyles(hs.mask, { width: this.x.span +'px', height: this.y.span +'px',
- left: this.x.min +'px', top: this.y.min +'px', display: 'block' });
- }
- if (this.swfObject) try { hs.$(this.swfObject.getAttribute('id')).StopPlay(); } catch (e) {}
-
- if (this.objectLoadTime == 'after' && !this.preserveContent) this.destroyObject();
- if (this.scrollerDiv && this.scrollerDiv != this.scrollingContent)
- this.scrollerDiv.style.overflow = 'hidden';
-},
-
-destroyObject : function () {
- if (hs.ie && this.iframe)
- try { this.iframe.contentWindow.document.body.innerHTML = ''; } catch (e) {}
- this.body.innerHTML = '';
-},
-
-sleep : function() {
- if (this.objOutline) this.objOutline.table.className = 'highslide-display-none';
- this.releaseMask = null;
- this.wrapper.className += ' highslide-display-none';
- hs.push(hs.sleeping, this);
-},
-
-awake : function() {
- hs.expanders[this.key] = this;
-
- if (!hs.allowMultipleInstances &&hs.focusKey != this.key) {
- try { hs.expanders[hs.focusKey].close(); } catch (e){}
- }
-
- this.wrapper.className = this.wrapper.className.replace(/highslide-display-none/, '');
- var z = hs.zIndexCounter++;
- this.wrapper.style.zIndex = z;
- this.isClosing = false;
-
- if (o = this.objOutline) {
- if (!this.outlineWhileAnimating) o.table.style.visibility = 'hidden';
- o.table.className = null;
- o.table.style.zIndex = z;
- }
- this.show();
-},
-
createOverlay : function (o) {
var el = o.overlayId;
if (typeof el == 'string') el = hs.getNode(el);
if (!el || typeof el == 'string') return;
- if (!hs.fireEvent(this, 'onCreateOverlay', { overlay: el })) return;
-
var overlay = hs.createElement(
'div',
null,
@@ -2059,7 +1414,6 @@ createOverlays : function() {
var o = hs.overlays[i];
if ((!o.thumbnailId && !o.slideshowGroup) || o.thumbnailId == this.thumbsUserSetId
|| o.slideshowGroup === this.slideshowGroup) {
- if (this.isImage || (this.isHtml && o.useOnHtml))
this.createOverlay(o);
}
}
@@ -2077,14 +1431,12 @@ createFullExpand : function () {
);
this.fullExpandLabel = a;
- if (!hs.fireEvent(this, 'onCreateFullExpand')) return;
this.createOverlay({ overlayId: a, position: hs.fullExpandPosition,
hideOnMouseOut: true, opacity: hs.fullExpandOpacity });
},
doFullExpand : function () {
- try {
- if (!hs.fireEvent(this, 'onDoFullExpand')) return;
+ try {
hs.purge(this.fullExpandLabel);
this.fullExpandLabel.parentNode.removeChild(this.fullExpandLabel);
this.focus();
@@ -2109,7 +1461,6 @@ doFullExpand : function () {
this.redoShowHide();
- hs.setDimmerSize();
} catch (e) {
@@ -2140,7 +1491,6 @@ wrapperMouseHandler : function (e) {
if (!e.relatedTarget) e.relatedTarget =
over ? e.fromElement : e.toElement; // ie
if (hs.getExpander(e.relatedTarget) == this || hs.dragArgs) return;
- if (this.isExpanded) hs.fireEvent(this, over ? 'onMouseOver' : 'onMouseOut', e);
for (var i = 0; i < this.overlays.length; i++) {
var o = this.overlays[i];
if (o.getAttribute('hideOnMouseOut')) {
@@ -2156,111 +1506,19 @@ afterClose : function () {
if (hs.hideSelects) this.showHideElements('SELECT', 'visible');
if (hs.hideIframes) this.showHideElements('IFRAME', 'visible');
- if (hs.geckoMac) this.showHideElements('*', 'visible');
-
- if (this.isHtml && this.preserveContent) this.sleep();
- else {
+ if (hs.geckoMac) this.showHideElements('*', 'visible');
if (this.objOutline && this.outlineWhileAnimating) this.objOutline.destroy();
hs.purge(this.wrapper);
if (hs.ie && hs.ieVersion() < 5.5) this.wrapper.innerHTML = ''; // crash
else this.wrapper.parentNode.removeChild(this.wrapper);
- }
- if (hs.mask) hs.mask.style.display = 'none';
- if (this.dimmingOpacity) hs.unDim(this.key);
- hs.fireEvent(this, 'onAfterClose');
hs.expanders[this.key] = null;
hs.cleanUp();
}
};
-
-
-// hs.Ajax object prototype
-hs.Ajax = function (a, content, pre) {
- this.a = a;
- this.content = content;
- this.pre = pre; // preloading
-};
-
-hs.Ajax.prototype = {
-run : function () {
- this.src = hs.getSrc(this.a);
- if (this.src.match('#')) {
- var arr = this.src.split('#');
- this.src = arr[0];
- this.id = arr[1];
- }
- if (hs.cachedGets[this.src]) {
- this.cachedGet = hs.cachedGets[this.src];
- if (this.id) this.getElementContent();
- else this.loadHTML();
- return;
- }
- try { this.xmlHttp = new XMLHttpRequest(); }
- catch (e) {
- try { this.xmlHttp = new ActiveXObject("Msxml2.XMLHTTP"); }
- catch (e) {
- try { this.xmlHttp = new ActiveXObject("Microsoft.XMLHTTP"); }
- catch (e) { this.onError(); }
- }
- }
- var pThis = this;
- this.xmlHttp.onreadystatechange = function() {
- if(pThis.xmlHttp.readyState == 4) {
- if (pThis.id) pThis.getElementContent();
- else pThis.loadHTML();
- }
- };
-
- this.xmlHttp.open("GET", this.src, true);
- this.xmlHttp.send(null);
-},
-
-getElementContent : function() {
- hs.genContainer();
- var attribs = window.opera ? { src: this.src } : null; // Opera needs local src
- this.iframe = hs.createElement('iframe', attribs,
- { position: 'absolute', left: '-9999px' }, hs.container);
-
- try {
- this.loadHTML();
- } catch (e) { // Opera security
- var pThis = this;
- setTimeout(function() { pThis.loadHTML(); }, 1);
- }
-},
-
-loadHTML : function() {
- var s = this.cachedGet || this.xmlHttp.responseText;
- if (this.pre) hs.cachedGets[this.src] = s;
- if (!hs.ie || hs.ieVersion() >= 5.5) {
- s = s.replace(/\s/g, ' ');
- s = s.replace(new RegExp(']*>', 'gi'), '');
- s = s.replace(new RegExp(']*>.*?', 'gi'), '');
- if (this.iframe) {
- var doc = this.iframe.contentDocument || this.iframe.contentWindow.document;
- doc.open();
- doc.write(s);
- doc.close();
- try { s = doc.getElementById(this.id).innerHTML; } catch (e) {
- try { s = this.iframe.document.getElementById(this.id).innerHTML; } catch (e) {} // opera
- }
- hs.container.removeChild(this.iframe);
- } else {
- s = s.replace(new RegExp('^.*?]*>(.*?) .*?$', 'i'), '$1');
- }
-
- }
- hs.getElementByClass(this.content, 'DIV', 'highslide-body').innerHTML = s;
- this.onLoad();
-}
-};
// history
var HsExpander = hs.Expander;
// set handlers
hs.addEventListener(document, 'mousedown', hs.mouseClickHandler);
hs.addEventListener(document, 'mouseup', hs.mouseClickHandler);
-hs.addEventListener(window, 'load', hs.preloadImages);
-hs.addEventListener(window, 'load', hs.preloadAjax);
-hs.addEventListener(window, 'load', function() { hs.pageLoaded = true; });
-hs.setClickEvents();
\ No newline at end of file
+hs.addEventListener(window, 'load', hs.preloadImages);
\ No newline at end of file
diff --git a/htroot/yacy/transferRWI.java b/htroot/yacy/transferRWI.java
index 90b5c80c9..a1632fdc9 100644
--- a/htroot/yacy/transferRWI.java
+++ b/htroot/yacy/transferRWI.java
@@ -51,7 +51,6 @@ import java.util.Iterator;
import java.util.List;
import de.anomic.http.httpHeader;
-import de.anomic.index.indexRWIEntry;
import de.anomic.index.indexRWIRowEntry;
import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.plasma.urlPattern.plasmaURLPattern;
@@ -149,7 +148,7 @@ public final class transferRWI {
int p;
String wordHash;
String urlHash;
- indexRWIEntry iEntry;
+ indexRWIRowEntry iEntry;
final HashSet