Browse Source

UI-1382: Implement new way to call tooltips

4.3
Jean-Roch Maitre 11 years ago
parent
commit
adb670a138
7 changed files with 21 additions and 13 deletions
  1. +1
    -1
      submodules/callLogs/callLogs.js
  2. +1
    -1
      submodules/devices/devices.js
  3. +3
    -3
      submodules/groups/groups.js
  4. +1
    -1
      submodules/myOffice/myOffice.js
  5. +1
    -1
      submodules/strategy/strategy.js
  6. +13
    -5
      submodules/users/users.js
  7. +1
    -1
      submodules/vmboxes/vmboxes.js

+ 1
- 1
submodules/callLogs/callLogs.js View File

@ -72,7 +72,7 @@ define(function(require){
nextStartKey: nextStartKey
});
template.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(template);
parent
.empty()


+ 1
- 1
submodules/devices/devices.js View File

@ -353,7 +353,7 @@ define(function(require){
monster.ui.tabs(templateDevice);
monster.ui.protectField(templateDevice.find('#sip_password'), templateDevice);
templateDevice.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(templateDevice);
templateDevice.find('#mac_address').mask("hh:hh:hh:hh:hh:hh", { placeholder:" " });
templateDevice.find('.chosen-feature-key-user').chosen({ search_contains: true, width: 'inherit' });


+ 3
- 3
submodules/groups/groups.js View File

@ -209,7 +209,7 @@ define(function(require){
});
self.groupsGetTemplate(type, groupId, function(template, data) {
template.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(template);
row.find('.edit-groups').append(template).slideDown();
@ -1031,7 +1031,7 @@ define(function(require){
extraSpareNumbers = _.without(extraSpareNumbers, val.phoneNumber);
});
template.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(template);
if(remainingQuantity === 0) {
template.find('.spare-link').addClass('disabled');
@ -1057,7 +1057,7 @@ define(function(require){
var rowTemplate = monster.template(self, 'groups-numbersItemRow', { number: number });
rowTemplate.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(rowTemplate);
template.find('.list-unassigned-items .empty-row').hide();
template.find('.list-unassigned-items').append(rowTemplate);


+ 1
- 1
submodules/myOffice/myOffice.js View File

@ -560,7 +560,7 @@ define(function(require){
monster.ui.alert(self.i18n.active().myOffice.missingMainNumberForCallerId);
});
template.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(template);
},
myOfficeRenderMusicOnHoldPopup: function(args) {


+ 1
- 1
submodules/strategy/strategy.js View File

@ -298,7 +298,7 @@ define(function(require){
},
template = $(monster.template(self, 'strategy-'+templateName, templateData));
template.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(template);
container.find('.element-content').empty()
.append(template);


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

@ -48,7 +48,11 @@ define(function(require){
template.find('.user-rows').append(templateUser);
});
template.find('[data-toggle="tooltip"]').tooltip({ container: 'body'});
monster.ui.tooltips(template, {
options: {
container: 'body'
}
});
template.find('[data-toggle="popover"]').popover({ container: 'body'});
self.usersBindEvents(template, parent, dataTemplate);
@ -438,7 +442,7 @@ define(function(require){
currentCallflow = data.callflow;
currentUser = data.user;
template.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(template);
_.each(data.extensions, function(number) {
extensionsToSave.push(number);
@ -966,7 +970,7 @@ define(function(require){
extraSpareNumbers = _.without(extraSpareNumbers, val.phoneNumber);
});
template.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(template);
if(remainingQuantity == 0) {
template.find('.spare-link').addClass('disabled');
@ -990,7 +994,7 @@ define(function(require){
var rowTemplate = monster.template(self, 'users-numbersItemRow', { number: number });
rowTemplate.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(rowTemplate);
template.find('.list-unassigned-items .empty-row').hide();
template.find('.list-unassigned-items').append(rowTemplate);
@ -2471,7 +2475,11 @@ define(function(require){
timezone.populateDropdown(template.find('#user_timezone'), dataTemplate.timezone);
template.find('[data-toggle="tooltip"]').tooltip({ container: 'body'});
monster.ui.tooltips(template, {
options: {
container: 'body'
}
});
callbackAfterFormat && callbackAfterFormat(template, dataTemplate);
}


+ 1
- 1
submodules/vmboxes/vmboxes.js View File

@ -158,7 +158,7 @@ define(function(require){
timezone.populateDropdown(templateVMBox.find('#timezone'), data.timezone);
templateVMBox.find('#timezone').chosen({search_contains: true, width: "40%"});
templateVMBox.find('[data-toggle="tooltip"]').tooltip();
monster.ui.tooltips(templateVMBox);
templateVMBox.find('.actions .save').on('click', function() {
if(monster.ui.valid(vmboxForm)) {


Loading…
Cancel
Save