Changeset 11036

Timestamp:

May 24, 2011, 11:17:20 PM (13 years ago)

Author:

grum

Message:

fix bug:2311, bug:2312 (random pict bug)

Location:

extensions/AMenuManager

Files:

• amm_pip.class.inc.php (modified) (2 diffs)
• amm_version.inc.php (modified) (1 diff)
• js/amm_randomPictPublic.js (modified) (2 diffs)
• js/amm_randomPictPublic.min.js (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)

extensions/AMenuManager/amm_pip.class.inc.php

@@ -79 +79 @@
         ($block=$menu->get_block('mbAMM_randompict'))!=null) and
         ($user['nb_total_images']>0) and
-        isset($this->config['amm_randompicture_title'][$user['language']])
+        isset($this->config['amm_randompicture_title'][$user['language']]) and
+        $this->displayRandomImageBlock
       )
     {
@@ -352 +353 @@
     $this->registeredBlocks=$this->getRegisteredBlocks(true);
 
+    if(!isset($this->registeredBlocks['mbAMM_randompict'])) $this->displayRandomImageBlock=false;
+
     foreach($blocks[0]->get_registered_blocks() as $key => $block)
     {

extensions/AMenuManager/amm_version.inc.php

@@ -15 +15 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('AMM_VERSION',  '3.1.2');
-  define('AMM_VERSION2', '03.01.02');
-  define('AMM_GPC_NEEDED', '3.5.0');
+  define('AMM_VERSION',  '3.1.3');
+  define('AMM_VERSION2', '03.01.03');
+  define('AMM_GPC_NEEDED', '3.5.1');
 ?>

extensions/AMenuManager/js/amm_randomPictPublic.js

@@ -1 +1 @@
 /**
- * randomPict
+ * randomPict v1.0.1
  *
- * release 1.0.0
+ * | release | date       |
+ * | 1.0.1   | 2011-05-24 | * mantis bug:2311
+ * |         |            |   . broken javascript if random pic set is empty 
+ * |         |            |
  */
 function randomPict(opt)
@@ -105 +108 @@
 $(document).ready(
   function ()
-  {
-    var rPict=new randomPict(randomPictOpt);
+  {    
+    var rPict;
+    if(typeof randomPictOpt!=='undefined')
+    {
+      rPict=new randomPict(randomPictOpt);
+    }
+    else
+    {
+      $('#mbAMM_randompict').remove();
+    }
   }
 );

extensions/AMenuManager/js/amm_randomPictPublic.min.js

@@ -1 @@
-/* file: amm_randomPictPublic.js - v1.0.0 | minified on 2011/01/31 with http://jscompress.com/ */
+/* file: amm_randomPictPublic.js - v1.0.1 | minified on 2011/05/24 with http://jscompress.com/ */
 function randomPict(opt)
 {var options={fixedHeight:0,pictures:[],showName:'n',showComment:'n',delay:0},properties={vIntervalID:0,vCurrentPict:0,nameDOM:'',commentDOM:'',img:new Image()},init=function(opt)
@@ -16 +16 @@
 {if(properties.nameDOM!='')$('#'+properties.nameDOM).html(options.pictures[properties.vCurrentPict].name);if(properties.commentDOM!='')$('#'+properties.commentDOM).html(options.pictures[properties.vCurrentPict].comment);$('#iammRPicLink').attr('href',options.pictures[properties.vCurrentPict].link);$('#iammRPicImg').attr('src',options.pictures[properties.vCurrentPict].thumb);computePositionTop();$('#iamm_ill0').fadeTo(200,1);});};init(opt);}
 $(document).ready(function()
-{var rPict=new randomPict(randomPictOpt);});
+{var rPict;if(typeof randomPictOpt!=='undefined'){rPict=new randomPict(randomPictOpt);}else{$('#mbAMM_randompict').remove();}});

extensions/AMenuManager/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Advanced Menu Manager
-Version: 3.1.2
+Version: 3.1.3
 Description: Gestion avancée du menu / Advanced management of menu
 Plugin URI: http://piwigo.org
@@ -191 +191 @@
 |         |            |
 | 3.1.2   | 2011/05/15 | * add sv_SE language
+|         |            |
+| 3.1.3   | 2011/05/24 | * mantis bug:2311
+|         |            |   . broken javascript if random pic set is empty 
+|         |            |
+|         |            | * mantis bug:2312
+|         |            |   . randomPictureJS is loaded even if menu is hidden 
 |         |            |
 |         |            |