wilde: server/patches/horde-webmail/1.2.0/merges t_dimp_H_BL_CloseContextMenu.diff, NONE, 1.1.4.1 series, 1.1.2.3, 1.1.2.4

[cvs at kolab.org]

Author: wilde

Update of /kolabrepository/server/patches/horde-webmail/1.2.0/merges
In directory doto:/tmp/cvs-serv801/patches/horde-webmail/1.2.0/merges

Modified Files:
      Tag: kolab_2_2_branch
	series 
Added Files:
      Tag: kolab_2_2_branch
	t_dimp_H_BL_CloseContextMenu.diff 
Log Message:
Fix to close context menu in dimp on outside clicks. (Merged from suc branch)

--- NEW FILE: t_dimp_H_BL_CloseContextMenu.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/dimp/H/BL/CloseContextMenu

Close the context menu when clicking into the Dimp menu.

Provided by Boris Lorbeer <B.Lorbeer at science-computing.de>

Signed-off-by: Gunnar Wrobel <p at rdus.de>

---
 horde-webmail/dimp/config/menu.php |    2 +-
 horde-webmail/dimp/js/DimpBase.js  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
index b5e0a5c..a079da6 100644
--- a/horde-webmail/dimp/config/menu.php
+++ b/horde-webmail/dimp/config/menu.php
@@ -31,7 +31,7 @@
 
 $site_menu = array(
     'folders' => array(
-        'action' => 'DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
+        'action' => 'DimpCore.DMenu.close(); DimpBase.go("app:horde", "' . Horde::url($GLOBALS['registry']->get('webroot', 'imp') . '/folders.php', true) . '")',
         'text' => _('Folder Subscription'),
         'icon' => $GLOBALS['registry']->getImageDir('horde') . '/prefs.png'),
 );
diff --git a/horde-webmail/dimp/js/DimpBase.js b/horde-webmail/dimp/js/DimpBase.js
index c4eb9f4..d90f09b 100644
--- a/horde-webmail/dimp/js/DimpBase.js
+++ b/horde-webmail/dimp/js/DimpBase.js
@@ -1507,6 +1507,7 @@ var DimpBase = {
 
                 case 'folder':
                 case 'special':
+                    DimpCore.DMenu.close();
                     e.stop();
                     return this.go('folder:' + li.readAttribute('mbox'));
                     break;
@@ -1903,7 +1904,7 @@ var DimpBase = {
         tmp = $('applicationfolders');
         if (tmp) {
             tmp.select('ul li.custom a').each(function(s) {
-                C({ d: s, f: this.go.bind(this, 'app:' + s.readAttribute('app')) });
+                C({ d: s, f: function(data){DimpCore.DMenu.close(); this.go('app:' + s.readAttribute('app'), data)}.bind(this) });
             }, this);
         }
 
-- 
tg: (19ee6e6..) t/dimp/H/BL/CloseContextMenu (depends on: t/kronolith/HK/GW/AnonymousiCalDownload)
-- 
TOPGIT patch commit log
=======================

commit b4b3190a4fb88e1843ff86adde4897dea21046db
Author: Gunnar Wrobel <p at rdus.de>
Date:   Mon Jul 20 09:39:24 2009 +0200

    Close the context menu when clicking into the Dimp menu.

Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/merges/Attic/series,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- series	14 May 2009 16:22:39 -0000	1.1.2.3
+++ series	15 Oct 2009 15:15:04 -0000	1.1.2.4
@@ -2,3 +2,4 @@
 issue3329.patch
 t_dimp_H_GW_AclView.diff
 t_dimp_H_GW_FoldersView.diff
+t_dimp_H_BL_CloseContextMenu.diff