@@ -401,7 +401,7 @@ contacts.requestedRemoveContact = function(event) {
contacts.requestedRenameContact = function(event, useNickAsPreset) {
var xulPopup = $('#contact-popup');
- var xulContact = this._hoveredContact;
+ var xulContact = document.popupNode;
xulPopup.hidePopup();
@@ -607,7 +607,7 @@ contacts.showingContactPopup = function(xulPopup) {
// For some reason, document.popupNode isn't available when popup
// was opened through openPopup()
- var xulContact = this._hoveredContact;
+ var xulContact = $(document.popupNode, '^ .contact');
$(xulPopup, '.name').setAttribute('value', $(xulContact, '.name').getAttribute('value'));
$(xulPopup, '.status-message').textContent = $(xulContact, '.status-message').getAttribute('value');
@@ -682,49 +682,6 @@ contacts.showingContactPopup = function(xulPopup) {
retrieveVCardTask.start();
};
-// hoveredContact, unhoveredContact, hoveredContactPopup,
-// unhoveredContactPopup handle interaction between contacts and their
-// "More info" popups. Desired behaviour is:
-//
-// - if mouse stays on contact for longer than one second, bring up
-// popup;
-//
-// - if mouse leaves contact for longer than one second and doesn't
-// enter popup, hide popup;
-//
-// - if mouse enters popup and then leaves it for longer than one
-// second, hide popup.
-
-contacts.hoveredContact = function(event) {
- var xulContact = event.currentTarget;
-
- this._showPopupTimeout = window.setTimeout(function() {
- contacts._hoveredContact = xulContact;
- $('#contact-popup').openPopup(xulContact, 'end_before', -80, -20, false, false);
- }, 1000);
-};
-
-contacts.unhoveredContact = function(event) {
- if(this._showPopupTimeout)
- window.clearTimeout(this._showPopupTimeout);
-
- if($('#contact-popup').state == 'open')
- this._hidePopupTimeout = window.setTimeout(function() {
- $('#contact-popup').hidePopup();
- }, 1000);
-};
-
-contacts.hoveredContactPopup = function(xulPopup) {
- if(this._hidePopupTimeout)
- window.clearTimeout(this._hidePopupTimeout);
-};
-
-contacts.unhoveredContactPopup = function(xulPopup) {
- this._hidePopupTimeout = window.setTimeout(function() {
- xulPopup.hidePopup();
- }, 1000);
-};
-
// INTERNALS
// ----------------------------------------------------------------------
chrome/content/dashboard/widget_contacts.js
@@ -39,13 +39,12 @@
<popupset id="popups">
<panel id="contact-popup"
onpopupshowing="contacts.showingContactPopup(this);"
- onpopuphiding="contacts.hidingContactPopup(this);"
- onmouseover="if(!eventFromDescendant(this, event)) contacts.hoveredContactPopup(this);"
- onmouseout="if(!eventFromDescendant(this, event)) contacts.unhoveredContactPopup(this);">
+ onpopuphiding="contacts.hidingContactPopup(this);">
+
<vbox class="contact" account="" address="">
<hbox align="baseline">
<label value="Chat »" class="text-link" style="font-size: 17px;"
- onclick="this.blur(); contacts.clickedContact(this);"/>
+ onclick="this.blur(); contacts.clickedContact(document.popupNode);"/>
<label value="Video »" class="text-link" style="font-size: 14px;" hidden="true"/>
<label value="Share files »" class="text-link" style="font-size: 14px;" hidden="true"/>
</hbox>
@@ -140,8 +139,6 @@
<box id="blueprints">
<richlistitem class="contact"
- onmouseover="if(!eventFromDescendant(this, event)) contacts.hoveredContact(event);"
- onmouseout="if(!eventFromDescendant(this, event)) contacts.unhoveredContact(event);"
availability="unavailable"
address=""
account=""
@@ -154,7 +151,10 @@
flex="1"
onclick="contacts.clickedContact(this);"/>
<spacer flex="100"/>
+
<image class="avatar" src="" width="16" height="16"/>
+
+ <button class="options" type="menu" menu="contact-popup"/>
</hbox>
<label class="status-message"
chrome/content/dashboard/widget_contacts.xul
@@ -85,4 +85,21 @@
#widget-contacts .list > richlistitem[selected="true"] {
background: inherit;
color: inherit;
-}
\ No newline at end of file
+}
+
+.contact .options {
+ margin: 0;
+ padding: 0;
+ -moz-appearance: none;
+ border: none;
+ min-width: 0;
+ max-width: 0;
+ background: transparent;
+ -moz-border-radius: 3px;
+ background: #ddeeff;
+ opacity: 0.1;
+}
+
+.contact:hover .options {
+ opacity: 0.8;
+}
chrome/skin/classic/dashboard/widget_contacts.css
18023306a267d1f6b90b48803c4a2b61e2d8608a
Massimiliano Mirra
bard@hyperstruct.net
http://github.com/bard/sameplace/commit/1fe4f5ad463e7ac1eb6b94be9e546269407d647a
1fe4f5ad463e7ac1eb6b94be9e546269407d647a
2009-04-25T22:42:53-07:00
2009-04-25T22:42:53-07:00
Contacts widget: showing contact popup on click on button instead of mouse hover.
c44c695bf4dcb4061dcaaff36ad7e1fb7ced63f9
Massimiliano Mirra
bard@hyperstruct.net