[Phpmyadmin-devel] initTooltips rename
marc at infomarc.info
Thu Jul 21 19:18:11 CEST 2011
Le 2011-07-21 13:03, Tyron Madlener a écrit :
> On Thu, Jul 21, 2011 at 6:18 PM, Marc Delisle<marc at infomarc.info> wrote:
>> Le 2011-07-21 11:01, Marc Delisle a écrit :
>>>>> P.S. I suggest renaming initToolTips() to a better name like
>>>> initToolTips() was used on the status page, so that broke the status
>>>> page on the master demo for now. I have already patched it in my repo.
>>> Sorry, I had thought about it but afterwards forgot. I'll cherry-pick
>>> your patch and apply it to origin/master.
>> The cherry-pick failed with conflicts between your tree and the origin.
>> The file js/server_status.js has different modifications.
> Yea I thought so. We can wait until next time Michal merges my repo.
> That or just replace initTooltips with PMA_convertFootnotesToTooltips.
> It only appears a single time in server_status.js at the beginning
> I can merge back with master afterwards to avoid merge conflicts.
More information about the Developers