diff --git a/apps/spreadsheeteditor/main/app/controller/PivotTable.js b/apps/spreadsheeteditor/main/app/controller/PivotTable.js index b1022d9dee..390486a08b 100644 --- a/apps/spreadsheeteditor/main/app/controller/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/controller/PivotTable.js @@ -359,10 +359,19 @@ define([ if (count>0 && count==Templates.length) { var data = styles.menuPicker.dataViewItems; + var findDataViewItem = function(template) { + for(var i = 0; i < data.length; i++) { + if(data[i].model.get('name') && data[i].model.get('name') === template.asc_getName()) return data[i]; + else if(data[i].model.get('caption') === template.asc_getDisplayName()) return data[i]; + } + return undefined; + }; + data && _.each(Templates, function(template, index){ var img = template.asc_getImage(); - data[index].model.set('imageUrl', img, {silent: true}); - $(data[index].el).find('img').attr('src', img); + var dataViewItem = findDataViewItem(template); + dataViewItem && dataViewItem.model.set('imageUrl', img, {silent: true}); + dataViewItem && $(dataViewItem.el).find('img').attr('src', img); }); styles.fieldPicker.store.reset(styles.fieldPicker.store.models); } else { diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index 019df77854..af5e90d93c 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -576,10 +576,19 @@ define([ var count = self.mnuTableTemplatePicker.store.length; if (count>0 && count==Templates.length) { var data = self.mnuTableTemplatePicker.dataViewItems; + var findDataViewItem = function(template) { + for(var i = 0; i < data.length; i++) { + if(data[i].model.get('name') && data[i].model.get('name') === template.asc_getName()) return data[i]; + else if(data[i].model.get('caption') === template.asc_getDisplayName()) return data[i]; + } + return undefined; + }; + data && _.each(Templates, function(template, index){ var img = template.asc_getImage(); - data[index].model.set('imageUrl', img, {silent: true}); - $(data[index].el).find('img').attr('src', img); + var dataViewItem = findDataViewItem(template); + dataViewItem && dataViewItem.model.set('imageUrl', img, {silent: true}); + dataViewItem && $(dataViewItem.el).find('img').attr('src', img); }); } else { var templates = [];