From 2abc38e08ee2a027fec9fc32052c8a6e9b00a0bd Mon Sep 17 00:00:00 2001
From: Hadi Nategh
Date: Tue, 2 Sep 2014 09:33:07 +0000
Subject: [PATCH] Use url-email contact_plus attribute in mail index instead of
binding tooltip explicxitly on mail app
---
mail/js/app.js | 37 +-------------------------------
mail/templates/default/index.xet | 8 +++----
2 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/mail/js/app.js b/mail/js/app.js
index 15c2989f5f..f25b73053a 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -664,7 +664,7 @@ app.classes.mail = AppJS.extend(
for(var i = 0; i < content.length; i++)
{
var value = content[i];
- var email = et2_createWidget('url-email',{id:widget.id+'_'+i, value:value,readonly:true},widget);
+ var email = et2_createWidget('url-email',{id:widget.id+'_'+i, value:value,readonly:true, contact_plus:true},widget);
email.loadingFinished();
}
}
@@ -3825,38 +3825,3 @@ app.classes.mail = AppJS.extend(
};
}
});
-
-// Bind a mouseenter event once for every read-only email
-$j(function() {
- // If user doesn't have access to addressbook, stop
- if(!egw.app('addressbook')) return;
-
- $j('body').on('mouseenter', 'a[id^="mail-"].et2_email', function() {
- $j(this).tooltip({
- items: 'a.et2_email',
- position: {my:"left top", at:"left bottom", collision:"flipfit"},
- tooltipClass: "et2_email_popup",
- content: function() {
- // Here we could do all sorts of things
- var extra = {
- 'presets[email]': $j(this).text()
- };
- return $j(''+ egw.lang('Add a new contact') + '')
- .on('click', function() {
- egw.open('','addressbook','add',extra);
- });
- },
- close: function( event, ui ) {
- ui.tooltip.hover(
- function () {
- $j(this).stop(true).fadeTo(400, 1);
- //.fadeIn("slow"); // doesn't work because of stop()
- },
- function () {
- $j(this).fadeOut("400", function(){ $j(this).remove(); });
- }
- );
- }
- }).tooltip("open");
- });
-});
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 5ca8e82f11..8a336d1e6b 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -32,9 +32,9 @@
-
-
-
+
+
+
@@ -54,7 +54,7 @@