Merge branch 'develop' into feature/newembed

apps/common/main/lib/controller/Comments.js

@@ -1222,12 +1222,14 @@ define([
 
                     for (i = 0; i < comments.length; ++i) {
                         comment = this.findComment(comments[i].asc_getId());
-                        comment.set('editTextInPopover', true);
-                        comment.set('hint', false);
-                        this.popoverComments.push(comment);
+                        if (comment) {
+                            comment.set('editTextInPopover', true);
+                            comment.set('hint', false);
+                            this.popoverComments.push(comment);
+                        }
                     }
 
-                    if (this.getPopover()) {
+                    if (this.getPopover() && this.popoverComments.length>0) {
                         if (this.getPopover().isVisible()) {
                             this.getPopover().hide();
                         }

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

@@ -1335,11 +1335,8 @@ define([
             },
 
             onFocusObject: function(SelectedObjects) {
-                if (SelectedObjects.length>0) {
                     var rightpan = this.getApplication().getController('RightMenu');
-//                    var docPreview = this.getApplication().getController('Viewport').getView('DocumentPreview');
-                    if (rightpan /*&& !docPreview.isVisible()*/) rightpan.onFocusObject.call(rightpan, SelectedObjects);
-                }
+                    if (rightpan) rightpan.onFocusObject.call(rightpan, SelectedObjects);
             },
 
             _onChangeObjectLock: function() {

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

@@ -114,7 +114,7 @@ define([
                     this._settings[i].locked = undefined;
                 }
             }
-            this._settings[Common.Utils.documentSettingsType.Slide].hidden = 0;
+            this._settings[Common.Utils.documentSettingsType.Slide].hidden = (SelectedObjects.length>0) ? 0 : 1;
 
             for (i=0; i<SelectedObjects.length; i++)
             {

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

@@ -1454,6 +1454,14 @@ define([
                 }, 10);
             } else {
                 this.documentHolder.entriesMenu.hide();
+                Common.UI.warning({
+                    title: this.notcriticalErrorTitle,
+                    maxwidth: 600,
+                    msg  : this.txtNoChoices,
+                    callback: _.bind(function(btn){
+                        Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
+                    }, this)
+                });
             }
         },
 
@@ -2282,7 +2290,8 @@ define([
         insertColumnRightText   : 'Column Right',
         deleteText              : 'Delete',
         deleteRowText           : 'Delete Row',
-        deleteColumnText        : 'Delete Column'
+        deleteColumnText        : 'Delete Column',
+        txtNoChoices: 'There are no choices for filling the cell.<br>Only text values from the column can be selected for replacement.'
 
     }, SSE.Controllers.DocumentHolder || {}));
 });
\ No newline at end of file

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

@@ -1419,7 +1419,6 @@ define([
                 var me = this;
                 if (id == Asc.c_oAscConfirm.ConfirmReplaceRange) {
                     Common.UI.warning({
-                        closable: false,
                         title: this.notcriticalErrorTitle,
                         msg: this.confirmMoveCellRange,
                         buttons: ['yes', 'no'],

apps/spreadsheeteditor/main/locale/en.json

@@ -172,6 +172,7 @@
   "SSE.Controllers.DocumentHolder.txtLimitUnder": "Limit under text",
   "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Match brackets to argument height",
   "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Matrix alignment",
+  "SSE.Controllers.DocumentHolder.txtNoChoices": "There are no choices for filling the cell.<br>Only text values from the column can be selected for replacement.",
   "SSE.Controllers.DocumentHolder.txtOverbar": "Bar over text",
   "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Remove fraction bar",
   "SSE.Controllers.DocumentHolder.txtRemLimit": "Remove limit",