Browse Source

OOB: Use underscore.js helpers to get list/count of keys for an object

4.3
Joris Tirado 9 years ago
parent
commit
c7c1bd130a
3 changed files with 7 additions and 7 deletions
  1. +1
    -1
      submodules/groups/groups.js
  2. +4
    -4
      submodules/strategy/strategy.js
  3. +2
    -2
      submodules/users/users.js

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

@ -35,7 +35,7 @@ define(function(require){
monster.ui.alert('error', self.i18n.active().groups.outdatedGroupsError);
} else {
var dataTemplate = self.groupsFormatListData(data),
template = $(monster.template(self, 'groups-layout', { countGroups: Object.keys(dataTemplate.groups).length })),
template = $(monster.template(self, 'groups-layout', { countGroups: _.size(dataTemplate.groups) })),
templateGroup;
_.each(dataTemplate.groups, function(group) {


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

@ -754,7 +754,7 @@ define(function(require){
searchType: $(this).data('type'),
callbacks: {
success: function(numbers) {
addNumbersToMainCallflow(Object.keys(numbers));
addNumbersToMainCallflow(_.keys(numbers));
toastr.success(self.i18n.active().strategy.toastrMessages.buyNumbersSuccess);
},
error: function(error) {
@ -1097,7 +1097,7 @@ define(function(require){
searchType: $(this).data('type'),
callbacks: {
success: function(numbers) {
addNumbersToMainConference(Object.keys(numbers));
addNumbersToMainConference(_.keys(numbers));
toastr.success(self.i18n.active().strategy.toastrMessages.buyNumbersSuccess);
},
error: function(error) {
@ -1236,7 +1236,7 @@ define(function(require){
singleSelect: true,
callbacks: {
success: function(numbers) {
addNumbersToMainFaxing(Object.keys(numbers));
addNumbersToMainFaxing(_.keys(numbers));
toastr.success(self.i18n.active().strategy.toastrMessages.buyNumbersSuccess);
},
error: function(error) {
@ -1826,7 +1826,7 @@ define(function(require){
type = $this.data('type'),
holidayRule = {};
if(!name || Object.keys(rules).indexOf(name) >= 0) {
if(!name || _.keys(rules).indexOf(name) >= 0) {
holidayRule = false;
}
else if(toMonth && month !== toMonth) {


+ 2
- 2
submodules/users/users.js View File

@ -1012,7 +1012,7 @@ define(function(require){
template.find('.detail-devices .list-assigned-items .item-row:not(.assigned)').each(function(k, row) {
dataDevices.new.push($(row).data('id'));
});
dataDevices.old = Object.keys(unassignedDevices);
dataDevices.old = _.keys(unassignedDevices);
self.usersUpdateDevices(dataDevices, userId, function() {
toastr.success(monster.template(self, '!' + toastrMessages.devicesUpdated, { name: name }));
@ -1683,7 +1683,7 @@ define(function(require){
globalAddNumberCallback: function (number, addNumberToControl) {
var found = false,
// Number can come back from the buy common control, as an object, or from the spare selector, as a string
foundNumber = _.isObject(number) ? Object.keys(number)[0] : number;
foundNumber = _.isObject(number) ? _.keys(number)[0] : number;
addNumberToControl && addNumberToControl(foundNumber);


Loading…
Cancel
Save