Changeset 11036


Ignore:
Timestamp:
May 24, 2011, 11:17:20 PM (10 years ago)
Author:
grum
Message:

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

Location:
extensions/AMenuManager
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/AMenuManager/amm_pip.class.inc.php

    r10247 r11036  
    7979        ($block=$menu->get_block('mbAMM_randompict'))!=null) and
    8080        ($user['nb_total_images']>0) and
    81         isset($this->config['amm_randompicture_title'][$user['language']])
     81        isset($this->config['amm_randompicture_title'][$user['language']]) and
     82        $this->displayRandomImageBlock
    8283      )
    8384    {
     
    352353    $this->registeredBlocks=$this->getRegisteredBlocks(true);
    353354
     355    if(!isset($this->registeredBlocks['mbAMM_randompict'])) $this->displayRandomImageBlock=false;
     356
    354357    foreach($blocks[0]->get_registered_blocks() as $key => $block)
    355358    {
  • extensions/AMenuManager/amm_version.inc.php

    r10883 r11036  
    1515  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
    1616
    17   define('AMM_VERSION',  '3.1.2');
    18   define('AMM_VERSION2', '03.01.02');
    19   define('AMM_GPC_NEEDED', '3.5.0');
     17  define('AMM_VERSION',  '3.1.3');
     18  define('AMM_VERSION2', '03.01.03');
     19  define('AMM_GPC_NEEDED', '3.5.1');
    2020?>
  • extensions/AMenuManager/js/amm_randomPictPublic.js

    r9002 r11036  
    11/**
    2  * randomPict
     2 * randomPict v1.0.1
    33 *
    4  * release 1.0.0
     4 * | release | date       |
     5 * | 1.0.1   | 2011-05-24 | * mantis bug:2311
     6 * |         |            |   . broken javascript if random pic set is empty
     7 * |         |            |
    58 */
    69function randomPict(opt)
     
    105108$(document).ready(
    106109  function ()
    107   {
    108     var rPict=new randomPict(randomPictOpt);
     110  {   
     111    var rPict;
     112    if(typeof randomPictOpt!=='undefined')
     113    {
     114      rPict=new randomPict(randomPictOpt);
     115    }
     116    else
     117    {
     118      $('#mbAMM_randompict').remove();
     119    }
    109120  }
    110121);
  • extensions/AMenuManager/js/amm_randomPictPublic.min.js

    r9002 r11036  
    1 /* file: amm_randomPictPublic.js - v1.0.0 | minified on 2011/01/31 with http://jscompress.com/ */
     1/* file: amm_randomPictPublic.js - v1.0.1 | minified on 2011/05/24 with http://jscompress.com/ */
    22function randomPict(opt)
    33{var options={fixedHeight:0,pictures:[],showName:'n',showComment:'n',delay:0},properties={vIntervalID:0,vCurrentPict:0,nameDOM:'',commentDOM:'',img:new Image()},init=function(opt)
     
    1616{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);}
    1717$(document).ready(function()
    18 {var rPict=new randomPict(randomPictOpt);});
     18{var rPict;if(typeof randomPictOpt!=='undefined'){rPict=new randomPict(randomPictOpt);}else{$('#mbAMM_randompict').remove();}});
  • extensions/AMenuManager/main.inc.php

    r10883 r11036  
    22/*
    33Plugin Name: Advanced Menu Manager
    4 Version: 3.1.2
     4Version: 3.1.3
    55Description: Gestion avancée du menu / Advanced management of menu
    66Plugin URI: http://piwigo.org
     
    191191|         |            |
    192192| 3.1.2   | 2011/05/15 | * add sv_SE language
     193|         |            |
     194| 3.1.3   | 2011/05/24 | * mantis bug:2311
     195|         |            |   . broken javascript if random pic set is empty
     196|         |            |
     197|         |            | * mantis bug:2312
     198|         |            |   . randomPictureJS is loaded even if menu is hidden
    193199|         |            |
    194200|         |            |
Note: See TracChangeset for help on using the changeset viewer.