Добавил asc_onEditorSelectionChanged(asc_CFont) - эвент на смену информации о...

Добавил asc_onEditorSelectionChanged(asc_CFont) - эвент на смену информации о выделении в редакторе ячейки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57943 954022d7-b5bf-4e40-9824-e11837661b57

Excel/api.js

@@ -1178,6 +1178,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		 * asc_onAdvancedOptions		(asc_CAdvancedOptions, ascAdvancedOptionsAction)	- эвент на получение дополнительных опций (открытие/сохранение CSV)
 		 * asc_onError					(c_oAscError.ID, c_oAscError.Level)					- эвент об ошибке
 		 * asc_onEditCell				(c_oAscCellEditorState)								- эвент на редактирование ячейки с состоянием (переходами из формулы и обратно)
+		 * asc_onEditorSelectionChanged	(asc_CFont)											- эвент на смену информации о выделении в редакторе ячейки
 		 * asc_onSelectionChanged		(asc_CCellInfo)										- эвент на смену информации о выделении
 		 * asc_onSelectionNameChanged	(sName)												- эвент на смену имени выделения (Id-ячейки, число выделенных столбцов/строк, имя диаграммы и др.)
 		 * asc_onSelectionMathChanged	(asc_CSelectionMathInfo)							- эвент на смену математической информации о выделении

Excel/view/CellEditorView.js

@@ -262,6 +262,7 @@
 			 */
 			this.setFocus(this.isTopLineActive ? true : (undefined !== options.focus) ? options.focus : this._haveTextInEdit() ? true : false);
 			this._updateUndoRedoChanged();
+			this._updateSelectionInfo();
 		};
 
 		CellEditor.prototype.close = function (saveValue) {
@@ -305,7 +306,6 @@
 			var t = this, opt = t.options, begin, end, i, first, last;
 
 			if (t.selectionBegin !== t.selectionEnd) {
-
 				begin = Math.min(t.selectionBegin, t.selectionEnd);
 				end = Math.max(t.selectionBegin, t.selectionEnd);
 
@@ -342,7 +342,6 @@
 				}
 
 			} else {
-
 				first = t._findFragmentToInsertInto(t.cursorPos);
 				if (first) {
 					if (!t.newTextFormat) {
@@ -352,6 +351,8 @@
 				}
 
 			}
+
+			this._updateSelectionInfo();
 		};
 
 		CellEditor.prototype.empty = function(options) {
@@ -1642,6 +1643,25 @@
 			return this.objAutoComplete[str] = arrResult;
 		};
 
+		CellEditor.prototype._updateSelectionInfo = function () {
+			var tmp = Math.min(this.selectionBegin, this.selectionEnd);
+			tmp = this._findFragment(tmp);
+			tmp = this.options.fragments[tmp].format;
+
+			var result = new asc.asc_CFont();
+			result.name = tmp.fn;
+			result.size = tmp.fs;
+			result.bold = tmp.b;
+			result.italic = tmp.i;
+			result.underline = (Asc.EUnderline.underlineNone !== tmp.u); // ToDo убрать, когда будет реализовано двойное подчеркивание
+			result.strikeout = tmp.s;
+			result.subscript = tmp.va === "subscript";
+			result.superscript = tmp.va === "superscript";
+			result.color = (tmp.c ? asc.colorObjToAscColor(tmp.c) : new CAscColor(this.options.textColor));
+
+			this.handlers.trigger("updateEditorSelectionInfo", result);
+		};
+
 		// Event handlers
 
 		/** @param event {KeyboardEvent} */

Excel/view/WorkbookView.js

@@ -356,44 +356,42 @@
 					}, false);
 				}
 
-			    this.cellEditor = new asc.CellEditor(this.element, this.input, this.fmgrGraphics, this.m_oFont,
-					    /*handlers*/{
-						    "closed"   : function () {self._onCloseCellEditor.apply(self, arguments);},
-						    "updated"  : function () {self._onUpdateCellEditor.apply(self, arguments);},
-						    "gotFocus" : function (hasFocus) {self.controller.setFocus(!hasFocus);},
-						    "copy"     : function () {self.copyToClipboard.apply(self, arguments);},
-						    "paste"    : function () {self.pasteFromClipboard.apply(self, arguments);},
-						    "cut"      : function () {self.cutToClipboard.apply(self, arguments);},
-						    "updateFormulaEditMod": function () {
-									    self.controller.setFormulaEditMode.apply(self.controller, arguments);
-									    var ws = self.getWorksheet();
-									    if (ws) {
-										    ws.cleanSelection();
-										    ws.cleanFormulaRanges();
-										    ws.setFormulaEditMode.apply(ws, arguments);
-									    }
-								    },
-						    "updateEditorState"	:	function () {self.handlers.trigger.apply(self.handlers,
-							    ["asc_onEditCell"].concat(Array.prototype.slice.call(arguments)));},
-						    "isGlobalLockEditCell" : function () {return self.collaborativeEditing.getGlobalLockEditCell();},
-						    "updateFormulaEditModEnd": function (rangeUpdated) {
-							    self.getWorksheet().updateSelection();
-						    },
-						    "newRange"     				: function (range) { self.getWorksheet().addFormulaRange(range); },
-						    "existedRange" 				: function (range) { self.getWorksheet().changeFormulaRange(range); },
-						    "updateUndoRedoChanged"		: function (bCanUndo, bCanRedo) {
-							    self.handlers.trigger("asc_onCanUndoChanged", bCanUndo);
-							    self.handlers.trigger("asc_onCanRedoChanged", bCanRedo);
-						    },
-							"applyCloseEvent"			: function () {self.controller._onWindowKeyDown.apply(self.controller, arguments);},
-							"isViewerMode"				: function () {return self.controller.settings.isViewerMode;},
-							"popUpSelectorKeyDown"	: function (event) {return self._onPopUpSelectorKeyDown(event);},
-							"getFormulaRanges"			: function () {return self.getWorksheet().getFormulaRanges();},
-							"setStrictClose"			: function (val) {self.controller.setStrictClose(val);}
-					    },
-					    /*settings*/{
-						    font: this.defaultFont
-					    });
+				this.cellEditor = new asc.CellEditor(this.element, this.input, this.fmgrGraphics, this.m_oFont,
+					/*handlers*/{
+						"closed"   : function () {self._onCloseCellEditor.apply(self, arguments);},
+						"updated"  : function () {self._onUpdateCellEditor.apply(self, arguments);},
+						"gotFocus" : function (hasFocus) {self.controller.setFocus(!hasFocus);},
+						"copy"     : function () {self.copyToClipboard.apply(self, arguments);},
+						"paste"    : function () {self.pasteFromClipboard.apply(self, arguments);},
+						"cut"      : function () {self.cutToClipboard.apply(self, arguments);},
+						"updateFormulaEditMod": function () {
+							self.controller.setFormulaEditMode.apply(self.controller, arguments);
+							var ws = self.getWorksheet();
+							if (ws) {
+								ws.cleanSelection();
+								ws.cleanFormulaRanges();
+								ws.setFormulaEditMode.apply(ws, arguments);
+							}
+						},
+						"updateEditorState"			: function (state) {self.handlers.trigger("asc_onEditCell", state);},
+						"isGlobalLockEditCell"		: function () {return self.collaborativeEditing.getGlobalLockEditCell();},
+						"updateFormulaEditModEnd"	: function (rangeUpdated) {self.getWorksheet().updateSelection();},
+						"newRange"     				: function (range) { self.getWorksheet().addFormulaRange(range); },
+						"existedRange" 				: function (range) { self.getWorksheet().changeFormulaRange(range); },
+						"updateUndoRedoChanged"		: function (bCanUndo, bCanRedo) {
+							self.handlers.trigger("asc_onCanUndoChanged", bCanUndo);
+							self.handlers.trigger("asc_onCanRedoChanged", bCanRedo);
+						},
+						"applyCloseEvent"			: function () {self.controller._onWindowKeyDown.apply(self.controller, arguments);},
+						"isViewerMode"				: function () {return self.controller.settings.isViewerMode;},
+						"popUpSelectorKeyDown"		: function (event) {return self._onPopUpSelectorKeyDown(event);},
+						"getFormulaRanges"			: function () {return self.getWorksheet().getFormulaRanges();},
+						"setStrictClose"			: function (val) {self.controller.setStrictClose(val);},
+						"updateEditorSelectionInfo"	: function (info) {self.handlers.trigger("asc_onEditorSelectionChanged", info);}
+					},
+					/*settings*/{
+						font: this.defaultFont
+					});
 
 				this.popUpSelector = new asc.PopUpSelector(this.element, /*handlers*/{
 					"insert"	: function () {self._onPopUpSelectorInsert.apply(self, arguments);}