Skip to content

Commit

Permalink
"twipsy" is now "tooltip", "position" must be "placement" and "select…
Browse files Browse the repository at this point in the history
…" is not a valid trigger

- should fix a few cukes...
  • Loading branch information
Raven24 committed Apr 15, 2012
1 parent 4e030c3 commit d328cda
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/pages/contacts-index.js
Expand Up @@ -3,7 +3,7 @@ Diaspora.Pages.ContactsIndex = function() {


this.subscribe("page/ready", function(evt, document) { this.subscribe("page/ready", function(evt, document) {
self.infiniteScroll = self.instantiate("InfiniteScroll"); self.infiniteScroll = self.instantiate("InfiniteScroll");
$('.conversation_button').twipsy({position: 'bottom'}); $('.conversation_button').tooltip({placement: 'bottom'});
}); });


}; };
2 changes: 1 addition & 1 deletion app/assets/javascripts/pages/invitations-edit.js
Expand Up @@ -3,6 +3,6 @@ Diaspora.Pages.InvitationsEdit = function() {


this.subscribe("page/ready", function(evt, body) { this.subscribe("page/ready", function(evt, body) {
jQuery.ajaxSetup({'cache': true}); jQuery.ajaxSetup({'cache': true});
$('#user_username').twipsy({trigger: 'select', placement: 'right'}); $('#user_username').tooltip({trigger: 'focus', placement: 'right'});
}); });
}; };
2 changes: 1 addition & 1 deletion app/assets/javascripts/pages/invitations-new.js
Expand Up @@ -5,7 +5,7 @@ Diaspora.Pages.InvitationsNew = function() {
var rtl = $('html').attr('dir') == 'rtl', var rtl = $('html').attr('dir') == 'rtl',
position = rtl ? 'left' : 'right'; position = rtl ? 'left' : 'right';


$('#new_user [title]').twipsy({trigger: 'focus', placement: position}); $('#new_user [title]').tooltip({trigger: 'focus', placement: position});
$('#user_email').focus(); $('#user_email').focus();
}); });
}; };
Expand Down

0 comments on commit d328cda

Please sign in to comment.