Revision: 17931
http://gallery.svn.sourceforge.net/gallery/?rev=17931&view=rev
Author: JensT
Date: 2008-08-26 10:24:38 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
2008-08-26 Jens Tkotz <jens@...> 1.5.9-svn-b8
* Fix: Password strengthmeter in setup broke change or
set of new admin password.
* Fix: FitToWindow broken.
* Fix: sanitizeInput returns just the unhtmlentities value instead of
using gHtmlSafe which does a surrounding htmlentities.
* Change: Update Walter Zorns
wz_tooltip.js to 5.20
tip_balloon.js to 1.6
* Fix: Line endings in wz_jsgraphics.js
Modified Paths:
--------------
branches/BRANCH_1_5_LEGACY/gallery/ChangeLog
branches/BRANCH_1_5_LEGACY/gallery/Version.php
branches/BRANCH_1_5_LEGACY/gallery/js/fitToWindow.js.php
branches/BRANCH_1_5_LEGACY/gallery/js/wz/tip_balloon.js
branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_jsgraphics.js
branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_tooltip.js
branches/BRANCH_1_5_LEGACY/gallery/lib/setup.php
branches/BRANCH_1_5_LEGACY/gallery/util.php
branches/BRANCH_1_5_LEGACY/gallery/view_photo.php
Modified: branches/BRANCH_1_5_LEGACY/gallery/ChangeLog
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/ChangeLog 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/ChangeLog 2008-08-26 10:24:38 UTC (rev 17931)
@@ -1,3 +1,19 @@
+2008-08-26 Jens Tkotz <jens@...> 1.5.9-svn-b8
+
+ * Fix: Password strengthmeter in setup broke change or
+ set of new admin password.
+
+ * Fix: FitToWindow broken.
+
+ * Fix: sanitizeInput returns just the unhtmlentities value instead of
+ using gHtmlSafe which does a surrounding htmlentities.
+
+ * Change: Update Walter Zorns
+ wz_tooltip.js to 5.20
+ tip_balloon.js to 1.6
+
+ * Fix: Line endings in wz_jsgraphics.js
+
2008-08-23 Jens Tkotz <jens@...> 1.5.9-svn-b7
* New: classes/Colors.php, which is a PHP port of rgbcolor.js
@@ -32,6 +48,23 @@
2008-08-23 Jens Tkotz <jens@...> 1.5.9-svn-b4
+ * CHANGE: Added always allowment for admins to
+ canAddComments
+ canAddTo
+ canChangeText
+ canWrite
+ canDelete
+ canViewComments
+ canViewFullImages
+ canAddComments
+
+
+ * CHANGE: Remove album owner to be always to allowed to
+ canDeleteFrom
+
+ * Change: REMOVED that everybody can see an album if no permissions are set.
+
+
* Change: Remove wrong check for nobody in Album::isItemOwner
* Change: Changed order of some methodes in Album.php
Modified: branches/BRANCH_1_5_LEGACY/gallery/Version.php
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/Version.php 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/Version.php 2008-08-26 10:24:38 UTC (rev 17931)
@@ -20,7 +20,7 @@
* $Id$
*/
-$gallery->version = '1.5.9-svn-b7';
+$gallery->version = '1.5.9-svn-b8';
$gallery->config_version = 97;
$gallery->album_version = 38.1;
$gallery->user_version = 6;
Modified: branches/BRANCH_1_5_LEGACY/gallery/js/fitToWindow.js.php
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/js/fitToWindow.js.php 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/js/fitToWindow.js.php 2008-08-26 10:24:38 UTC (rev 17931)
@@ -19,9 +19,11 @@
*
* $Id$
*/
+
+$imageWidth = (isset($_GET['imageWidth'])) ? intval($_GET['imageWidth']) : 1024;
+$imageHeight = (isset($_GET['imageHeight'])) ? intval($_GET['imageHeight']) : 768;
+
?>
-<script type="text/javascript">
-<!--
/*
* These values define the margin between your image and the navigation and or a left block.
@@ -136,6 +138,3 @@
}
sizeChange = new sizeChange();
-
-// -->
-</script>
Modified: branches/BRANCH_1_5_LEGACY/gallery/js/wz/tip_balloon.js
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/js/wz/tip_balloon.js 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/js/wz/tip_balloon.js 2008-08-26 10:24:38 UTC (rev 17931)
@@ -1,9 +1,10 @@
/**
* Gallery SVN ID:
- * $Id: multiInput.js.php 13850 2006-06-19 12:37:37Z jenst $
+ * $Id: tip_ballons.js 13850 2006-06-19 12:37:37Z jenst $
*/
-tip_balloon.js v. 1.5
+/*
+tip_balloon.js v. 1.6
The latest version is available at
http://www.walterzorn.com
@@ -11,12 +12,16 @@
or http://www.walterzorn.de
Initial author: Walter Zorn
-Last modified: 11.4.2008
+Last modified: 15.7.2008
Extension for the tooltip library wz_tooltip.js.
Implements balloon tooltips.
*/
+// Make sure that the core file wz_tooltip.js is included first
+if(typeof config == "undefined")
+ alert("Error:\nThe core tooltip script file 'wz_tooltip.js' must be included first, before the plugin files!");
+
// Here we define new global configuration variable(s) (as members of the
// predefined "config." class).
// From each of these config variables, wz_tooltip.js will automatically derive
@@ -69,7 +74,7 @@
{
if(!tt_aV[BALLOON])
return false;
-
+
var aImg, sImgZ, sCssCrn, sVaT, sVaB, sCssImg;
// Cache balloon images in advance:
@@ -84,7 +89,7 @@
sVaB = 'vertical-align:bottom;" valign="bottom"';
sCssImg = 'padding:0px;margin:0px;border:0px;';
sImgZ = '" style="' + sCssImg + '" />';
-
+
tt_sContent = '<table border="0" cellpadding="0" cellspacing="0" style="width:auto;padding:0px;margin:0px;left:0px;top:0px;"><tr>'
// Left-top corner
+ '<td' + sCssCrn + sVaB + '>'
@@ -143,11 +148,16 @@
{
if(tt_aV[BALLOON])
{
+ var bdy = tt_GetElt("bALlO0nBdY");
+
+ // Insert a TagToTip() HTML element into the central body TD
+ if (tt_t2t && !tt_aV[COPYCONTENT] && bdy)
+ tt_MovDomNode(tt_t2t, tt_GetDad(tt_t2t), bdy);
balloon.iStem = tt_aV[ABOVE] * 1;
balloon.aStem = [tt_GetElt("bALlOOnT"), tt_GetElt("bALlOOnB")];
balloon.aStem[balloon.iStem].style.display = "inline";
if (balloon.width < -1)
- Balloon_MaxW();
+ Balloon_MaxW(bdy);
return true;
}
return false;
@@ -167,7 +177,7 @@
balloon.aStem[iStem].style.display = "inline";
balloon.iStem = iStem;
}
-
+
balloon.aStem[iStem].style.left = Balloon_CalcStemX() + "px";
return true;
}
@@ -192,10 +202,8 @@
}
return aImg;
}
-function Balloon_MaxW()
+function Balloon_MaxW(bdy)
{
- var bdy = tt_GetElt("bALlO0nBdY");
-
if (bdy)
{
var iAdd = tt_bBoxOld ? (balloon.padding << 1) : 0, w = tt_GetDivW(bdy);
Modified: branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_jsgraphics.js
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_jsgraphics.js 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_jsgraphics.js 2008-08-26 10:24:38 UTC (rev 17931)
@@ -1,1112 +1,1113 @@
-/**
- * Gallery SVN ID:
- * $Id: wz_jsgraphics.js 17298 2007-12-25 14:01:38Z JensT $
-*/
-
-/* This notice must be untouched at all times.
-
-wz_jsgraphics.js v. 3.03
-The latest version is available at
-http://www.walterzorn.com
-or http://www.devira.com
-or http://www.walterzorn.de
-
-Copyright (c) 2002-2004 Walter Zorn. All rights reserved.
-Created 3. 11. 2002 by Walter Zorn (Web: http://www.walterzorn.com )
-Last modified: 28. 1. 2008
-
-Performance optimizations for Internet Explorer
-by Thomas Frank and John Holdsworth.
-fillPolygon method implemented by Matthieu Haller.
-
-High Performance JavaScript Graphics Library.
-Provides methods
-- to draw lines, rectangles, ellipses, polygons
- with specifiable line thickness,
-- to fill rectangles, polygons, ellipses and arcs
-- to draw text.
-NOTE: Operations, functions and branching have rather been optimized
-to efficiency and speed than to shortness of source code.
-
-LICENSE: LGPL
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License (LGPL) as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA,
-or see http://www.gnu.org/copyleft/lesser.html
-*/
-
-
-var jg_ok, jg_ie, jg_fast, jg_dom, jg_moz;
-
-
-function _chkDHTM(x, i)
-{
- x = document.body || null;
- jg_ie = x && typeof x.insertAdjacentHTML != "undefined" && document.createElement;
- jg_dom = (x && !jg_ie &&
- typeof x.appendChild != "undefined" &&
- typeof document.createRange != "undefined" &&
- typeof (i = document.createRange()).setStartBefore != "undefined" &&
- typeof i.createContextualFragment != "undefined");
- jg_fast = jg_ie && document.all && !window.opera;
- jg_moz = jg_dom && typeof x.style.MozOpacity != "undefined";
- jg_ok = !!(jg_ie || jg_dom);
-}
-
-function _pntCnvDom()
-{
- var x = this.wnd.document.createRange();
- x.setStartBefore(this.cnv);
- x = x.createContextualFragment(jg_fast? this._htmRpc() : this.htm);
- if(this.cnv) this.cnv.appendChild(x);
- this.htm = "";
-}
-
-function _pntCnvIe()
-{
- if(this.cnv) this.cnv.insertAdjacentHTML("BeforeEnd", jg_fast? this._htmRpc() : this.htm);
- this.htm = "";
-}
-
-function _pntDoc()
-{
- this.wnd.document.write(jg_fast? this._htmRpc() : this.htm);
- this.htm = '';
-}
-
-function _pntN()
-{
- ;
-}
-
-function _mkDiv(x, y, w, h)
-{
- this.htm += '<div style="position:absolute;'+
- 'left:' + x + 'px;'+
- 'top:' + y + 'px;'+
- 'width:' + w + 'px;'+
- 'height:' + h + 'px;'+
- 'clip:rect(0,'+w+'px,'+h+'px,0);'+
- 'background-color:' + this.color +
- (!jg_moz? ';overflow:hidden' : '')+
- ';"><\/div>';
-}
-
-function _mkDivIe(x, y, w, h)
-{
- this.htm += '%%'+this.color+';'+x+';'+y+';'+w+';'+h+';';
-}
-
-function _mkDivPrt(x, y, w, h)
-{
- this.htm += '<div style="position:absolute;'+
- 'border-left:' + w + 'px solid ' + this.color + ';'+
- 'left:' + x + 'px;'+
- 'top:' + y + 'px;'+
- 'width:0px;'+
- 'height:' + h + 'px;'+
- 'clip:rect(0,'+w+'px,'+h+'px,0);'+
- 'background-color:' + this.color +
- (!jg_moz? ';overflow:hidden' : '')+
- ';"><\/div>';
-}
-
-var _regex = /%%([^;]+);([^;]+);([^;]+);([^;]+);([^;]+);/g;
-function _htmRpc()
-{
- return this.htm.replace(
- _regex,
- '<div style="overflow:hidden;position:absolute;background-color:'+
- '$1;left:$2;top:$3;width:$4;height:$5"></div>\n');
-}
-
-function _htmPrtRpc()
-{
- return this.htm.replace(
- _regex,
- '<div style="overflow:hidden;position:absolute;background-color:'+
- '$1;left:$2;top:$3;width:$4;height:$5;border-left:$4px solid $1"></div>\n');
-}
-
-function _mkLin(x1, y1, x2, y2)
-{
- if(x1 > x2)
- {
- var _x2 = x2;
- var _y2 = y2;
- x2 = x1;
- y2 = y1;
- x1 = _x2;
- y1 = _y2;
- }
- var dx = x2-x1, dy = Math.abs(y2-y1),
- x = x1, y = y1,
- yIncr = (y1 > y2)? -1 : 1;
-
- if(dx >= dy)
- {
- var pr = dy<<1,
- pru = pr - (dx<<1),
- p = pr-dx,
- ox = x;
- while(dx > 0)
- {--dx;
- ++x;
- if(p > 0)
- {
- this._mkDiv(ox, y, x-ox, 1);
- y += yIncr;
- p += pru;
- ox = x;
- }
- else p += pr;
- }
- this._mkDiv(ox, y, x2-ox+1, 1);
- }
-
- else
- {
- var pr = dx<<1,
- pru = pr - (dy<<1),
- p = pr-dy,
- oy = y;
- if(y2 <= y1)
- {
- while(dy > 0)
- {--dy;
- if(p > 0)
- {
- this._mkDiv(x++, y, 1, oy-y+1);
- y += yIncr;
- p += pru;
- oy = y;
- }
- else
- {
- y += yIncr;
- p += pr;
- }
- }
- this._mkDiv(x2, y2, 1, oy-y2+1);
- }
- else
- {
- while(dy > 0)
- {--dy;
- y += yIncr;
- if(p > 0)
- {
- this._mkDiv(x++, oy, 1, y-oy);
- p += pru;
- oy = y;
- }
- else p += pr;
- }
- this._mkDiv(x2, oy, 1, y2-oy+1);
- }
- }
-}
-
-function _mkLin2D(x1, y1, x2, y2)
-{
- if(x1 > x2)
- {
- var _x2 = x2;
- var _y2 = y2;
- x2 = x1;
- y2 = y1;
- x1 = _x2;
- y1 = _y2;
- }
- var dx = x2-x1, dy = Math.abs(y2-y1),
- x = x1, y = y1,
- yIncr = (y1 > y2)? -1 : 1;
-
- var s = this.stroke;
- if(dx >= dy)
- {
- if(dx > 0 && s-3 > 0)
- {
- var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
- _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
- }
- else var _s = s;
- var ad = Math.ceil(s/2);
-
- var pr = dy<<1,
- pru = pr - (dx<<1),
- p = pr-dx,
- ox = x;
- while(dx > 0)
- {--dx;
- ++x;
- if(p > 0)
- {
- this._mkDiv(ox, y, x-ox+ad, _s);
- y += yIncr;
- p += pru;
- ox = x;
- }
- else p += pr;
- }
- this._mkDiv(ox, y, x2-ox+ad+1, _s);
- }
-
- else
- {
- if(s-3 > 0)
- {
- var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
- _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
- }
- else var _s = s;
- var ad = Math.round(s/2);
-
- var pr = dx<<1,
- pru = pr - (dy<<1),
- p = pr-dy,
- oy = y;
- if(y2 <= y1)
- {
- ++ad;
- while(dy > 0)
- {--dy;
- if(p > 0)
- {
- this._mkDiv(x++, y, _s, oy-y+ad);
- y += yIncr;
- p += pru;
- oy = y;
- }
- else
- {
- y += yIncr;
- p += pr;
- }
- }
- this._mkDiv(x2, y2, _s, oy-y2+ad);
- }
- else
- {
- while(dy > 0)
- {--dy;
- y += yIncr;
- if(p > 0)
- {
- this._mkDiv(x++, oy, _s, y-oy+ad);
- p += pru;
- oy = y;
- }
- else p += pr;
- }
- this._mkDiv(x2, oy, _s, y2-oy+ad+1);
- }
- }
-}
-
-function _mkLinDott(x1, y1, x2, y2)
-{
- if(x1 > x2)
- {
- var _x2 = x2;
- var _y2 = y2;
- x2 = x1;
- y2 = y1;
- x1 = _x2;
- y1 = _y2;
- }
- var dx = x2-x1, dy = Math.abs(y2-y1),
- x = x1, y = y1,
- yIncr = (y1 > y2)? -1 : 1,
- drw = true;
- if(dx >= dy)
- {
- var pr = dy<<1,
- pru = pr - (dx<<1),
- p = pr-dx;
- while(dx > 0)
- {--dx;
- if(drw) this._mkDiv(x, y, 1, 1);
- drw = !drw;
- if(p > 0)
- {
- y += yIncr;
- p += pru;
- }
- else p += pr;
- ++x;
- }
- }
- else
- {
- var pr = dx<<1,
- pru = pr - (dy<<1),
- p = pr-dy;
- while(dy > 0)
- {--dy;
- if(drw) this._mkDiv(x, y, 1, 1);
- drw = !drw;
- y += yIncr;
- if(p > 0)
- {
- ++x;
- p += pru;
- }
- else p += pr;
- }
- }
- if(drw) this._mkDiv(x, y, 1, 1);
-}
-
-function _mkOv(left, top, width, height)
-{
- var a = (++width)>>1, b = (++height)>>1,
- wod = width&1, hod = height&1,
- cx = left+a, cy = top+b,
- x = 0, y = b,
- ox = 0, oy = b,
- aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
- st = (aa2>>1)*(1-(b<<1)) + bb2,
- tt = (bb2>>1) - aa2*((b<<1)-1),
- w, h;
- while(y > 0)
- {
- if(st < 0)
- {
- st += bb2*((x<<1)+3);
- tt += bb4*(++x);
- }
- else if(tt < 0)
- {
- st += bb2*((x<<1)+3) - aa4*(y-1);
- tt += bb4*(++x) - aa2*(((y--)<<1)-3);
- w = x-ox;
- h = oy-y;
- if((w&2) && (h&2))
- {
- this._mkOvQds(cx, cy, x-2, y+2, 1, 1, wod, hod);
- this._mkOvQds(cx, cy, x-1, y+1, 1, 1, wod, hod);
- }
- else this._mkOvQds(cx, cy, x-1, oy, w, h, wod, hod);
- ox = x;
- oy = y;
- }
- else
- {
- tt -= aa2*((y<<1)-3);
- st -= aa4*(--y);
- }
- }
- w = a-ox+1;
- h = (oy<<1)+hod;
- y = cy-oy;
- this._mkDiv(cx-a, y, w, h);
- this._mkDiv(cx+ox+wod-1, y, w, h);
-}
-
-function _mkOv2D(left, top, width, height)
-{
- var s = this.stroke;
- width += s+1;
- height += s+1;
- var a = width>>1, b = height>>1,
- wod = width&1, hod = height&1,
- cx = left+a, cy = top+b,
- x = 0, y = b,
- aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
- st = (aa2>>1)*(1-(b<<1)) + bb2,
- tt = (bb2>>1) - aa2*((b<<1)-1);
-
- if(s-4 < 0 && (!(s-2) || width-51 > 0 && height-51 > 0))
- {
- var ox = 0, oy = b,
- w, h,
- pxw;
- while(y > 0)
- {
- if(st < 0)
- {
- st += bb2*((x<<1)+3);
- tt += bb4*(++x);
- }
- else if(tt < 0)
- {
- st += bb2*((x<<1)+3) - aa4*(y-1);
- tt += bb4*(++x) - aa2*(((y--)<<1)-3);
- w = x-ox;
- h = oy-y;
-
- if(w-1)
- {
- pxw = w+1+(s&1);
- h = s;
- }
- else if(h-1)
- {
- pxw = s;
- h += 1+(s&1);
- }
- else pxw = h = s;
- this._mkOvQds(cx, cy, x-1, oy, pxw, h, wod, hod);
- ox = x;
- oy = y;
- }
- else
- {
- tt -= aa2*((y<<1)-3);
- st -= aa4*(--y);
- }
- }
- this._mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
- this._mkDiv(cx+a+wod-s, cy-oy, s, (oy<<1)+hod);
- }
-
- else
- {
- var _a = (width-(s<<1))>>1,
- _b = (height-(s<<1))>>1,
- _x = 0, _y = _b,
- _aa2 = (_a*_a)<<1, _aa4 = _aa2<<1, _bb2 = (_b*_b)<<1, _bb4 = _bb2<<1,
- _st = (_aa2>>1)*(1-(_b<<1)) + _bb2,
- _tt = (_bb2>>1) - _aa2*((_b<<1)-1),
-
- pxl = new Array(),
- pxt = new Array(),
- _pxb = new Array();
- pxl[0] = 0;
- pxt[0] = b;
- _pxb[0] = _b-1;
- while(y > 0)
- {
- if(st < 0)
- {
- pxl[pxl.length] = x;
- pxt[pxt.length] = y;
- st += bb2*((x<<1)+3);
- tt += bb4*(++x);
- }
- else if(tt < 0)
- {
- pxl[pxl.length] = x;
- st += bb2*((x<<1)+3) - aa4*(y-1);
- tt += bb4*(++x) - aa2*(((y--)<<1)-3);
- pxt[pxt.length] = y;
- }
- else
- {
- tt -= aa2*((y<<1)-3);
- st -= aa4*(--y);
- }
-
- if(_y > 0)
- {
- if(_st < 0)
- {
- _st += _bb2*((_x<<1)+3);
- _tt += _bb4*(++_x);
- _pxb[_pxb.length] = _y-1;
- }
- else if(_tt < 0)
- {
- _st += _bb2*((_x<<1)+3) - _aa4*(_y-1);
- _tt += _bb4*(++_x) - _aa2*(((_y--)<<1)-3);
- _pxb[_pxb.length] = _y-1;
- }
- else
- {
- _tt -= _aa2*((_y<<1)-3);
- _st -= _aa4*(--_y);
- _pxb[_pxb.length-1]--;
- }
- }
- }
-
- var ox = -wod, oy = b,
- _oy = _pxb[0],
- l = pxl.length,
- w, h;
- for(var i = 0; i < l; i++)
- {
- if(typeof _pxb[i] != "undefined")
- {
- if(_pxb[i] < _oy || pxt[i] < oy)
- {
- x = pxl[i];
- this._mkOvQds(cx, cy, x, oy, x-ox, oy-_oy, wod, hod);
- ox = x;
- oy = pxt[i];
- _oy = _pxb[i];
- }
- }
- else
- {
- x = pxl[i];
- this._mkDiv(cx-x, cy-oy, 1, (oy<<1)+hod);
- this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
- ox = x;
- oy = pxt[i];
- }
- }
- this._mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
- this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
- }
-}
-
-function _mkOvDott(left, top, width, height)
-{
- var a = (++width)>>1, b = (++height)>>1,
- wod = width&1, hod = height&1, hodu = hod^1,
- cx = left+a, cy = top+b,
- x = 0, y = b,
- aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
- st = (aa2>>1)*(1-(b<<1)) + bb2,
- tt = (bb2>>1) - aa2*((b<<1)-1),
- drw = true;
- while(y > 0)
- {
- if(st < 0)
- {
- st += bb2*((x<<1)+3);
- tt += bb4*(++x);
- }
- else if(tt < 0)
- {
- st += bb2*((x<<1)+3) - aa4*(y-1);
- tt += bb4*(++x) - aa2*(((y--)<<1)-3);
- }
- else
- {
- tt -= aa2*((y<<1)-3);
- st -= aa4*(--y);
- }
- if(drw && y >= hodu) this._mkOvQds(cx, cy, x, y, 1, 1, wod, hod);
- drw = !drw;
- }
-}
-
-function _mkRect(x, y, w, h)
-{
- var s = this.stroke;
- this._mkDiv(x, y, w, s);
- this._mkDiv(x+w, y, s, h);
- this._mkDiv(x, y+h, w+s, s);
- this._mkDiv(x, y+s, s, h-s);
-}
-
-function _mkRectDott(x, y, w, h)
-{
- this.drawLine(x, y, x+w, y);
- this.drawLine(x+w, y, x+w, y+h);
- this.drawLine(x, y+h, x+w, y+h);
- this.drawLine(x, y, x, y+h);
-}
-
-function jsgFont()
-{
- this.PLAIN = 'font-weight:normal;';
- this.BOLD = 'font-weight:bold;';
- this.ITALIC = 'font-style:italic;';
- this.ITALIC_BOLD = this.ITALIC + this.BOLD;
- this.BOLD_ITALIC = this.ITALIC_BOLD;
-}
-var Font = new jsgFont();
-
-function jsgStroke()
-{
- this.DOTTED = -1;
-}
-var Stroke = new jsgStroke();
-
-function jsGraphics(cnv, wnd)
-{
- this.setColor = function(x)
- {
- this.color = x.toLowerCase();
- };
-
- this.setStroke = function(x)
- {
- this.stroke = x;
- if(!(x+1))
- {
- this.drawLine = _mkLinDott;
- this._mkOv = _mkOvDott;
- this.drawRect = _mkRectDott;
- }
- else if(x-1 > 0)
- {
- this.drawLine = _mkLin2D;
- this._mkOv = _mkOv2D;
- this.drawRect = _mkRect;
- }
- else
- {
- this.drawLine = _mkLin;
- this._mkOv = _mkOv;
- this.drawRect = _mkRect;
- }
- };
-
- this.setPrintable = function(arg)
- {
- this.printable = arg;
- if(jg_fast)
- {
- this._mkDiv = _mkDivIe;
- this._htmRpc = arg? _htmPrtRpc : _htmRpc;
- }
- else this._mkDiv = arg? _mkDivPrt : _mkDiv;
- };
-
- this.setFont = function(fam, sz, sty)
- {
- this.ftFam = fam;
- this.ftSz = sz;
- this.ftSty = sty || Font.PLAIN;
- };
-
- this.drawPolyline = this.drawPolyLine = function(x, y)
- {
- for (var i=x.length - 1; i;)
- {--i;
- this.drawLine(x[i], y[i], x[i+1], y[i+1]);
- }
- };
-
- this.fillRect = function(x, y, w, h)
- {
- this._mkDiv(x, y, w, h);
- };
-
- this.drawPolygon = function(x, y)
- {
- this.drawPolyline(x, y);
- this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
- };
-
- this.drawEllipse = this.drawOval = function(x, y, w, h)
- {
- this._mkOv(x, y, w, h);
- };
-
- this.fillEllipse = this.fillOval = function(left, top, w, h)
- {
- var a = w>>1, b = h>>1,
- wod = w&1, hod = h&1,
- cx = left+a, cy = top+b,
- x = 0, y = b, oy = b,
- aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
- st = (aa2>>1)*(1-(b<<1)) + bb2,
- tt = (bb2>>1) - aa2*((b<<1)-1),
- xl, dw, dh;
- if(w) while(y > 0)
- {
- if(st < 0)
- {
- st += bb2*((x<<1)+3);
- tt += bb4*(++x);
- }
- else if(tt < 0)
- {
- st += bb2*((x<<1)+3) - aa4*(y-1);
- xl = cx-x;
- dw = (x<<1)+wod;
- tt += bb4*(++x) - aa2*(((y--)<<1)-3);
- dh = oy-y;
- this._mkDiv(xl, cy-oy, dw, dh);
- this._mkDiv(xl, cy+y+hod, dw, dh);
- oy = y;
- }
- else
- {
- tt -= aa2*((y<<1)-3);
- st -= aa4*(--y);
- }
- }
- this._mkDiv(cx-a, cy-oy, w, (oy<<1)+hod);
- };
-
- this.fillArc = function(iL, iT, iW, iH, fAngA, fAngZ)
- {
- var a = iW>>1, b = iH>>1,
- iOdds = (iW&1) | ((iH&1) << 16),
- cx = iL+a, cy = iT+b,
- x = 0, y = b, ox = x, oy = y,
- aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
- st = (aa2>>1)*(1-(b<<1)) + bb2,
- tt = (bb2>>1) - aa2*((b<<1)-1),
- // Vars for radial boundary lines
- xEndA, yEndA, xEndZ, yEndZ,
- iSects = (1 << (Math.floor((fAngA %= 360.0)/180.0) << 3))
- | (2 << (Math.floor((fAngZ %= 360.0)/180.0) << 3))
- | ((fAngA >= fAngZ) << 16),
- aBndA = new Array(b+1), aBndZ = new Array(b+1);
-
- // Set up radial boundary lines
- fAngA *= Math.PI/180.0;
- fAngZ *= Math.PI/180.0;
- xEndA = cx+Math.round(a*Math.cos(fAngA));
- yEndA = cy+Math.round(-b*Math.sin(fAngA));
- _mkLinVirt(aBndA, cx, cy, xEndA, yEndA);
- xEndZ = cx+Math.round(a*Math.cos(fAngZ));
- yEndZ = cy+Math.round(-b*Math.sin(fAngZ));
- _mkLinVirt(aBndZ, cx, cy, xEndZ, yEndZ);
-
- while(y > 0)
- {
- if(st < 0) // Advance x
- {
- st += bb2*((x<<1)+3);
- tt += bb4*(++x);
- }
- else if(tt < 0) // Advance x and y
- {
- st += bb2*((x<<1)+3) - aa4*(y-1);
- ox = x;
- tt += bb4*(++x) - aa2*(((y--)<<1)-3);
- this._mkArcDiv(ox, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
- oy = y;
- }
- else // Advance y
- {
- tt -= aa2*((y<<1)-3);
- st -= aa4*(--y);
- if(y && (aBndA[y] != aBndA[y-1] || aBndZ[y] != aBndZ[y-1]))
- {
- this._mkArcDiv(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
- ox = x;
- oy = y;
- }
- }
- }
- this._mkArcDiv(x, 0, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
- if(iOdds >> 16) // Odd height
- {
- if(iSects >> 16) // Start-angle > end-angle
- {
- var xl = (yEndA <= cy || yEndZ > cy)? (cx - x) : cx;
- this._mkDiv(xl, cy, x + cx - xl + (iOdds & 0xffff), 1);
- }
- else if((iSects & 0x01) && yEndZ > cy)
- this._mkDiv(cx - x, cy, x, 1);
- }
- };
-
-/* fillPolygon method, implemented by Matthieu Haller.
-This javascript function is an adaptation of the gdImageFilledPolygon for Walter Zorn lib.
-C source of GD 1.8.4 found at http://www.boutell.com/gd/
-
-THANKS to Kirsten Schulz for the polygon fixes!
-
-The intersection finding technique of this code could be improved
-by remembering the previous intertersection, and by using the slope.
-That could help to adjust intersections to produce a nice
-interior_extrema. */
- this.fillPolygon = function(array_x, array_y)
- {
- var i;
- var y;
- var miny, maxy;
- var x1, y1;
- var x2, y2;
- var ind1, ind2;
- var ints;
-
- var n = array_x.length;
- if(!n) return;
-
- miny = array_y[0];
- maxy = array_y[0];
- for(i = 1; i < n; i++)
- {
- if(array_y[i] < miny)
- miny = array_y[i];
-
- if(array_y[i] > maxy)
- maxy = array_y[i];
- }
- for(y = miny; y <= maxy; y++)
- {
- var polyInts = new Array();
- ints = 0;
- for(i = 0; i < n; i++)
- {
- if(!i)
- {
- ind1 = n-1;
- ind2 = 0;
- }
- else
- {
- ind1 = i-1;
- ind2 = i;
- }
- y1 = array_y[ind1];
- y2 = array_y[ind2];
- if(y1 < y2)
- {
- x1 = array_x[ind1];
- x2 = array_x[ind2];
- }
- else if(y1 > y2)
- {
- y2 = array_y[ind1];
- y1 = array_y[ind2];
- x2 = array_x[ind1];
- x1 = array_x[ind2];
- }
- else continue;
-
- // Modified 11. 2. 2004 Walter Zorn
- if((y >= y1) && (y < y2))
- polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
-
- else if((y == maxy) && (y > y1) && (y <= y2))
- polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
- }
- polyInts.sort(_CompInt);
- for(i = 0; i < ints; i+=2)
- this._mkDiv(polyInts[i], y, polyInts[i+1]-polyInts[i]+1, 1);
- }
- };
-
- this.drawString = function(txt, x, y)
- {
- this.htm += '<div style="position:absolute;white-space:nowrap;'+
- 'left:' + x + 'px;'+
- 'top:' + y + 'px;'+
- 'font-family:' + this.ftFam + ';'+
- 'font-size:' + this.ftSz + ';'+
- 'color:' + this.color + ';' + this.ftSty + '">'+
- txt +
- '<\/div>';
- };
-
-/* drawStringRect() added by Rick Blommers.
-Allows to specify the size of the text rectangle and to align the
-text both horizontally (e.g. right) and vertically within that rectangle */
- this.drawStringRect = function(txt, x, y, width, halign)
- {
- this.htm += '<div style="position:absolute;overflow:hidden;'+
- 'left:' + x + 'px;'+
- 'top:' + y + 'px;'+
- 'width:'+width +'px;'+
- 'text-align:'+halign+';'+
- 'font-family:' + this.ftFam + ';'+
- 'font-size:' + this.ftSz + ';'+
- 'color:' + this.color + ';' + this.ftSty + '">'+
- txt +
- '<\/div>';
- };
-
- this.drawImage = function(imgSrc, x, y, w, h, a)
- {
- this.htm += '<div style="position:absolute;'+
- 'left:' + x + 'px;'+
- 'top:' + y + 'px;'+
- // w (width) and h (height) arguments are now optional.
- // Added by Mahmut Keygubatli, 14.1.2008
- (w? ('width:' + w + 'px;') : '') +
- (h? ('height:' + h + 'px;'):'')+'">'+
- '<img src="' + imgSrc +'"'+ (w ? (' width="' + w + '"'):'')+ (h ? (' height="' + h + '"'):'') + (a? (' '+a) : '') + '>'+
- '<\/div>';
- };
-
- this.clear = function()
- {
- this.htm = "";
- if(this.cnv) this.cnv.innerHTML = "";
- };
-
- this._mkOvQds = function(cx, cy, x, y, w, h, wod, hod)
- {
- var xl = cx - x, xr = cx + x + wod - w, yt = cy - y, yb = cy + y + hod - h;
- if(xr > xl+w)
- {
- this._mkDiv(xr, yt, w, h);
- this._mkDiv(xr, yb, w, h);
- }
- else
- w = xr - xl + w;
- this._mkDiv(xl, yt, w, h);
- this._mkDiv(xl, yb, w, h);
- };
-
- this._mkArcDiv = function(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects)
- {
- var xrDef = cx + x + (iOdds & 0xffff), y2, h = oy - y, xl, xr, w;
-
- if(!h) h = 1;
- x = cx - x;
-
- if(iSects & 0xff0000) // Start-angle > end-angle
- {
- y2 = cy - y - h;
- if(iSects & 0x00ff)
- {
- if(iSects & 0x02)
- {
- xl = Math.max(x, aBndZ[y]);
- w = xrDef - xl;
- if(w > 0) this._mkDiv(xl, y2, w, h);
- }
- if(iSects & 0x01)
- {
- xr = Math.min(xrDef, aBndA[y]);
- w = xr - x;
- if(w > 0) this._mkDiv(x, y2, w, h);
- }
- }
- else
- this._mkDiv(x, y2, xrDef - x, h);
- y2 = cy + y + (iOdds >> 16);
- if(iSects & 0xff00)
- {
- if(iSects & 0x0100)
- {
- xl = Math.max(x, aBndA[y]);
- w = xrDef - xl;
- if(w > 0) this._mkDiv(xl, y2, w, h);
- }
- if(iSects & 0x0200)
- {
- xr = Math.min(xrDef, aBndZ[y]);
- w = xr - x;
- if(w > 0) this._mkDiv(x, y2, w, h);
- }
- }
- else
- this._mkDiv(x, y2, xrDef - x, h);
- }
- else
- {
- if(iSects & 0x00ff)
- {
- if(iSects & 0x02)
- xl = Math.max(x, aBndZ[y]);
- else
- xl = x;
- if(iSects & 0x01)
- xr = Math.min(xrDef, aBndA[y]);
- else
- xr = xrDef;
- y2 = cy - y - h;
- w = xr - xl;
- if(w > 0) this._mkDiv(xl, y2, w, h);
- }
- if(iSects & 0xff00)
- {
- if(iSects & 0x0100)
- xl = Math.max(x, aBndA[y]);
- else
- xl = x;
- if(iSects & 0x0200)
- xr = Math.min(xrDef, aBndZ[y]);
- else
- xr = xrDef;
- y2 = cy + y + (iOdds >> 16);
- w = xr - xl;
- if(w > 0) this._mkDiv(xl, y2, w, h);
- }
- }
- };
-
- this.setStroke(1);
- this.setFont("verdana,geneva,helvetica,sans-serif", "12px", Font.PLAIN);
- this.color = "#000000";
- this.htm = "";
- this.wnd = wnd || window;
-
- if(!jg_ok) _chkDHTM();
- if(jg_ok)
- {
- if(cnv)
- {
- if(typeof(cnv) == "string")
- this.cont = document.all? (this.wnd.document.all[cnv] || null)
- : document.getElementById? (this.wnd.document.getElementById(cnv) || null)
- : null;
- else if(cnv == window.document)
- this.cont = document.getElementsByTagName("body")[0];
- // If cnv is a direct reference to a canvas DOM node
- // (option suggested by Andreas Luleich)
- else this.cont = cnv;
- // Create new canvas inside container DIV. Thus the drawing and clearing
- // methods won't interfere with the container's inner html.
- // Solution suggested by Vladimir.
- this.cnv = this.wnd.document.createElement("div");
- this.cnv.style.fontSize=0;
- this.cont.appendChild(this.cnv);
- this.paint = jg_dom? _pntCnvDom : _pntCnvIe;
- }
- else
- this.paint = _pntDoc;
- }
- else
- this.paint = _pntN;
-
- this.setPrintable(false);
-}
-
-function _mkLinVirt(aLin, x1, y1, x2, y2)
-{
- var dx = Math.abs(x2-x1), dy = Math.abs(y2-y1),
- x = x1, y = y1,
- xIncr = (x1 > x2)? -1 : 1,
- yIncr = (y1 > y2)? -1 : 1,
- p,
- i = 0;
- if(dx >= dy)
- {
- var pr = dy<<1,
- pru = pr - (dx<<1);
- p = pr-dx;
- while(dx > 0)
- {--dx;
- if(p > 0) // Increment y
- {
- aLin[i++] = x;
- y += yIncr;
- p += pru;
- }
- else p += pr;
- x += xIncr;
- }
- }
- else
- {
- var pr = dx<<1,
- pru = pr - (dy<<1);
- p = pr-dy;
- while(dy > 0)
- {--dy;
- y += yIncr;
- aLin[i++] = x;
- if(p > 0) // Increment x
- {
- x += xIncr;
- p += pru;
- }
- else p += pr;
- }
- }
- for(var len = aLin.length, i = len-i; i;)
- aLin[len-(i--)] = x;
-};
-
-function _CompInt(x, y)
-{
- return(x - y);
-}
-
+/**
+ * Gallery SVN ID:
+ * $Id: wz_jsgraphics.js 17298 2007-12-25 14:01:38Z JensT $
+*/
+
+/* This notice must be untouched at all times.
+
+wz_jsgraphics.js v. 3.03
+The latest version is available at
+http://www.walterzorn.com
+or http://www.devira.com
+or http://www.walterzorn.de
+
+Copyright (c) 2002-2004 Walter Zorn. All rights reserved.
+Created 3. 11. 2002 by Walter Zorn (Web: http://www.walterzorn.com )
+Last modified: 28. 1. 2008
+
+Performance optimizations for Internet Explorer
+by Thomas Frank and John Holdsworth.
+fillPolygon method implemented by Matthieu Haller.
+
+High Performance JavaScript Graphics Library.
+Provides methods
+- to draw lines, rectangles, ellipses, polygons
+ with specifiable line thickness,
+- to fill rectangles, polygons, ellipses and arcs
+- to draw text.
+NOTE: Operations, functions and branching have rather been optimized
+to efficiency and speed than to shortness of source code.
+
+LICENSE: LGPL
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License (LGPL) as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA,
+or see http://www.gnu.org/copyleft/lesser.html
+*/
+
+
+var jg_ok, jg_ie, jg_fast, jg_dom, jg_moz;
+
+
+function _chkDHTM(x, i)
+{
+ x = document.body || null;
+ jg_ie = x && typeof x.insertAdjacentHTML != "undefined" && document.createElement;
+ jg_dom = (x && !jg_ie &&
+ typeof x.appendChild != "undefined" &&
+ typeof document.createRange != "undefined" &&
+ typeof (i = document.createRange()).setStartBefore != "undefined" &&
+ typeof i.createContextualFragment != "undefined");
+ jg_fast = jg_ie && document.all && !window.opera;
+ jg_moz = jg_dom && typeof x.style.MozOpacity != "undefined";
+ jg_ok = !!(jg_ie || jg_dom);
+}
+
+function _pntCnvDom()
+{
+ var x = this.wnd.document.createRange();
+ x.setStartBefore(this.cnv);
+ x = x.createContextualFragment(jg_fast? this._htmRpc() : this.htm);
+ if(this.cnv) this.cnv.appendChild(x);
+ this.htm = "";
+}
+
+function _pntCnvIe()
+{
+ if(this.cnv) this.cnv.insertAdjacentHTML("BeforeEnd", jg_fast? this._htmRpc() : this.htm);
+ this.htm = "";
+}
+
+function _pntDoc()
+{
+ this.wnd.document.write(jg_fast? this._htmRpc() : this.htm);
+ this.htm = '';
+}
+
+function _pntN()
+{
+ ;
+}
+
+function _mkDiv(x, y, w, h)
+{
+ this.htm += '<div style="position:absolute;'+
+ 'left:' + x + 'px;'+
+ 'top:' + y + 'px;'+
+ 'width:' + w + 'px;'+
+ 'height:' + h + 'px;'+
+ 'clip:rect(0,'+w+'px,'+h+'px,0);'+
+ 'opacity:.40;' +
+ 'background-color:' + this.color +
+ (!jg_moz? ';overflow:hidden' : '')+
+ ';"><\/div>';
+}
+
+function _mkDivIe(x, y, w, h)
+{
+ this.htm += '%%'+this.color+';'+x+';'+y+';'+w+';'+h+';';
+}
+
+function _mkDivPrt(x, y, w, h)
+{
+ this.htm += '<div style="position:absolute;'+
+ 'border-left:' + w + 'px solid ' + this.color + ';'+
+ 'left:' + x + 'px;'+
+ 'top:' + y + 'px;'+
+ 'width:0px;'+
+ 'height:' + h + 'px;'+
+ 'clip:rect(0,'+w+'px,'+h+'px,0);'+
+ 'background-color:' + this.color +
+ (!jg_moz? ';overflow:hidden' : '')+
+ ';"><\/div>';
+}
+
+var _regex = /%%([^;]+);([^;]+);([^;]+);([^;]+);([^;]+);/g;
+function _htmRpc()
+{
+ return this.htm.replace(
+ _regex,
+ '<div style="overflow:hidden;position:absolute;background-color:'+
+ '$1;left:$2;top:$3;width:$4;height:$5"></div>\n');
+}
+
+function _htmPrtRpc()
+{
+ return this.htm.replace(
+ _regex,
+ '<div style="overflow:hidden;position:absolute;background-color:'+
+ '$1;left:$2;top:$3;width:$4;height:$5;border-left:$4px solid $1"></div>\n');
+}
+
+function _mkLin(x1, y1, x2, y2)
+{
+ if(x1 > x2)
+ {
+ var _x2 = x2;
+ var _y2 = y2;
+ x2 = x1;
+ y2 = y1;
+ x1 = _x2;
+ y1 = _y2;
+ }
+ var dx = x2-x1, dy = Math.abs(y2-y1),
+ x = x1, y = y1,
+ yIncr = (y1 > y2)? -1 : 1;
+
+ if(dx >= dy)
+ {
+ var pr = dy<<1,
+ pru = pr - (dx<<1),
+ p = pr-dx,
+ ox = x;
+ while(dx > 0)
+ {--dx;
+ ++x;
+ if(p > 0)
+ {
+ this._mkDiv(ox, y, x-ox, 1);
+ y += yIncr;
+ p += pru;
+ ox = x;
+ }
+ else p += pr;
+ }
+ this._mkDiv(ox, y, x2-ox+1, 1);
+ }
+
+ else
+ {
+ var pr = dx<<1,
+ pru = pr - (dy<<1),
+ p = pr-dy,
+ oy = y;
+ if(y2 <= y1)
+ {
+ while(dy > 0)
+ {--dy;
+ if(p > 0)
+ {
+ this._mkDiv(x++, y, 1, oy-y+1);
+ y += yIncr;
+ p += pru;
+ oy = y;
+ }
+ else
+ {
+ y += yIncr;
+ p += pr;
+ }
+ }
+ this._mkDiv(x2, y2, 1, oy-y2+1);
+ }
+ else
+ {
+ while(dy > 0)
+ {--dy;
+ y += yIncr;
+ if(p > 0)
+ {
+ this._mkDiv(x++, oy, 1, y-oy);
+ p += pru;
+ oy = y;
+ }
+ else p += pr;
+ }
+ this._mkDiv(x2, oy, 1, y2-oy+1);
+ }
+ }
+}
+
+function _mkLin2D(x1, y1, x2, y2)
+{
+ if(x1 > x2)
+ {
+ var _x2 = x2;
+ var _y2 = y2;
+ x2 = x1;
+ y2 = y1;
+ x1 = _x2;
+ y1 = _y2;
+ }
+ var dx = x2-x1, dy = Math.abs(y2-y1),
+ x = x1, y = y1,
+ yIncr = (y1 > y2)? -1 : 1;
+
+ var s = this.stroke;
+ if(dx >= dy)
+ {
+ if(dx > 0 && s-3 > 0)
+ {
+ var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
+ _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
+ }
+ else var _s = s;
+ var ad = Math.ceil(s/2);
+
+ var pr = dy<<1,
+ pru = pr - (dx<<1),
+ p = pr-dx,
+ ox = x;
+ while(dx > 0)
+ {--dx;
+ ++x;
+ if(p > 0)
+ {
+ this._mkDiv(ox, y, x-ox+ad, _s);
+ y += yIncr;
+ p += pru;
+ ox = x;
+ }
+ else p += pr;
+ }
+ this._mkDiv(ox, y, x2-ox+ad+1, _s);
+ }
+
+ else
+ {
+ if(s-3 > 0)
+ {
+ var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
+ _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
+ }
+ else var _s = s;
+ var ad = Math.round(s/2);
+
+ var pr = dx<<1,
+ pru = pr - (dy<<1),
+ p = pr-dy,
+ oy = y;
+ if(y2 <= y1)
+ {
+ ++ad;
+ while(dy > 0)
+ {--dy;
+ if(p > 0)
+ {
+ this._mkDiv(x++, y, _s, oy-y+ad);
+ y += yIncr;
+ p += pru;
+ oy = y;
+ }
+ else
+ {
+ y += yIncr;
+ p += pr;
+ }
+ }
+ this._mkDiv(x2, y2, _s, oy-y2+ad);
+ }
+ else
+ {
+ while(dy > 0)
+ {--dy;
+ y += yIncr;
+ if(p > 0)
+ {
+ this._mkDiv(x++, oy, _s, y-oy+ad);
+ p += pru;
+ oy = y;
+ }
+ else p += pr;
+ }
+ this._mkDiv(x2, oy, _s, y2-oy+ad+1);
+ }
+ }
+}
+
+function _mkLinDott(x1, y1, x2, y2)
+{
+ if(x1 > x2)
+ {
+ var _x2 = x2;
+ var _y2 = y2;
+ x2 = x1;
+ y2 = y1;
+ x1 = _x2;
+ y1 = _y2;
+ }
+ var dx = x2-x1, dy = Math.abs(y2-y1),
+ x = x1, y = y1,
+ yIncr = (y1 > y2)? -1 : 1,
+ drw = true;
+ if(dx >= dy)
+ {
+ var pr = dy<<1,
+ pru = pr - (dx<<1),
+ p = pr-dx;
+ while(dx > 0)
+ {--dx;
+ if(drw) this._mkDiv(x, y, 1, 1);
+ drw = !drw;
+ if(p > 0)
+ {
+ y += yIncr;
+ p += pru;
+ }
+ else p += pr;
+ ++x;
+ }
+ }
+ else
+ {
+ var pr = dx<<1,
+ pru = pr - (dy<<1),
+ p = pr-dy;
+ while(dy > 0)
+ {--dy;
+ if(drw) this._mkDiv(x, y, 1, 1);
+ drw = !drw;
+ y += yIncr;
+ if(p > 0)
+ {
+ ++x;
+ p += pru;
+ }
+ else p += pr;
+ }
+ }
+ if(drw) this._mkDiv(x, y, 1, 1);
+}
+
+function _mkOv(left, top, width, height)
+{
+ var a = (++width)>>1, b = (++height)>>1,
+ wod = width&1, hod = height&1,
+ cx = left+a, cy = top+b,
+ x = 0, y = b,
+ ox = 0, oy = b,
+ aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+ st = (aa2>>1)*(1-(b<<1)) + bb2,
+ tt = (bb2>>1) - aa2*((b<<1)-1),
+ w, h;
+ while(y > 0)
+ {
+ if(st < 0)
+ {
+ st += bb2*((x<<1)+3);
+ tt += bb4*(++x);
+ }
+ else if(tt < 0)
+ {
+ st += bb2*((x<<1)+3) - aa4*(y-1);
+ tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+ w = x-ox;
+ h = oy-y;
+ if((w&2) && (h&2))
+ {
+ this._mkOvQds(cx, cy, x-2, y+2, 1, 1, wod, hod);
+ this._mkOvQds(cx, cy, x-1, y+1, 1, 1, wod, hod);
+ }
+ else this._mkOvQds(cx, cy, x-1, oy, w, h, wod, hod);
+ ox = x;
+ oy = y;
+ }
+ else
+ {
+ tt -= aa2*((y<<1)-3);
+ st -= aa4*(--y);
+ }
+ }
+ w = a-ox+1;
+ h = (oy<<1)+hod;
+ y = cy-oy;
+ this._mkDiv(cx-a, y, w, h);
+ this._mkDiv(cx+ox+wod-1, y, w, h);
+}
+
+function _mkOv2D(left, top, width, height)
+{
+ var s = this.stroke;
+ width += s+1;
+ height += s+1;
+ var a = width>>1, b = height>>1,
+ wod = width&1, hod = height&1,
+ cx = left+a, cy = top+b,
+ x = 0, y = b,
+ aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+ st = (aa2>>1)*(1-(b<<1)) + bb2,
+ tt = (bb2>>1) - aa2*((b<<1)-1);
+
+ if(s-4 < 0 && (!(s-2) || width-51 > 0 && height-51 > 0))
+ {
+ var ox = 0, oy = b,
+ w, h,
+ pxw;
+ while(y > 0)
+ {
+ if(st < 0)
+ {
+ st += bb2*((x<<1)+3);
+ tt += bb4*(++x);
+ }
+ else if(tt < 0)
+ {
+ st += bb2*((x<<1)+3) - aa4*(y-1);
+ tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+ w = x-ox;
+ h = oy-y;
+
+ if(w-1)
+ {
+ pxw = w+1+(s&1);
+ h = s;
+ }
+ else if(h-1)
+ {
+ pxw = s;
+ h += 1+(s&1);
+ }
+ else pxw = h = s;
+ this._mkOvQds(cx, cy, x-1, oy, pxw, h, wod, hod);
+ ox = x;
+ oy = y;
+ }
+ else
+ {
+ tt -= aa2*((y<<1)-3);
+ st -= aa4*(--y);
+ }
+ }
+ this._mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
+ this._mkDiv(cx+a+wod-s, cy-oy, s, (oy<<1)+hod);
+ }
+
+ else
+ {
+ var _a = (width-(s<<1))>>1,
+ _b = (height-(s<<1))>>1,
+ _x = 0, _y = _b,
+ _aa2 = (_a*_a)<<1, _aa4 = _aa2<<1, _bb2 = (_b*_b)<<1, _bb4 = _bb2<<1,
+ _st = (_aa2>>1)*(1-(_b<<1)) + _bb2,
+ _tt = (_bb2>>1) - _aa2*((_b<<1)-1),
+
+ pxl = new Array(),
+ pxt = new Array(),
+ _pxb = new Array();
+ pxl[0] = 0;
+ pxt[0] = b;
+ _pxb[0] = _b-1;
+ while(y > 0)
+ {
+ if(st < 0)
+ {
+ pxl[pxl.length] = x;
+ pxt[pxt.length] = y;
+ st += bb2*((x<<1)+3);
+ tt += bb4*(++x);
+ }
+ else if(tt < 0)
+ {
+ pxl[pxl.length] = x;
+ st += bb2*((x<<1)+3) - aa4*(y-1);
+ tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+ pxt[pxt.length] = y;
+ }
+ else
+ {
+ tt -= aa2*((y<<1)-3);
+ st -= aa4*(--y);
+ }
+
+ if(_y > 0)
+ {
+ if(_st < 0)
+ {
+ _st += _bb2*((_x<<1)+3);
+ _tt += _bb4*(++_x);
+ _pxb[_pxb.length] = _y-1;
+ }
+ else if(_tt < 0)
+ {
+ _st += _bb2*((_x<<1)+3) - _aa4*(_y-1);
+ _tt += _bb4*(++_x) - _aa2*(((_y--)<<1)-3);
+ _pxb[_pxb.length] = _y-1;
+ }
+ else
+ {
+ _tt -= _aa2*((_y<<1)-3);
+ _st -= _aa4*(--_y);
+ _pxb[_pxb.length-1]--;
+ }
+ }
+ }
+
+ var ox = -wod, oy = b,
+ _oy = _pxb[0],
+ l = pxl.length,
+ w, h;
+ for(var i = 0; i < l; i++)
+ {
+ if(typeof _pxb[i] != "undefined")
+ {
+ if(_pxb[i] < _oy || pxt[i] < oy)
+ {
+ x = pxl[i];
+ this._mkOvQds(cx, cy, x, oy, x-ox, oy-_oy, wod, hod);
+ ox = x;
+ oy = pxt[i];
+ _oy = _pxb[i];
+ }
+ }
+ else
+ {
+ x = pxl[i];
+ this._mkDiv(cx-x, cy-oy, 1, (oy<<1)+hod);
+ this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
+ ox = x;
+ oy = pxt[i];
+ }
+ }
+ this._mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
+ this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
+ }
+}
+
+function _mkOvDott(left, top, width, height)
+{
+ var a = (++width)>>1, b = (++height)>>1,
+ wod = width&1, hod = height&1, hodu = hod^1,
+ cx = left+a, cy = top+b,
+ x = 0, y = b,
+ aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+ st = (aa2>>1)*(1-(b<<1)) + bb2,
+ tt = (bb2>>1) - aa2*((b<<1)-1),
+ drw = true;
+ while(y > 0)
+ {
+ if(st < 0)
+ {
+ st += bb2*((x<<1)+3);
+ tt += bb4*(++x);
+ }
+ else if(tt < 0)
+ {
+ st += bb2*((x<<1)+3) - aa4*(y-1);
+ tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+ }
+ else
+ {
+ tt -= aa2*((y<<1)-3);
+ st -= aa4*(--y);
+ }
+ if(drw && y >= hodu) this._mkOvQds(cx, cy, x, y, 1, 1, wod, hod);
+ drw = !drw;
+ }
+}
+
+function _mkRect(x, y, w, h)
+{
+ var s = this.stroke;
+ this._mkDiv(x, y, w, s);
+ this._mkDiv(x+w, y, s, h);
+ this._mkDiv(x, y+h, w+s, s);
+ this._mkDiv(x, y+s, s, h-s);
+}
+
+function _mkRectDott(x, y, w, h)
+{
+ this.drawLine(x, y, x+w, y);
+ this.drawLine(x+w, y, x+w, y+h);
+ this.drawLine(x, y+h, x+w, y+h);
+ this.drawLine(x, y, x, y+h);
+}
+
+function jsgFont()
+{
+ this.PLAIN = 'font-weight:normal;';
+ this.BOLD = 'font-weight:bold;';
+ this.ITALIC = 'font-style:italic;';
+ this.ITALIC_BOLD = this.ITALIC + this.BOLD;
+ this.BOLD_ITALIC = this.ITALIC_BOLD;
+}
+var Font = new jsgFont();
+
+function jsgStroke()
+{
+ this.DOTTED = -1;
+}
+var Stroke = new jsgStroke();
+
+function jsGraphics(cnv, wnd)
+{
+ this.setColor = function(x)
+ {
+ this.color = x.toLowerCase();
+ };
+
+ this.setStroke = function(x)
+ {
+ this.stroke = x;
+ if(!(x+1))
+ {
+ this.drawLine = _mkLinDott;
+ this._mkOv = _mkOvDott;
+ this.drawRect = _mkRectDott;
+ }
+ else if(x-1 > 0)
+ {
+ this.drawLine = _mkLin2D;
+ this._mkOv = _mkOv2D;
+ this.drawRect = _mkRect;
+ }
+ else
+ {
+ this.drawLine = _mkLin;
+ this._mkOv = _mkOv;
+ this.drawRect = _mkRect;
+ }
+ };
+
+ this.setPrintable = function(arg)
+ {
+ this.printable = arg;
+ if(jg_fast)
+ {
+ this._mkDiv = _mkDivIe;
+ this._htmRpc = arg? _htmPrtRpc : _htmRpc;
+ }
+ else this._mkDiv = arg? _mkDivPrt : _mkDiv;
+ };
+
+ this.setFont = function(fam, sz, sty)
+ {
+ this.ftFam = fam;
+ this.ftSz = sz;
+ this.ftSty = sty || Font.PLAIN;
+ };
+
+ this.drawPolyline = this.drawPolyLine = function(x, y)
+ {
+ for (var i=x.length - 1; i;)
+ {--i;
+ this.drawLine(x[i], y[i], x[i+1], y[i+1]);
+ }
+ };
+
+ this.fillRect = function(x, y, w, h)
+ {
+ this._mkDiv(x, y, w, h);
+ };
+
+ this.drawPolygon = function(x, y)
+ {
+ this.drawPolyline(x, y);
+ this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
+ };
+
+ this.drawEllipse = this.drawOval = function(x, y, w, h)
+ {
+ this._mkOv(x, y, w, h);
+ };
+
+ this.fillEllipse = this.fillOval = function(left, top, w, h)
+ {
+ var a = w>>1, b = h>>1,
+ wod = w&1, hod = h&1,
+ cx = left+a, cy = top+b,
+ x = 0, y = b, oy = b,
+ aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+ st = (aa2>>1)*(1-(b<<1)) + bb2,
+ tt = (bb2>>1) - aa2*((b<<1)-1),
+ xl, dw, dh;
+ if(w) while(y > 0)
+ {
+ if(st < 0)
+ {
+ st += bb2*((x<<1)+3);
+ tt += bb4*(++x);
+ }
+ else if(tt < 0)
+ {
+ st += bb2*((x<<1)+3) - aa4*(y-1);
+ xl = cx-x;
+ dw = (x<<1)+wod;
+ tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+ dh = oy-y;
+ this._mkDiv(xl, cy-oy, dw, dh);
+ this._mkDiv(xl, cy+y+hod, dw, dh);
+ oy = y;
+ }
+ else
+ {
+ tt -= aa2*((y<<1)-3);
+ st -= aa4*(--y);
+ }
+ }
+ this._mkDiv(cx-a, cy-oy, w, (oy<<1)+hod);
+ };
+
+ this.fillArc = function(iL, iT, iW, iH, fAngA, fAngZ)
+ {
+ var a = iW>>1, b = iH>>1,
+ iOdds = (iW&1) | ((iH&1) << 16),
+ cx = iL+a, cy = iT+b,
+ x = 0, y = b, ox = x, oy = y,
+ aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+ st = (aa2>>1)*(1-(b<<1)) + bb2,
+ tt = (bb2>>1) - aa2*((b<<1)-1),
+ // Vars for radial boundary lines
+ xEndA, yEndA, xEndZ, yEndZ,
+ iSects = (1 << (Math.floor((fAngA %= 360.0)/180.0) << 3))
+ | (2 << (Math.floor((fAngZ %= 360.0)/180.0) << 3))
+ | ((fAngA >= fAngZ) << 16),
+ aBndA = new Array(b+1), aBndZ = new Array(b+1);
+
+ // Set up radial boundary lines
+ fAngA *= Math.PI/180.0;
+ fAngZ *= Math.PI/180.0;
+ xEndA = cx+Math.round(a*Math.cos(fAngA));
+ yEndA = cy+Math.round(-b*Math.sin(fAngA));
+ _mkLinVirt(aBndA, cx, cy, xEndA, yEndA);
+ xEndZ = cx+Math.round(a*Math.cos(fAngZ));
+ yEndZ = cy+Math.round(-b*Math.sin(fAngZ));
+ _mkLinVirt(aBndZ, cx, cy, xEndZ, yEndZ);
+
+ while(y > 0)
+ {
+ if(st < 0) // Advance x
+ {
+ st += bb2*((x<<1)+3);
+ tt += bb4*(++x);
+ }
+ else if(tt < 0) // Advance x and y
+ {
+ st += bb2*((x<<1)+3) - aa4*(y-1);
+ ox = x;
+ tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+ this._mkArcDiv(ox, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+ oy = y;
+ }
+ else // Advance y
+ {
+ tt -= aa2*((y<<1)-3);
+ st -= aa4*(--y);
+ if(y && (aBndA[y] != aBndA[y-1] || aBndZ[y] != aBndZ[y-1]))
+ {
+ this._mkArcDiv(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+ ox = x;
+ oy = y;
+ }
+ }
+ }
+ this._mkArcDiv(x, 0, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+ if(iOdds >> 16) // Odd height
+ {
+ if(iSects >> 16) // Start-angle > end-angle
+ {
+ var xl = (yEndA <= cy || yEndZ > cy)? (cx - x) : cx;
+ this._mkDiv(xl, cy, x + cx - xl + (iOdds & 0xffff), 1);
+ }
+ else if((iSects & 0x01) && yEndZ > cy)
+ this._mkDiv(cx - x, cy, x, 1);
+ }
+ };
+
+/* fillPolygon method, implemented by Matthieu Haller.
+This javascript function is an adaptation of the gdImageFilledPolygon for Walter Zorn lib.
+C source of GD 1.8.4 found at http://www.boutell.com/gd/
+
+THANKS to Kirsten Schulz for the polygon fixes!
+
+The intersection finding technique of this code could be improved
+by remembering the previous intertersection, and by using the slope.
+That could help to adjust intersections to produce a nice
+interior_extrema. */
+ this.fillPolygon = function(array_x, array_y)
+ {
+ var i;
+ var y;
+ var miny, maxy;
+ var x1, y1;
+ var x2, y2;
+ var ind1, ind2;
+ var ints;
+
+ var n = array_x.length;
+ if(!n) return;
+
+ miny = array_y[0];
+ maxy = array_y[0];
+ for(i = 1; i < n; i++)
+ {
+ if(array_y[i] < miny)
+ miny = array_y[i];
+
+ if(array_y[i] > maxy)
+ maxy = array_y[i];
+ }
+ for(y = miny; y <= maxy; y++)
+ {
+ var polyInts = new Array();
+ ints = 0;
+ for(i = 0; i < n; i++)
+ {
+ if(!i)
+ {
+ ind1 = n-1;
+ ind2 = 0;
+ }
+ else
+ {
+ ind1 = i-1;
+ ind2 = i;
+ }
+ y1 = array_y[ind1];
+ y2 = array_y[ind2];
+ if(y1 < y2)
+ {
+ x1 = array_x[ind1];
+ x2 = array_x[ind2];
+ }
+ else if(y1 > y2)
+ {
+ y2 = array_y[ind1];
+ y1 = array_y[ind2];
+ x2 = array_x[ind1];
+ x1 = array_x[ind2];
+ }
+ else continue;
+
+ // Modified 11. 2. 2004 Walter Zorn
+ if((y >= y1) && (y < y2))
+ polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
+
+ else if((y == maxy) && (y > y1) && (y <= y2))
+ polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
+ }
+ polyInts.sort(_CompInt);
+ for(i = 0; i < ints; i+=2)
+ this._mkDiv(polyInts[i], y, polyInts[i+1]-polyInts[i]+1, 1);
+ }
+ };
+
+ this.drawString = function(txt, x, y)
+ {
+ this.htm += '<div style="position:absolute;white-space:nowrap;'+
+ 'left:' + x + 'px;'+
+ 'top:' + y + 'px;'+
+ 'font-family:' + this.ftFam + ';'+
+ 'font-size:' + this.ftSz + ';'+
+ 'color:' + this.color + ';' + this.ftSty + '">'+
+ txt +
+ '<\/div>';
+ };
+
+/* drawStringRect() added by Rick Blommers.
+Allows to specify the size of the text rectangle and to align the
+text both horizontally (e.g. right) and vertically within that rectangle */
+ this.drawStringRect = function(txt, x, y, width, halign)
+ {
+ this.htm += '<div style="position:absolute;overflow:hidden;'+
+ 'left:' + x + 'px;'+
+ 'top:' + y + 'px;'+
+ 'width:'+width +'px;'+
+ 'text-align:'+halign+';'+
+ 'font-family:' + this.ftFam + ';'+
+ 'font-size:' + this.ftSz + ';'+
+ 'color:' + this.color + ';' + this.ftSty + '">'+
+ txt +
+ '<\/div>';
+ };
+
+ this.drawImage = function(imgSrc, x, y, w, h, a)
+ {
+ this.htm += '<div style="position:absolute;'+
+ 'left:' + x + 'px;'+
+ 'top:' + y + 'px;'+
+ // w (width) and h (height) arguments are now optional.
+ // Added by Mahmut Keygubatli, 14.1.2008
+ (w? ('width:' + w + 'px;') : '') +
+ (h? ('height:' + h + 'px;'):'')+'">'+
+ '<img src="' + imgSrc +'"'+ (w ? (' width="' + w + '"'):'')+ (h ? (' height="' + h + '"'):'') + (a? (' '+a) : '') + '>'+
+ '<\/div>';
+ };
+
+ this.clear = function()
+ {
+ this.htm = "";
+ if(this.cnv) this.cnv.innerHTML = "";
+ };
+
+ this._mkOvQds = function(cx, cy, x, y, w, h, wod, hod)
+ {
+ var xl = cx - x, xr = cx + x + wod - w, yt = cy - y, yb = cy + y + hod - h;
+ if(xr > xl+w)
+ {
+ this._mkDiv(xr, yt, w, h);
+ this._mkDiv(xr, yb, w, h);
+ }
+ else
+ w = xr - xl + w;
+ this._mkDiv(xl, yt, w, h);
+ this._mkDiv(xl, yb, w, h);
+ };
+
+ this._mkArcDiv = function(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects)
+ {
+ var xrDef = cx + x + (iOdds & 0xffff), y2, h = oy - y, xl, xr, w;
+
+ if(!h) h = 1;
+ x = cx - x;
+
+ if(iSects & 0xff0000) // Start-angle > end-angle
+ {
+ y2 = cy - y - h;
+ if(iSects & 0x00ff)
+ {
+ if(iSects & 0x02)
+ {
+ xl = Math.max(x, aBndZ[y]);
+ w = xrDef - xl;
+ if(w > 0) this._mkDiv(xl, y2, w, h);
+ }
+ if(iSects & 0x01)
+ {
+ xr = Math.min(xrDef, aBndA[y]);
+ w = xr - x;
+ if(w > 0) this._mkDiv(x, y2, w, h);
+ }
+ }
+ else
+ this._mkDiv(x, y2, xrDef - x, h);
+ y2 = cy + y + (iOdds >> 16);
+ if(iSects & 0xff00)
+ {
+ if(iSects & 0x0100)
+ {
+ xl = Math.max(x, aBndA[y]);
+ w = xrDef - xl;
+ if(w > 0) this._mkDiv(xl, y2, w, h);
+ }
+ if(iSects & 0x0200)
+ {
+ xr = Math.min(xrDef, aBndZ[y]);
+ w = xr - x;
+ if(w > 0) this._mkDiv(x, y2, w, h);
+ }
+ }
+ else
+ this._mkDiv(x, y2, xrDef - x, h);
+ }
+ else
+ {
+ if(iSects & 0x00ff)
+ {
+ if(iSects & 0x02)
+ xl = Math.max(x, aBndZ[y]);
+ else
+ xl = x;
+ if(iSects & 0x01)
+ xr = Math.min(xrDef, aBndA[y]);
+ else
+ xr = xrDef;
+ y2 = cy - y - h;
+ w = xr - xl;
+ if(w > 0) this._mkDiv(xl, y2, w, h);
+ }
+ if(iSects & 0xff00)
+ {
+ if(iSects & 0x0100)
+ xl = Math.max(x, aBndA[y]);
+ else
+ xl = x;
+ if(iSects & 0x0200)
+ xr = Math.min(xrDef, aBndZ[y]);
+ else
+ xr = xrDef;
+ y2 = cy + y + (iOdds >> 16);
+ w = xr - xl;
+ if(w > 0) this._mkDiv(xl, y2, w, h);
+ }
+ }
+ };
+
+ this.setStroke(1);
+ this.setFont("verdana,geneva,helvetica,sans-serif", "12px", Font.PLAIN);
+ this.color = "#000000";
+ this.htm = "";
+ this.wnd = wnd || window;
+
+ if(!jg_ok) _chkDHTM();
+ if(jg_ok)
+ {
+ if(cnv)
+ {
+ if(typeof(cnv) == "string")
+ this.cont = document.all? (this.wnd.document.all[cnv] || null)
+ : document.getElementById? (this.wnd.document.getElementById(cnv) || null)
+ : null;
+ else if(cnv == window.document)
+ this.cont = document.getElementsByTagName("body")[0];
+ // If cnv is a direct reference to a canvas DOM node
+ // (option suggested by Andreas Luleich)
+ else this.cont = cnv;
+ // Create new canvas inside container DIV. Thus the drawing and clearing
+ // methods won't interfere with the container's inner html.
+ // Solution suggested by Vladimir.
+ this.cnv = this.wnd.document.createElement("div");
+ this.cnv.style.fontSize=0;
+ this.cont.appendChild(this.cnv);
+ this.paint = jg_dom? _pntCnvDom : _pntCnvIe;
+ }
+ else
+ this.paint = _pntDoc;
+ }
+ else
+ this.paint = _pntN;
+
+ this.setPrintable(false);
+}
+
+function _mkLinVirt(aLin, x1, y1, x2, y2)
+{
+ var dx = Math.abs(x2-x1), dy = Math.abs(y2-y1),
+ x = x1, y = y1,
+ xIncr = (x1 > x2)? -1 : 1,
+ yIncr = (y1 > y2)? -1 : 1,
+ p,
+ i = 0;
+ if(dx >= dy)
+ {
+ var pr = dy<<1,
+ pru = pr - (dx<<1);
+ p = pr-dx;
+ while(dx > 0)
+ {--dx;
+ if(p > 0) // Increment y
+ {
+ aLin[i++] = x;
+ y += yIncr;
+ p += pru;
+ }
+ else p += pr;
+ x += xIncr;
+ }
+ }
+ else
+ {
+ var pr = dx<<1,
+ pru = pr - (dy<<1);
+ p = pr-dy;
+ while(dy > 0)
+ {--dy;
+ y += yIncr;
+ aLin[i++] = x;
+ if(p > 0) // Increment x
+ {
+ x += xIncr;
+ p += pru;
+ }
+ else p += pr;
+ }
+ }
+ for(var len = aLin.length, i = len-i; i;)
+ aLin[len-(i--)] = x;
+};
+
+function _CompInt(x, y)
+{
+ return(x - y);
+}
+
Modified: branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_tooltip.js
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_tooltip.js 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/js/wz/wz_tooltip.js 2008-08-26 10:24:38 UTC (rev 17931)
@@ -1,12 +1,13 @@
/**
* Gallery SVN ID:
- * $Id: multiInput.js.php 13850 2006-06-19 12:37:37Z jenst $
+ * $Id: wz_toolzip.js $
*/
+
/* This notice must be untouched at all times.
Copyright (c) 2002-2008 Walter Zorn. All rights reserved.
-wz_tooltip.js v. 5.13
+wz_tooltip.js v. 5.20
The latest version is available at
http://www.walterzorn.com
@@ -14,11 +15,11 @@
or http://www.walterzorn.de
Created 1.12.2002 by Walter Zorn (Web: http://www.walterzorn.com )
-Last modified: 13.6.2008
+Last modified: 1.8.2008
Easy-to-use cross-browser tooltips.
Just include the script at the beginning of the <body> section, and invoke
-Tip('Tooltip text') to show and UnTip() to hide the tooltip, from the desired
+Tip('Tooltip text') to show and UnTip() to hide the tooltip, from the desired
HTML eventhandlers. Example:
<a onmouseover="Tip('Some text')" onmouseout="UnTip()" href="index.htm">My home page</a>
No container DIV required.
@@ -61,7 +62,7 @@
// Example: onmouseover="Tip('Tooltip text', LEFT, true, BGCOLOR, '#FF9900', FADEIN, 400)"
config. Above = false // false or true - tooltip above mousepointer
-config. BgColor = '' // Background colour (HTML colour value, in quotes)
+config. BgColor = '' // Background colour (HTML colour value, in quotes)
config. BgImg = '' // Path to background image, none if empty string ''
config. BorderColor = ''
config. BorderStyle = '' // Any permitted CSS value, but I recommend 'solid', 'dotted' or 'dashed'
@@ -78,7 +79,7 @@
config. FadeIn = 0 // Fade-in duration in ms, e.g. 400; 0 for no animation
config. FadeOut = 0
config. FadeInterval = 30 // Duration of each fade step in ms (recommended: 30) - shorter is smoother but causes more CPU-load
-config. Fix = null // Fixated position - x- an y-oordinates in brackets, e.g. [210, 480], or null for no fixation
+config. Fix = null // Fixated position, two modes. Mode 1: x- an y-coordinates in brackets, e.g. [210, 480]. Mode 2: Show tooltip at a position related to an HTML element: [ID of HTML element, x-offset, y-offset from HTML element], e.g. ['SomeID', 10, 30]. Value null (default) for no fixated positioning.
config. FollowMouse = true // false or true - tooltip follows the mouse
config. FontColor = ''
config. FontFace = ''
@@ -103,11 +104,12 @@
config. TitleFontColor = '' // Color of title text - if '', BgColor (of tooltip body) will be used
config. TitleFontFace = '' // If '' use FontFace (boldified)
config. TitleFontSize = '' // If '' use FontSize
-config. TitlePadding = 0
+config. TitlePadding = 2
config. Width = 0 // Tooltip width; 0 for automatic adaption to tooltip content; < -1 (e.g. -240) for a maximum width for that automatic adaption;
// -1: tooltip width confined to the width required for the titlebar
-config. ToolTipCss = '';
+config. ToolTipCss = '';
+
//======= END OF TOOLTIP CONFIG, DO NOT CHANGE ANYTHING BELOW ==============//
@@ -141,6 +143,7 @@
var tt_aElt = new Array(10), // Container DIV, outer title & body DIVs, inner title & body TDs, closebutton SPAN, shadow DIVs, and IFRAME to cover windowed elements in IE
tt_aV = new Array(), // Caches and enumerates config data for currently active tooltip
tt_sContent, // Inner tooltip text or HTML
+tt_t2t, tt_t2tDad, // Tag converted to tip, and its DOM parent element
tt_scrlX = 0, tt_scrlY = 0,
tt_musX, tt_musY,
tt_over,
@@ -211,13 +214,10 @@
if(tt_aV[CLICKCLOSE] || tt_aV[CLICKSTICKY])
tt_RemEvtFnc(document, "mouseup", tt_OnLClick);
tt_ExtCallFncs(0, "Kill");
- // In case of a TagToTip tooltip, hide converted DOM node and
- // re-insert it into document
+ // In case of a TagToTip tip, hide converted DOM node and
+ // re-insert it into DOM
if(tt_t2t && !tt_aV[COPYCONTENT])
- {
- tt_t2t.style.display = "none";
- tt_MovDomNode(tt_t2t, tt_aElt[6], tt_t2tDad);
- }
+ tt_UnEl2Tip();
tt_iState = 0;
tt_over = null;
tt_ResetMainDiv();
@@ -249,18 +249,13 @@
}
function tt_GetClientW()
{
- return(document.body && (typeof(document.body.clientWidth) != tt_u) ? document.body.clientWidth
- : (typeof(window.innerWidth) != tt_u) ? window.innerWidth
- : tt_db ? (tt_db.clientWidth || 0)
- : 0);
+ var de = document.documentElement;
+ return((de && de.clientWidth) ? de.clientWidth : (document.body.clientWidth || window.innerWidth || 0));
}
function tt_GetClientH()
{
- // Exactly this order seems to yield correct values in all major browsers
- return(document.body && (typeof(document.body.clientHeight) != tt_u) ? document.body.clientHeight
- : (typeof(window.innerHeight) != tt_u) ? window.innerHeight
- : tt_db ? (tt_db.clientHeight || 0)
- : 0);
+ var de = document.documentElement;
+ return((de && de.clientHeight) ? de.clientHeight : (document.body.clientHeight || window.innerHeight || 0));
}
function tt_GetEvtX(e)
{
@@ -290,6 +285,17 @@
el.detachEvent("on" + sEvt, PFnc);
}
}
+function tt_GetDad(el)
+{
+ return(el.parentNode || el.parentElement || el.offsetParent);
+}
+function tt_MovDomNode(el, dadFrom, dadTo)
+{
+ if(dadFrom)
+ dadFrom.removeChild(el);
+ if(dadTo)
+ dadTo.appendChild(el);
+}
//====================== PRIVATE ===========================================//
var tt_aExt = new Array(), // Array of extension objects
@@ -302,7 +308,6 @@
tt_iState = 0, // Tooltip active |= 1, shown |= 2, move with mouse |= 4
tt_opa, // Currently applied opacity
tt_bJmpVert, tt_bJmpHorz,// Tip temporarily on other side of mouse
-tt_t2t, tt_t2tDad, // Tag converted to tip, and its parent element in the document
tt_elDeHref, // The tag from which we've removed the href attribute
// Timer
tt_tShow = new Number(0), tt_tHide = new Number(0), tt_tDurt = new Number(0),
@@ -317,7 +322,7 @@
// Send old browsers instantly to hell
if(!tt_Browser() || !tt_MkMainDiv())
return;
- // Levy 06/11/2008: Important! IE doesn't fire an onscroll when a page
+ // Levy 06/11/2008: Important! IE doesn't fire an onscroll when a page
// refresh is made, so we need to recalc page positions on init.
tt_OnScrl();
tt_IsW3cBox();
@@ -550,7 +555,7 @@
tt_t2t = t2t;
if(!tt_ReadCmds(arg))
return;
- tt_iState = 0x1 | 0x4;
+ tt_iState = 0x1 | 0x4;
tt_AdaptConfig1();
tt_MkTipContent(arg);
tt_MkTipSubDivs();
@@ -676,16 +681,7 @@
tt_GetSubDivRefs();
// Convert DOM node to tip
if(tt_t2t && !tt_aV[COPYCONTENT])
- {
- // Store the tag's parent element so we can restore that DOM branch
- // once the tooltip is hidden
- tt_t2tDad = tt_t2t.parentNode || tt_t2t.parentElement || tt_t2t.offsetParent || null;
- if(tt_t2tDad)
- {
- tt_MovDomNode(tt_t2t, tt_t2tDad, tt_aElt[6]);
- tt_t2t.style.display = "block";
- }
- }
+ tt_El2Tip();
tt_ExtCallFncs(0, "SubDivsCreated");
}
function tt_GetSubDivRefs()
@@ -699,7 +695,7 @@
{
var css, w, h, pad = tt_aV[PADDING], padT, wBrd = tt_aV[BORDERWIDTH],
iOffY, iOffSh, iAdd = (pad + wBrd) << 1;
-
+
tt_aElt[0].className= tt_aV[TOOLTIPCSS];
//--------- Title DIV ----------
@@ -895,7 +891,7 @@
tt_OpReHref();
while(el)
{
- if(el.hasAttribute("href"))
+ if(el.hasAttribute && el.hasAttribute("href"))
{
el.t_href = el.getAttribute("href");
el.t_stats = window.status;
@@ -906,7 +902,7 @@
tt_elDeHref = el;
break;
}
- el = el.parentElement;
+ el = tt_GetDad(el);
}
}
function tt_OpReHref()
@@ -919,6 +915,35 @@
tt_elDeHref = null;
}
}
+function tt_El2Tip()
+{
+ var css = tt_t2t.style;
+
+ // Store previous positioning
+ tt_t2t.t_cp = css.position;
+ tt_t2t.t_cl = css.left;
+ tt_t2t.t_ct = css.top;
+ tt_t2t.t_cd = css.display;
+ // Store the tag's parent element so we can restore that DOM branch
+ // when the tooltip is being hidden
+ tt_t2tDad = tt_GetDad(tt_t2t);
+ tt_MovDomNode(tt_t2t, tt_t2tDad, tt_aElt[6]);
+ css.display = "block";
+ css.position = "static";
+ css.left = css.top = css.marginLeft = css.marginTop = "0px";
+}
+function tt_UnEl2Tip()
+{
+ // Restore positioning and display
+ var css = tt_t2t.style;
+
+ css.display = tt_t2t.t_cd;
+ tt_MovDomNode(tt_t2t, tt_GetDad(tt_t2t), tt_t2tDad);
+ css.position = tt_t2t.t_cp;
+ css.left = tt_t2t.t_cl;
+ css.top = tt_t2t.t_ct;
+ tt_t2tDad = null;
+}
function tt_OverInit()
{
if(window.event)
@@ -986,14 +1011,8 @@
}
if(tt_aV[FIX])
{
- var iY = tt_aV[FIX][1];
- // For a fixed tip to be positioned above the mouse, use the
- // bottom edge as anchor
- // (recommended by Christophe Rebeschini, 31.1.2008)
- if(tt_aV[ABOVE])
- iY -= tt_h;
tt_iState &= ~0x4;
- tt_SetTipPos(tt_aV[FIX][0], tt_aV[FIX][1]);
+ tt_PosFix();
}
else if(!tt_ExtCallFncs(e, "MoveBefore"))
tt_SetTipPos(tt_Pos(0), tt_Pos(1));
@@ -1002,12 +1021,12 @@
}
function tt_Pos(iDim)
{
- var iX, bJmpMode, cmdAlt, cmdOff, cx, iMax, iScrl, iMus, bJmp;
+ var iX, bJmpMod, cmdAlt, cmdOff, cx, iMax, iScrl, iMus, bJmp;
// Map values according to dimension to calculate
if(iDim)
{
- bJmpMode = tt_aV[JUMPVERT];
+ bJmpMod = tt_aV[JUMPVERT];
cmdAlt = ABOVE;
cmdOff = OFFSETY;
cx = tt_h;
@@ -1018,7 +1037,7 @@
}
else
{
- bJmpMode = tt_aV[JUMPHORZ];
+ bJmpMod = tt_aV[JUMPHORZ];
cmdAlt = LEFT;
cmdOff = OFFSETX;
cx = tt_w;
@@ -1027,7 +1046,7 @@
iMus = tt_musX;
bJmp = tt_bJmpHorz;
}
- if(bJmpMode)
+ if(bJmpMod)
{
if(tt_aV[cmdAlt] && (!bJmp || tt_CalcPosAlt(iDim) >= iScrl + 16))
iX = tt_PosAlt(iDim);
@@ -1046,11 +1065,11 @@
}
// Prevent tip from extending past clientarea boundary
if(iX > iMax)
- iX = bJmpMode ? tt_PosAlt(iDim) : iMax;
+ iX = bJmpMod ? tt_PosAlt(iDim) : iMax;
// In case of insufficient space on both sides, ensure the left/upper part
// of the tip be visible
if(iX < iScrl)
- iX = bJmpMode ? tt_PosDef(iDim) : iScrl;
+ iX = bJmpMod ? tt_PosDef(iDim) : iScrl;
return iX;
}
function tt_PosDef(iDim)
@@ -1081,6 +1100,39 @@
dx = 1;
return((iDim ? (tt_musY - tt_h) : (tt_musX - tt_w)) - dx);
}
+function tt_PosFix()
+{
+ var iX, iY;
+
+ if(typeof(tt_aV[FIX][0]) == "number")
+ {
+ iX = tt_aV[FIX][0];
+ iY = tt_aV[FIX][1];
+ }
+ else
+ {
+ if(typeof(tt_aV[FIX][0]) == "string")
+ el = tt_GetElt(tt_aV[FIX][0]);
+ // First slot in array is direct reference to HTML element
+ else
+ el = tt_aV[FIX][0];
+ iX = tt_aV[FIX][1];
+ iY = tt_aV[FIX][2];
+ // By default, vert pos is related to bottom edge of HTML element
+ if(!tt_aV[ABOVE] && el)
+ iY += tt_GetDivH(el);
+ for(; el; el = el.offsetParent)
+ {
+ iX += el.offsetLeft || 0;
+ iY += el.offsetTop || 0;
+ }
+ }
+ // For a fixed tip positioned above the mouse, use the bottom edge as anchor
+ // (recommended by Christophe Rebeschini, 31.1.2008)
+ if(tt_aV[ABOVE])
+ iY -= tt_h;
+ tt_SetTipPos(iX, iY);
+}
function tt_Fade(a, now, z, n)
{
if(n)
@@ -1089,11 +1141,13 @@
if((z > a) ? (now >= z) : (now <= z))
now = z;
else
- tt_tFade.Timer("tt_Fade("
- + a + "," + now + "," + z + "," + (n - 1)
- + ")",
- tt_aV[FADEINTERVAL],
- true);
+ tt_tFade.Timer(
+ "tt_Fade("
+ + a + "," + now + "," + z + "," + (n - 1)
+ + ")",
+ tt_aV[FADEINTERVAL],
+ true
+ );
}
now ? tt_SetTipOpa(now) : tt_Hide();
}
@@ -1205,13 +1259,6 @@
}
}
}
-function tt_MovDomNode(el, dadFrom, dadTo)
-{
- if(dadFrom)
- dadFrom.removeChild(el);
- if(dadTo)
- dadTo.appendChild(el);
-}
function tt_Err(sErr, bIfDebug)
{
if(tt_Debug || !bIfDebug)
Modified: branches/BRANCH_1_5_LEGACY/gallery/lib/setup.php
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/lib/setup.php 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/lib/setup.php 2008-08-26 10:24:38 UTC (rev 17931)
@@ -133,7 +133,7 @@
$arr['value'] = array($arr['value'], $arr['value'], $arr['value'], $arr['value']);
}
- $html = gInput('password', $key[0], null, false, $arr['value'][0], array('addCheck' => true))
+ $html = gInput('password', $key . '[0]', null, false, $arr['value'][0], array('addCheck' => true))
. '<br>'
. "<input type=\"password\" name=\"${key}[1]\" value=\"{$arr['value'][1]}\" $attrs> "
. gTranslate('common', "Please retype your password here")
Modified: branches/BRANCH_1_5_LEGACY/gallery/util.php
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/util.php 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/util.php 2008-08-26 10:24:38 UTC (rev 17931)
@@ -50,6 +50,10 @@
$ret = & $_REQUEST[$str];
+ if ("$ret" == "0") {
+ return $ret;
+ }
+
if (get_magic_quotes_gpc()) {
$ret = stripslashes_deep($ret);
}
Modified: branches/BRANCH_1_5_LEGACY/gallery/view_photo.php
===================================================================
--- branches/BRANCH_1_5_LEGACY/gallery/view_photo.php 2008-08-26 09:00:10 UTC (rev 17930)
+++ branches/BRANCH_1_5_LEGACY/gallery/view_photo.php 2008-08-26 10:24:38 UTC (rev 17931)
@@ -328,7 +328,7 @@
if ($fitToWindow) {
/* Include Javascript */
- echo jsHTML('fitToWindow.js.php');
+ echo jsHTML("fitToWindow.js.php?imageWidth=$imageWidth&imageHeight=$imageHeight");
}
?>
<!-- Top Nav Bar -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
