Changeset 127 for PloneHighslideJS/trunk/skins/plone_highslide_js/highslide.js.dtml

Timestamp:

02/13/07 21:35:02 (5 years ago)

Author:

takanori

Message:

highslide 2.2.8 から 2.2.9 にアップグレード

File:

• PloneHighslideJS/trunk/skins/plone_highslide_js/highslide.js.dtml (modified) (19 diffs)

PloneHighslideJS/trunk/skins/plone_highslide_js/highslide.js.dtml

@@ -1 @@
-// <dtml-with base_properties> (do not remove this)
 // <dtml-call "REQUEST.set('portal_url', portal_url())"> (not this either)
 /******************************************************************************
-Version 2.2.8 (January 10 2007)
+Version 2.2.9 (February 12 2007)
 
 Author:  Torstein Hønsi
@@ -34 +33 @@
 // Apply your own settings here, or override them in the html file.  
 graphicsDir : '&dtml-portal_url;/graphics/',
-restoreCursor : "zoomout.ico", // necessary for preload
+restoreCursor : "zoomout.cur", // necessary for preload
 fullExpandIcon : 'fullexpand.gif',
 expandSteps : 10, // number of steps in zoom. Each step lasts for duration/step milliseconds.
@@ -568 +567 @@
                 
                 if (this.isImage) this.imageCreate();
+                else {
+                        this.htmlCreate();
+                        
+                }
         
                 return false;
@@ -637 +640 @@
 HsExpander.prototype.onLoad = function() {      
         try { 
-        
+                
                 if (!this.content) return;
                 // prevent looping on certain Gecko engines:
@@ -679 +682 @@
                 this.wrapper.style.top = this.thumbTop +'px';
                 hs.container.appendChild(this.wrapper);
-                if (this.swfObject) this.swfObject.write(this.flashContainerId);
                 
                 // correct for borders
@@ -703 +705 @@
                 
                 client = new hs.clientInfo();
-                
                 
                 // justify
@@ -719 +720 @@
                 var oldRight = this.x.min + parseInt(this.thumbWidth);
                 this.x = this.justify(this.x);
-
+                
                 this.y = { 
                         min: parseInt(this.thumbTop) - this.offsetBorderH + this.thumbOffsetBorderH,
@@ -735 +736 @@
 
                 if (this.isHtml) this.htmlSizeOperations();
-
-
+                
                 // correct ratio
                 if (this.isImage) this.correctRatio(ratio);
@@ -753 +753 @@
                 
                 // Apply size change
-                
                 this.changeSize(
                         this.thumbLeft + this.thumbOffsetBorderW - this.offsetBorderW,
@@ -824 +823 @@
         this.isExpanded = true;
         this.focus();
+        if (this.isHtml && this.objectLoadTime == 'after') this.writeExtendedContent();
         this.createCustomOverlays();
         if (hs.showCredits) this.writeCredits();
@@ -849 +849 @@
                 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) {
                         p.min = p.scroll + p.marginMin;
@@ -1050 +1052 @@
         
         if (hs.safari) {
-                this.outline[i].style.left = '10px';
-                this.outline[i].style.top = '10px';
+                hs.setStyles(this.outline[i], { left: '10px', top: '10px', visibility: 'hidden' });
                 hs.container.appendChild(img);
         }
@@ -1061 +1062 @@
         for (i = 1; i <= 8; i++) {
                 this.wrapper.appendChild(this.outline[i]);
+                if (hs.safari) this.outline[i].style.visibility = 'visible';
         }
         this.hasOutline = true;
@@ -1195 +1197 @@
                 }
                 
+                if (this.objectLoadTime == 'after') this.destroyObject();
                 if (this.scrollerDiv && this.scrollerDiv != 'scrollingContent') exp[this.scrollerDiv].style.overflow = 'hidden';
 
@@ -1248 +1251 @@
                 {
                         'position' : 'absolute',
-                        'zIndex' : 3,
-                        'visibility': 'hidden'
+                        'zIndex' : 3
                 },
                 this.wrapper
@@ -1274 +1276 @@
         overlay.style.top = top +'px';
         
-        if (this.mouseIsOver || !hideOnMouseOut) overlay.style.visibility = 'visible';
         if (hideOnMouseOut) overlay.setAttribute('hideOnMouseOut', true);
         
@@ -1290 +1291 @@
 
 HsExpander.prototype.onMouseOver = function () {
-        this.mouseIsOver = true;
         for (i = 0; i < this.overlays.length; i++) {
                 this.overlays[i].style.visibility = 'visible';
@@ -1297 +1297 @@
 
 HsExpander.prototype.onMouseOut = function(rel) {
-        this.mouseIsOver = false;
         var hideThese = new Array();
         for (i = 0; i < this.overlays.length; i++) {
@@ -1384 +1383 @@
 hs.addEventListener(document, 'mousedown', hs.mouseDownHandler);
 hs.addEventListener(document, 'mouseup', hs.mouseUpHandler);
-
-// </dtml-with>
-