Commit 50630583 authored by SergeyLuzyanin's avatar SergeyLuzyanin

notes

parent 81c99893
...@@ -3291,7 +3291,13 @@ CPresentation.prototype = ...@@ -3291,7 +3291,13 @@ CPresentation.prototype =
Notes_OnMouseUp : function(e, X, Y) Notes_OnMouseUp : function(e, X, Y)
{ {
this.Notes_OnMouseMove(e, X, Y); var oCurSlide = this.Slides[this.CurPage];
if(oCurSlide){
if(oCurSlide.notesShape){
oCurSlide.notesShape.selectionSetEnd(e, X, Y, this.CurPage);
this.Notes_UpdateSelectionState();
}
}
}, },
Notes_OnMouseMove : function(e, X, Y) Notes_OnMouseMove : function(e, X, Y)
...@@ -3299,7 +3305,7 @@ CPresentation.prototype = ...@@ -3299,7 +3305,7 @@ CPresentation.prototype =
var oCurSlide = this.Slides[this.CurPage]; var oCurSlide = this.Slides[this.CurPage];
if(oCurSlide){ if(oCurSlide){
if(oCurSlide.notesShape){ if(oCurSlide.notesShape){
if(e.IsLocked){ if(e.IsPressed){
oCurSlide.notesShape.selectionSetEnd(e, X, Y, this.CurPage); oCurSlide.notesShape.selectionSetEnd(e, X, Y, this.CurPage);
this.Notes_UpdateSelectionState(); this.Notes_UpdateSelectionState();
} }
......
...@@ -438,7 +438,8 @@ CShape.prototype.getParentObjects = function () ...@@ -438,7 +438,8 @@ CShape.prototype.getParentObjects = function ()
slide: null, slide: null,
layout: null, layout: null,
master: this.parent.Master, master: this.parent.Master,
theme: this.themeOverride ? this.themeOverride : (this.parent.Master ? this.parent.Master.Theme : null) theme: this.themeOverride ? this.themeOverride : (this.parent.Master ? this.parent.Master.Theme : null),
notes: this.parent
} }
} }
} }
......
...@@ -1044,6 +1044,7 @@ Slide.prototype = ...@@ -1044,6 +1044,7 @@ Slide.prototype =
this.notesShape = this.notes.getBodyShape(); this.notesShape = this.notes.getBodyShape();
} }
if(this.notesShape){ if(this.notesShape){
this.notes.slide = this;
this.notes.graphicObjects.selectObject(this.notesShape, 0); this.notes.graphicObjects.selectObject(this.notesShape, 0);
this.notes.graphicObjects.selection.textSelection = this.notesShape; this.notes.graphicObjects.selection.textSelection = this.notesShape;
var oDocContent = this.notesShape.getDocContent(); var oDocContent = this.notesShape.getDocContent();
...@@ -1476,6 +1477,9 @@ AscFormat.CTextBody.prototype.Get_StartPage_Absolute = function() ...@@ -1476,6 +1477,9 @@ AscFormat.CTextBody.prototype.Get_StartPage_Absolute = function()
{ {
return parent_objects.slide.num; return parent_objects.slide.num;
} }
if(parent_objects.notes && parent_objects.notes.slide){
return parent_objects.notes.slide.num;
}
} }
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment