Fix Bug 36134.

apps/documenteditor/main/app/controller/Toolbar.js

@@ -1746,6 +1746,8 @@ define([
         },
 
         onSelectChart: function(picker, item, record) {
+            if (!record) return;
+
             var me      = this,
                 type    = record.get('type'),
                 chart = false;
@@ -2339,8 +2341,10 @@ define([
 
                 shapePicker.on('item:click', function(picker, item, record, e) {
                     if (me.api) {
+                        if (record) {
                             me._addAutoshape(true, record.get('data').shapeType);
                             me._isAddingShape = true;
+                        }
 
                         if (me.toolbar.btnInsertText.pressed) {
                             me.toolbar.btnInsertText.toggle(false, true);
@@ -2411,6 +2415,7 @@ define([
 
                 equationPicker.on('item:click', function(picker, item, record, e) {
                     if (me.api) {
+                        if (record)
                             me.api.asc_AddMath(record.get('data').equationType);
 
                         if (me.toolbar.btnInsertText.pressed) {
@@ -2575,8 +2580,10 @@ define([
 
                 this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
                     if (me.api) {
+                        if (record) {
                             me.toolbar.fireEvent('inserttextart', me.toolbar);
                             me.api.AddTextArt(record.get('data'));
+                        }
 
                         if (me.toolbar.btnInsertShape.pressed)
                             me.toolbar.btnInsertShape.toggle(false, true);

apps/presentationeditor/main/app/controller/Toolbar.js

@@ -805,6 +805,7 @@ define([
 
         onAddSlide: function(picker, item, record) {
             if (this.api) {
+                if (record)
                     this.api.AddSlide(record.get('data').idx);
 
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@@ -821,6 +822,7 @@ define([
 
         onChangeSlide: function(picker, item, record) {
             if (this.api) {
+                if (record)
                     this.api.ChangeLayout(record.get('data').idx);
 
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@@ -1502,6 +1504,8 @@ define([
         },
 
         onSelectChart: function(picker, item, record) {
+            if (!record) return;
+
             var me      = this,
                 type    = record.get('type'),
                 chart = false;
@@ -1541,7 +1545,7 @@ define([
 
         onListThemeSelect: function(combo, record) {
             this._state.themeId = undefined;
-            if (this.api)
+            if (this.api && record)
                 this.api.ChangeTheme(record.get('themeId'));
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@@ -1769,6 +1773,7 @@ define([
 
                 equationPicker.on('item:click', function(picker, item, record, e) {
                     if (me.api) {
+                        if (record)
                             me.api.asc_AddMath(record.get('data').equationType);
 
                         if (me.toolbar.btnsInsertText.pressed) {

apps/presentationeditor/main/app/view/Toolbar.js

@@ -1681,9 +1681,10 @@ define([
                     });
 
                     btn.textartPicker.on('item:click', function(picker, item, record, e) {
+                        if (record)
                             me.fireEvent('insert:textart', [record.get('data')]);
 
-                        if (e.type !== 'click') this.menu.hide();
+                        if (e.type !== 'click') btn.menu.hide();
                     });
                 }
             },
@@ -1714,6 +1715,7 @@ define([
                             itemTemplate: _.template('<div class="item-shape"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
                         })).on('item:click', function (picker, item, record, e) {
                             if (e.type !== 'click') Common.UI.Menu.Manager.hideAll();
+                            if (record)
                                 me.fireEvent('insert:shape', [record.get('data').shapeType]);
                         });
                     });

apps/spreadsheeteditor/main/app/controller/Toolbar.js

@@ -863,7 +863,7 @@ define([
         },
 
         onSelectChart: function(picker, item, record, e) {
-            if (!this.editMode) return;
+            if (!this.editMode || !record) return;
             var me = this,
                 info = me.api.asc_getCellInfo(),
                 type = info.asc_getFlags().asc_getSelectionType(),
@@ -2369,8 +2369,10 @@ define([
 
                 shapePicker.on('item:click', function(picker, item, record, e) {
                     if (me.api) {
+                        if (record) {
                             me._addAutoshape(true, record.get('data').shapeType);
                             me._isAddingShape = true;
+                        }
 
                         if (me.toolbar.btnInsertText.pressed) {
                             me.toolbar.btnInsertText.toggle(false, true);
@@ -2411,9 +2413,10 @@ define([
 
                 this.toolbar.mnuTextArtPicker.on('item:click',
                     function(picker, item, record, e) {
+                        if (record) {
                             me.toolbar.fireEvent('inserttextart', me.toolbar);
                             me.api.asc_addTextArt(record.get('data'));
-
+                        }
                         if ( me.toolbar.btnInsertShape.pressed )
                             me.toolbar.btnInsertShape.toggle(false, true);
 
@@ -2483,6 +2486,7 @@ define([
 
                 equationPicker.on('item:click', function(picker, item, record, e) {
                     if (me.api) {
+                        if (record)
                             me.api.asc_AddMath(record.get('data').equationType);
 
                         if (me.toolbar.btnInsertText.pressed) {