diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index dd6b872..c0b1f7e 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -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) { diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index b6ed201..cb523af 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -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) { diff --git a/submodules/users/users.js b/submodules/users/users.js index 275e653..273f674 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -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);