notes

common/Drawings/Format/Shape.js

@@ -4930,6 +4930,9 @@ CShape.prototype.hitInInnerArea = function (x, y) {
 };
 
 CShape.prototype.hitInBoundingRect = function (x, y) {
+    if(this.parent && this.parent.kind === AscFormat.TYPE_KIND.NOTES){
+        return false;
+    }
     var invert_transform = this.getInvertTransform();
     var x_t = invert_transform.TransformPointX(x, y);
     var y_t = invert_transform.TransformPointY(x, y);

slide/Editor/Format/Notes.js

@@ -298,6 +298,14 @@
     {
         editor.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
     };
+    CNotes.prototype.isViewerMode = function()
+    {
+        editor.WordControl.m_oLogicDocument.IsViewMode();
+    };
+    CNotes.prototype.convertPixToMM = function(pix)
+    {
+        return editor.WordControl.m_oDrawingDocument.GetMMPerDot(pix);
+    };
 
     function CreateNotes(){
         var oN = new CNotes();

slide/Editor/Format/Presentation.js

@@ -1254,12 +1254,14 @@ CPresentation.prototype =
         this.RecalculateCurPos();
         if(bSync)
         {
+            var bEndRecalc = false;
             if(bRedrawAllSlides)
             {
                 for(i = 0; i < this.Slides.length; ++i)
                 {
                     this.DrawingDocument.OnRecalculatePage(i, this.Slides[i]);
                 }
+                bEndRecalc = (this.Slides.length > 0);
                 this.DrawingDocument.Notes_OnRecalculate(this.CurPage, this.Slides[this.CurPage].NotesWidth, this.Slides[this.CurPage].getNotesHeight());
             }
             else
@@ -1269,11 +1271,14 @@ CPresentation.prototype =
                 {
                     this.DrawingDocument.OnRecalculatePage(aToRedrawSlides[i], this.Slides[aToRedrawSlides[i]]);
                 }
+                bEndRecalc = (aToRedrawSlides.length > 0);
             }
-            this.DrawingDocument.OnEndRecalculate();
             if(bRedrawNotes){
                 this.DrawingDocument.Notes_OnRecalculate(this.CurPage, this.Slides[this.CurPage].NotesWidth, this.Slides[this.CurPage].getNotesHeight());
             }
+            if(bEndRecalc){
+                this.DrawingDocument.OnEndRecalculate();
+            }
         }
         if(!this.Slides[this.CurPage])
         {