Changeset 7337 for extensions/gally/gally-default

Timestamp:

Oct 22, 2010, 10:03:09 AM (14 years ago)

Author:

grum

Message:

fix bug:1948

Location:

extensions/gally/gally-default

Files:

• admin/GallyDefault.class.inc.php (modified) (2 diffs)
• icon/1x1transp.gif (added)
• js/gallyjs-tpp.js (modified) (3 diffs)
• release_notes.txt (modified) (1 diff)

extensions/gally/gally-default/admin/GallyDefault.class.inc.php

@@ -52 +52 @@
     $this->setDirectoryPrivate('templates.local', $templateDirectory);
 
+
     $this->setDirectoryPrivate('conf.parent', dirname(dirname(__FILE__)).'/conf');
     $this->setDirectoryPrivate('conf.local', $confDirectory);
@@ -89 +90 @@
     $this->config = new Conf();
     $this->config->setFileName($this->directories['conf.parent']."/default.conf");
+    $this->config->read();
+    $this->config->setFileName($this->directories['conf.local']."/default.conf");
     $this->config->read();
     $this->config->setFileName(PHPWG_ROOT_PATH."local/themes/".basename(dirname($this->directories['conf.local']))."/conf/local.conf");

extensions/gally/gally-default/js/gallyjs-tpp.js

@@ -4 +4 @@
   ------------------------------------------------------------------------------
   file: gally/gallyjs-tpp.js
-  file release: 1.2.0
+  file release: 1.3.4
   ------------------------------------------------------------------------------
   author: grum at grum.dnsalias.com
@@ -157 +157 @@
   $(window).resize( function () { initializeImageMode("resize"); } );
 
-  $(document).data("initialized", 1);
+  $(document).data("initialized", 1).trigger('gallyInterfaceReady');
 }
 
@@ -214 +214 @@
         deadArea = $("#navThumbPrev").attr("clientWidth")*1.2;
         mouse=Math.max(Math.min(event.clientX-this.offsetLeft, this.clientWidth - deadArea), deadArea);
-        $("#theImg").css("left",Math.round(($("#theImg").attr("scrollWidth")-this.clientWidth) * -(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px");
+        $("#theImg")
+          .css("left",Math.round(($("#theImg").attr("scrollWidth")-this.clientWidth) * -(mouse-deadArea)/(this.clientWidth-2*deadArea))+"px")
+          .trigger('scrolled');
       }
     );

extensions/gally/gally-default/release_notes.txt

@@ -107 +107 @@
   | 1.3.5   | 2010-10-21 | * add IT and DE languages
   |         |            |
-  |         |            |
-  |         |            |
+  |         |            | * mantis bug:1948
+  |         |            |   . default conf file is not the right conf file 
   |         |            |
   |         |            |