ruhnet
/
monster-ui-voip
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

UI-3119: Use monster toast helper instead of Toastr directly (#74)

4.3
Joris Tirado 7 years ago
committed by GitHub
parent
377bfceefb
commit
d6e7fb565d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 227 additions and 121 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +18
    -10
      submodules/devices/devices.js
  2. +36
    -22
      submodules/groups/groups.js
  3. +66
    -22
      submodules/strategy/strategy.js
  4. +98
    -60
      submodules/users/users.js
  5. +9
    -7
      submodules/vmboxes/vmboxes.js

+ 18
- 10
submodules/devices/devices.js View File

@ -1,8 +1,7 @@
define(function(require) {
var $ = require('jquery'),
_ = require('lodash'),
monster = require('monster'),
toastr = require('toastr');
monster = require('monster');
var app = {
@ -459,14 +458,20 @@ define(function(require) {
templateDevice.find('#restart_device').on('click', function() {
if (!$(this).hasClass('disabled')) {
self.devicesRestart(data.id, function() {
toastr.success(self.i18n.active().devices.popupSettings.miscellaneous.restart.success);
monster.ui.toast({
type: 'success',
message: self.i18n.active().devices.popupSettings.miscellaneous.restart.success
});
});
}
});
templateDevice.find('#unlock_device').on('click', function() {
self.devicesUnlock(data.mac_address.replace(/:/g, ''), function() {
toastr.success(self.i18n.active().devices.popupSettings.miscellaneous.unlock.success);
monster.ui.toast({
type: 'success',
message: self.i18n.active().devices.popupSettings.miscellaneous.unlock.success
});
});
});
@ -494,12 +499,15 @@ define(function(require) {
self.devicesDeleteDevice(deviceId, function(device) {
popup.dialog('close').remove();
toastr.success(self.getTemplate({
name: '!' + self.i18n.active().devices.deletedDevice,
data: {
deviceName: device.name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + self.i18n.active().devices.deletedDevice,
data: {
deviceName: device.name
}
})
});
callbackDelete && callbackDelete(device);
});


+ 36
- 22
submodules/groups/groups.js View File

@ -1,8 +1,7 @@
define(function(require) {
var $ = require('jquery'),
_ = require('lodash'),
monster = require('monster'),
toastr = require('toastr');
monster = require('monster');
var app = {
@ -1064,12 +1063,15 @@ define(function(require) {
template.find('.delete-group').on('click', function() {
monster.ui.confirm(self.i18n.active().groups.confirmDeleteGroup, function() {
self.groupsDelete(data.group.id, function(data) {
toastr.success(self.getTemplate({
name: '!' + self.i18n.active().groups.groupDeleted,
data: {
name: data.group.name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + self.i18n.active().groups.groupDeleted,
data: {
name: data.group.name
}
})
});
self.groupsRender();
});
@ -1249,12 +1251,15 @@ define(function(require) {
});
self.groupsUpdateNumbers(callflowId, dataNumbers, function(callflowData) {
toastr.success(self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
})
});
self.groupsRender({ groupId: callflowData.group_id });
});
});
@ -1281,12 +1286,15 @@ define(function(require) {
});
self.groupsUpdateExtensions(callflowId, extensionsToSave, function(callflowData) {
toastr.success(self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
})
});
self.groupsRender({ groupId: callflowData.group_id });
});
});
@ -1951,7 +1959,10 @@ define(function(require) {
} else {
callbackError && callbackError(data);
toastr.error(self.i18n.active().groups.ringGroupMissing);
monster.ui.toast({
type: 'error',
message: self.i18n.active().groups.ringGroupMissing
});
}
},
error: function(data) {
@ -1981,7 +1992,10 @@ define(function(require) {
} else {
callbackError && callbackError(data);
toastr.error(self.i18n.active().groups.ringGroupMissing);
monster.ui.toast({
type: 'error',
message: self.i18n.active().groups.ringGroupMissing
});
}
},
error: function(data) {


+ 66
- 22
submodules/strategy/strategy.js View File

@ -2,8 +2,7 @@ define(function(require) {
var $ = require('jquery'),
_ = require('lodash'),
monster = require('monster'),
timezone = require('monster-timezone'),
toastr = require('toastr');
timezone = require('monster-timezone');
var app = {
@ -363,12 +362,15 @@ define(function(require) {
popup.dialog('close');
} else {
self.strategyChangeEmergencyCallerId(number, function() {
toastr.success(self.getTemplate({
name: '!' + self.i18n.active().startegy.updateE911Dialog.success,
data: {
number: monster.util.formatPhoneNumber(number)
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + self.i18n.active().startegy.updateE911Dialog.success,
data: {
number: monster.util.formatPhoneNumber(number)
}
})
});
popup.dialog('close');
});
}
@ -938,10 +940,16 @@ define(function(require) {
callbacks: {
success: function(numbers) {
addNumbersToMainCallflow(_.keys(numbers));
toastr.success(self.i18n.active().strategy.toastrMessages.buyNumbersSuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.buyNumbersSuccess
});
},
error: function(error) {
toastr.error(self.i18n.active().strategy.toastrMessages.buyNumbersError);
monster.ui.toast({
type: 'error',
message: self.i18n.active().strategy.toastrMessages.buyNumbersError
});
}
}
});
@ -978,7 +986,10 @@ define(function(require) {
self.strategyUpdateCallflow(strategyData.callflows.MainCallflow, function(updatedCallflow) {
var parentContainer = container.parents('.element-container');
toastr.success(self.i18n.active().strategy.toastrMessages.removeNumberSuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.removeNumberSuccess
});
strategyData.callflows.MainCallflow = updatedCallflow;
refreshNumbersHeader(parentContainer);
self.strategyRefreshTemplate(parentContainer, strategyData);
@ -1221,10 +1232,16 @@ define(function(require) {
callbacks: {
success: function(numbers) {
addNumbersToMainConference(_.keys(numbers));
toastr.success(self.i18n.active().strategy.toastrMessages.buyNumbersSuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.buyNumbersSuccess
});
},
error: function(error) {
toastr.error(self.i18n.active().strategy.toastrMessages.buyNumbersError);
monster.ui.toast({
type: 'error',
message: self.i18n.active().strategy.toastrMessages.buyNumbersError
});
}
}
});
@ -1244,7 +1261,10 @@ define(function(require) {
self.strategyUpdateCallflow(strategyData.callflows.MainConference, function(updatedCallflow) {
var parentContainer = container.parents('.element-container');
toastr.success(self.i18n.active().strategy.toastrMessages.removeNumberSuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.removeNumberSuccess
});
strategyData.callflows.MainConference = updatedCallflow;
refreshConfNumHeader(parentContainer);
self.strategyRefreshTemplate(parentContainer, strategyData);
@ -1476,7 +1496,10 @@ define(function(require) {
}
], function(err, results) {
if (!err) {
toastr.success('Main Fabox Email Successfully Changed');
monster.ui.toast({
type: 'success',
message: 'Main Fabox Email Successfully Changed'
});
}
});
});
@ -1489,10 +1512,16 @@ define(function(require) {
callbacks: {
success: function(numbers) {
addNumbersToMainFaxing(_.keys(numbers));
toastr.success(self.i18n.active().strategy.toastrMessages.buyNumbersSuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.buyNumbersSuccess
});
},
error: function(error) {
toastr.error(self.i18n.active().strategy.toastrMessages.buyNumbersError);
monster.ui.toast({
type: 'error',
message: self.i18n.active().strategy.toastrMessages.buyNumbersError
});
}
}
});
@ -1517,7 +1546,10 @@ define(function(require) {
delete mainFaxing.flow.data.id;
self.strategyUpdateCallflow(mainFaxing, function(updatedCallflow) {
var parentContainer = container.parents('.element-container');
toastr.success(self.i18n.active().strategy.toastrMessages.removeNumberSuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.removeNumberSuccess
});
strategyData.callflows.MainFaxing = updatedCallflow;
refreshFaxingNumHeader(parentContainer);
self.strategyRefreshTemplate(parentContainer, strategyData);
@ -1768,7 +1800,10 @@ define(function(require) {
strategyData.callflows.MainCallflow = updatedCallflow;
parent.find('.element-content').hide();
parent.removeClass('open');
toastr.success(self.i18n.active().strategy.toastrMessages.updateHolidaySuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.updateHolidaySuccess
});
});
});
}
@ -1797,7 +1832,10 @@ define(function(require) {
strategyData.callflows.MainCallflow = updatedCallflow;
parent.find('.element-content').hide();
parent.removeClass('open');
toastr.success(self.i18n.active().strategy.toastrMessages.updateHolidaySuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.updateHolidaySuccess
});
});
});
});
@ -2324,7 +2362,10 @@ define(function(require) {
monster.parallel(parallelRequests, function(err, results) {
container.hide();
container.parents('.element-container').removeClass('open');
toastr.success(self.i18n.active().strategy.toastrMessages.updateCallSuccess);
monster.ui.toast({
type: 'success',
message: self.i18n.active().strategy.toastrMessages.updateCallSuccess
});
});
}
});
@ -2470,7 +2511,10 @@ define(function(require) {
error: function(data, status, globalHandler) {
if (data && data.error === '404') {
showPopup();
toastr.warning(self.i18n.active().strategy.greetingMissing);
monster.ui.toast({
type: 'warning',
message: self.i18n.active().strategy.greetingMissing
});
} else {
globalHandler(data, { generateError: true });
}


+ 98
- 60
submodules/users/users.js View File

@ -2,8 +2,7 @@ define(function(require) {
var $ = require('jquery'),
_ = require('lodash'),
monster = require('monster'),
timezone = require('monster-timezone'),
toastr = require('toastr');
timezone = require('monster-timezone');
var app = {
@ -807,12 +806,15 @@ define(function(require) {
if (numbers.length > 0) {
var updateCallflow = function() {
self.usersUpdateCallflowNumbers(userId, (currentCallflow || {}).id, numbers, function(callflowData) {
toastr.success(self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
})
});
self.usersRender({ userId: callflowData.owner_id });
});
@ -899,12 +901,15 @@ define(function(require) {
var dataUser = $(this).parents('.grid-row').data();
self.usersDeleteDialog(dataUser, function(data) {
toastr.success(self.getTemplate({
name: '!' + self.i18n.active().users.toastrMessages.userDelete,
data: {
name: data.first_name + ' ' + data.last_name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + self.i18n.active().users.toastrMessages.userDelete,
data: {
name: data.first_name + ' ' + data.last_name
}
})
});
self.usersRender();
});
});
@ -1007,12 +1012,15 @@ define(function(require) {
}
}
}, function(error, results) {
toastr.success(self.getTemplate({
name: '!' + toastrMessages.userUpdated,
data: {
name: results.user.first_name + ' ' + results.user.last_name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.userUpdated,
data: {
name: results.user.first_name + ' ' + results.user.last_name
}
})
});
self.usersRender({ userId: results.user.id });
});
@ -1047,12 +1055,15 @@ define(function(require) {
self.usersUpdateVMBox(vmboxData, function(data) {
popup.dialog('close').remove();
toastr.success(self.getTemplate({
name: '!' + toastrMessages.pinUpdated,
data: {
name: currentUser.first_name + ' ' + currentUser.last_name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.pinUpdated,
data: {
name: currentUser.first_name + ' ' + currentUser.last_name
}
})
});
});
}
});
@ -1101,12 +1112,15 @@ define(function(require) {
self.usersResetPassword(dataReset, function() {
popup.dialog('close').remove();
toastr.success(self.getTemplate({
name: '!' + toastrMessages.successResetPassword,
data: {
name: dataReset.username
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.successResetPassword,
data: {
name: dataReset.username
}
})
});
});
});
@ -1134,12 +1148,15 @@ define(function(require) {
popup.dialog('close').remove();
toastr.success(self.getTemplate({
name: '!' + toastrMessages.userUpdated,
data: {
name: userData.data.first_name + ' ' + userData.data.last_name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.userUpdated,
data: {
name: userData.data.first_name + ' ' + userData.data.last_name
}
})
});
});
}
});
@ -1177,12 +1194,15 @@ define(function(require) {
currentUser.extra.licensedRole = planId;
self.usersUpdateUser(currentUser, function(userData) {
toastr.success(self.getTemplate({
name: '!' + toastrMessages.userUpdated,
data: {
name: userData.data.first_name + ' ' + userData.data.last_name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.userUpdated,
data: {
name: userData.data.first_name + ' ' + userData.data.last_name
}
})
});
self.usersRender({ userId: userData.data.id });
});
});
@ -1256,12 +1276,15 @@ define(function(require) {
dataDevices.oldDevices = _.keys(unassignedDevices);
self.usersUpdateDevices(dataDevices, userId, function() {
toastr.success(self.getTemplate({
name: '!' + toastrMessages.devicesUpdated,
data: {
name: name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.devicesUpdated,
data: {
name: name
}
})
});
self.usersRender({ userId: userId });
});
});
@ -1437,12 +1460,15 @@ define(function(require) {
if (dataNumbers.length > 0) {
self.usersUpdateCallflowNumbers(userId, (currentCallflow || {}).id, dataNumbers, function(callflowData) {
var afterUpdate = function() {
toastr.success(self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + toastrMessages.numbersUpdated,
data: {
name: name
}
})
});
self.usersRender({ userId: callflowData.owner_id });
};
@ -1456,7 +1482,10 @@ define(function(require) {
self.usersUpdateUser(currentUser, function() {
afterUpdate();
toastr.info(toastrMessages.callerIDDeleted);
monster.ui.toast({
type: 'info',
message: toastrMessages.callerIDDeleted
});
});
} else {
afterUpdate();
@ -4019,7 +4048,10 @@ define(function(require) {
});
if (indexMain === -1) {
//toastr.error(self.i18n.active().users.noUserCallflow);
// monster.ui.toast({
// type: 'error',
// message: self.i18n.active().users.noUserCallflow
// });
callback(null);
} else {
self.callApi({
@ -4713,11 +4745,17 @@ define(function(require) {
callback && callback(data);
});
} else {
toastr.error(self.i18n.active().users.needExtensionFirst);
monster.ui.toast({
type: 'error',
message: self.i18n.active().users.needExtensionFirst
});
}
}
} else {
toastr.error(self.i18n.active().users.noNumberCallflow);
monster.ui.toast({
type: 'error',
message: self.i18n.active().users.noNumberCallflow
});
}
},


+ 9
- 7
submodules/vmboxes/vmboxes.js View File

@ -2,7 +2,6 @@ define(function(require) {
var $ = require('jquery'),
_ = require('lodash'),
monster = require('monster'),
toastr = require('toastr'),
timezone = require('monster-timezone');
var app = {
@ -226,12 +225,15 @@ define(function(require) {
monster.ui.confirm(self.i18n.active().vmboxes.confirmDeleteVmbox, function() {
self.vmboxesDeleteVmbox(voicemailId, function(vmbox) {
toastr.succes(self.getTemplate({
name: '!' + self.i18n.active().vmboxes.deletedVmbox,
data: {
vmboxName: vmbox.name
}
}));
monster.ui.toast({
type: 'success',
message: self.getTemplate({
name: '!' + self.i18n.active().vmboxes.deletedVmbox,
data: {
vmboxName: vmbox.name
}
})
});
callbacks.afterDelete && callbacks.afterDelete(vmbox);
});


Write Preview
Loading…
Cancel
Save