Browse Source

Merge branch 'master' of github.com:2600hz/monster-ui-voip

4.3
Maxime Roux 11 years ago
parent
commit
6f154d4fac
1 changed files with 5 additions and 3 deletions
  1. +5
    -3
      submodules/users/users.js

+ 5
- 3
submodules/users/users.js View File

@ -206,7 +206,7 @@ define(function(require){
template.find('.user-rows').append(templateUser);
});
template.find('[data-toggle="tooltip"]').tooltip();
template.find('[data-toggle="tooltip"]').tooltip({ container: 'body'});
self.usersBindEvents(template, parent, dataTemplate);
@ -575,7 +575,9 @@ define(function(require){
//FancyCheckboxes.
monster.ui.prettyCheck.create(template);
row.find('.edit-user').append(template).slideDown();
row.find('.edit-user').append(template).slideDown(400, function() {
$('body').animate({ scrollTop: row.offset().top - (window.innerHeight - row.height() - 10) });
});
$('body').append($('<div id="users_container_overlay"></div>'));
});
@ -2569,7 +2571,7 @@ define(function(require){
timezone.populateDropdown(template.find('#user_timezone'), dataTemplate.timezone);
template.find('[data-toggle="tooltip"]').tooltip();
template.find('[data-toggle="tooltip"]').tooltip({ container: 'body'});
callbackAfterFormat && callbackAfterFormat(template, dataTemplate);
}


Loading…
Cancel
Save