Browse Source

Use hoverIntent for actions.

pull/119/head
Evan Theurer 12 years ago
parent
commit
74dd5ca590
  1. 3
      src/styles/components/_buddycondensed.scss
  2. 26
      static/js/directives/buddycondensed.js

3
src/styles/components/_buddycondensed.scss

@ -84,8 +84,5 @@
.buddyPicture { .buddyPicture {
cursor: pointer; cursor: pointer;
overflow: visible; overflow: visible;
&:hover .actions {
display: inline-block;
}
} }
} }

26
static/js/directives/buddycondensed.js

@ -141,8 +141,8 @@ define(['angular', 'jquery', 'text!partials/buddycondensed.html', 'hoverIntent']
var desc = elem.find(".desc"); var desc = elem.find(".desc");
var aboveElem1 = false; var aboveElem1 = false;
var aboveElem2 = false; var aboveElem2 = false;
var out = function(event) { var outMoreBuddy = function(event) {
console.log('out', event.currentTarget.className); //console.log('out', event.currentTarget.className);
if (event.currentTarget === desc.get(0)) { if (event.currentTarget === desc.get(0)) {
aboveElem1 = false; aboveElem1 = false;
} else if (event.currentTarget === overDefaultDisplayNum.get(0)) { } else if (event.currentTarget === overDefaultDisplayNum.get(0)) {
@ -152,8 +152,8 @@ define(['angular', 'jquery', 'text!partials/buddycondensed.html', 'hoverIntent']
overDefaultDisplayNum.hide(); overDefaultDisplayNum.hide();
} }
}; };
var over = function(event) { var overMoreBuddy = function(event) {
console.log('out', event.currentTarget.className); //console.log('out', event.currentTarget.className);
if (event.currentTarget === desc.get(0)) { if (event.currentTarget === desc.get(0)) {
aboveElem1 = true; aboveElem1 = true;
} else if (event.currentTarget === overDefaultDisplayNum.get(0)) { } else if (event.currentTarget === overDefaultDisplayNum.get(0)) {
@ -162,11 +162,25 @@ define(['angular', 'jquery', 'text!partials/buddycondensed.html', 'hoverIntent']
overDefaultDisplayNum.show(); overDefaultDisplayNum.show();
}; };
elem.hoverIntent({ elem.hoverIntent({
over: over, over: overMoreBuddy,
out: out, out: outMoreBuddy,
timeout: 1000, timeout: 1000,
selector: '.desc, .overDefaultDisplayNum' selector: '.desc, .overDefaultDisplayNum'
}); });
var overBuddyPicture = function(event) {
//console.log('overBuddyPicture', event.currentTarget.className);
$(event.currentTarget).find(".actions").css("display", "inline-block");
};
var outBuddyPicture = function(event) {
//console.log('outBuddyPicture', event.currentTarget.className);
$(event.currentTarget).find(".actions").css("display", "none");
};
elem.hoverIntent({
over: overBuddyPicture,
out: outBuddyPicture,
timeout: 100,
selector: '.buddyPicture'
});
}; };
return { return {

Loading…
Cancel
Save