ToDo add F2 code to shapes controller

delete jQuery from WorkbookView
delete getSelectedGraphicObjects from view

cell/view/WorkbookView.js

@@ -33,11 +33,10 @@
 "use strict";
 
 (/**
- * @param {jQuery} $
  * @param {Window} window
  * @param {undefined} undefined
  */
-  function($, window, undefined) {
+  function(window, undefined) {
 
 
   /*
@@ -430,8 +429,6 @@
           return self._onGraphicObjectWindowKeyPress.apply(self, arguments);
         }, "getGraphicsInfo": function () {
           return self._onGetGraphicsInfo.apply(self, arguments);
-        }, "getSelectedGraphicObjects": function () {
-          return self._onGetSelectedGraphicObjects.apply(self, arguments);
         }, "updateSelectionShape": function () {
           return self._onUpdateSelectionShape.apply(self, arguments);
         }, "canReceiveKeyPress": function () {
@@ -1225,13 +1222,13 @@
   };
 
   WorkbookView.prototype._onGraphicObjectWindowKeyDown = function(e) {
-    var ws = this.getWorksheet();
-    return ws.objectRender.graphicObjectKeyDown(e);
+    var objectRender = this.getWorksheet().objectRender;
+    return (0 < objectRender.getSelectedGraphicObjects().length) ? objectRender.graphicObjectKeyDown(e) : false;
   };
 
   WorkbookView.prototype._onGraphicObjectWindowKeyPress = function(e) {
-    var ws = this.getWorksheet();
-    return ws.objectRender.graphicObjectKeyPress(e);
+    var objectRender = this.getWorksheet().objectRender;
+    return (0 < objectRender.getSelectedGraphicObjects().length) ? objectRender.graphicObjectKeyPress(e) : false;
   };
 
   WorkbookView.prototype._onGetGraphicsInfo = function(x, y) {
@@ -1239,11 +1236,6 @@
     return ws.objectRender.checkCursorDrawingObject(x, y);
   };
 
-  WorkbookView.prototype._onGetSelectedGraphicObjects = function() {
-    var ws = this.getWorksheet();
-    return ws.objectRender.getSelectedGraphicObjects();
-  };
-
   WorkbookView.prototype._onUpdateSelectionShape = function(isSelectOnShape) {
     var ws = this.getWorksheet();
     return ws.setSelectionShape(isSelectOnShape);
@@ -2975,4 +2967,4 @@
   //------------------------------------------------------------export---------------------------------------------------
   window['AscCommonExcel'] = window['AscCommonExcel'] || {};
   window["AscCommonExcel"].WorkbookView = WorkbookView;
-})(jQuery, window);
+})(window);

common/Drawings/CommonController.js

@@ -5614,6 +5614,11 @@ DrawingObjectsController.prototype =
             drawingObjectsController.increaseFontSize();
             bRetValue = true;
         }
+        else if ( e.keyCode === 113 ) // F2
+        {
+            // ToDo обработать эту горячую клавишу. В автофигуры можно добавлять формулу
+            bRetValue = true;
+        }
         if(bRetValue)
             e.preventDefault();
         return bRetValue;