Merge branch 'develop' into feature/sse-table-settings

apps/documenteditor/main/app.js

@@ -25,8 +25,8 @@ require.config({
         jszip           : '../vendor/jszip/jszip.min',
         jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         jsrsasign       : '../vendor/jsrsasign/jsrsasign-latest-all-min',
-        allfonts        : '../sdkjs/common/AllFonts',
-        sdk             : '../sdkjs/word/sdk-all',
+        allfonts        : '../../sdkjs/common/AllFonts',
+        sdk             : '../../sdkjs/word/sdk-all',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',

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

@@ -141,7 +141,7 @@ define([
                             /*
                              * TODO: Workaround bug #25004. Clipboard feature processing in sdk.
                              */
-                            if (!(Common.Utils.isSafari && Common.Utils.isMac)) {
+                            if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) {
                                 me.api.asc_enableKeyEvents(true);
                                 if (/msg-reply/.test(e.target.className))
                                     me.dontCloseDummyComment = false;

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

@@ -72,7 +72,7 @@ define([
             this.rightmenu.fireEvent('editcomplete', this.rightmenu);
         },
 
-        onFocusObject: function(SelectedObjects) {
+        onFocusObject: function(SelectedObjects, open) {
             if (!this.editMode)
                 return;
 
@@ -158,7 +158,7 @@ define([
             if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden)
                 this._settings[Common.Utils.documentSettingsType.MailMerge].panel.setLocked(this._settings[Common.Utils.documentSettingsType.MailMerge].locked);
 
-            if (!this.rightmenu.minimizedMode) {
+            if (!this.rightmenu.minimizedMode || open) {
                 var active;
 
                 if (priorityactive>-1) active = priorityactive;
@@ -166,8 +166,11 @@ define([
                 else if (currentactive>=0) active = currentactive;
                 else if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) active = Common.Utils.documentSettingsType.MailMerge;
 
+                if (active == undefined && open && lastactive>=0)
+                    active = lastactive;
+                
                 if (active !== undefined) {
-                    this.rightmenu.SetActivePane(active);
+                    this.rightmenu.SetActivePane(active, open);
                     if (active!=Common.Utils.documentSettingsType.MailMerge)
                         this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
                     else
@@ -237,8 +240,12 @@ define([
 
             if (this.editMode && this.api) {
                 var selectedElements = this.api.getSelectedElements();
-                if (selectedElements.length>0)
-                    this.onFocusObject(selectedElements);
+                if (selectedElements.length>0) {
+                    var open = Common.localStorage.getItem("de-hide-right-settings");
+                    open = (open===null || parseInt(open) == 0);
+
+                    this.onFocusObject(selectedElements, open);
+                }
             }
         },
 

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -78,6 +78,9 @@ define([
                         menu.alignPosition();
                     }
                     _.delay(function() {
+                        var value = Common.localStorage.getItem("de-settings-inputmode"); // only for hieroglyphs mode
+                        if (value!==null && parseInt(value) == 1)
+                            me.api.asc_enableKeyEvents(false);
                         menu.cmpEl.focus();
                     }, 10);
 

apps/documenteditor/main/app/view/RightMenu.js

@@ -194,7 +194,7 @@ define([
                     $(this.el).width(MENU_SCALE_PART);
                     target_pane_parent.css("display", "inline-block" );
                     this.minimizedMode = false;
-                    Common.localStorage.setItem("de-hidden-right-settings", 0);
+                    Common.localStorage.setItem("de-hide-right-settings", 0);
                 }
                 target_pane_parent.find('> .active').removeClass('active');
                 target_pane.addClass("active");
@@ -206,7 +206,7 @@ define([
                 target_pane_parent.css("display", "none" );
                 $(this.el).width(SCALE_MIN);
                 this.minimizedMode = true;
-                Common.localStorage.setItem("de-hidden-right-settings", 1);
+                Common.localStorage.setItem("de-hide-right-settings", 1);
             }
 
             this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]);
@@ -248,7 +248,6 @@ define([
             target_pane.css("display", "none" );
             $(this.el).width(SCALE_MIN);
             this.minimizedMode = true;
-            Common.localStorage.setItem("de-hidden-right-settings", 1);
             Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
         },
 

apps/documenteditor/main/index.html

@@ -354,7 +354,7 @@
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Hit.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script>
+    <script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>

apps/presentationeditor/main/app.js

@@ -24,8 +24,8 @@ require.config({
         sockjs          : '../vendor/sockjs/sockjs.min',
         jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         jsrsasign       : '../vendor/jsrsasign/jsrsasign-latest-all-min',
-        allfonts        : '../sdkjs/common/AllFonts',
-        sdk             : '../sdkjs/slide/sdk-all',
+        allfonts        : '../../sdkjs/common/AllFonts',
+        sdk             : '../../sdkjs/slide/sdk-all',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',

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

@@ -124,7 +124,7 @@ define([
                              /*
                              * TODO: Workaround bug #25004. Clipboard feature processing in sdk.
                              */
-                            if (!(Common.Utils.isSafari && Common.Utils.isMac)) {
+                            if (!(Common.Utils.isSafari && Common.Utils.isMac) && !/area_id/.test(e.target.id)) {
                                 me.api.asc_enableKeyEvents(true);
                                 if (/msg-reply/.test(e.target.className))
                                     me.dontCloseDummyComment = false;

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

@@ -71,7 +71,7 @@ define([
             this.rightmenu.fireEvent('editcomplete', this.rightmenu);
         },
 
-        onFocusObject: function(SelectedObjects) {
+        onFocusObject: function(SelectedObjects, open) {
             if (!this.editMode)
                 return;
 
@@ -147,7 +147,7 @@ define([
                 }
             }
 
-            if (!this.rightmenu.minimizedMode) {
+            if (!this.rightmenu.minimizedMode || open) {
                 var active;
 
                 if (priorityactive>-1) active = priorityactive;
@@ -156,7 +156,7 @@ define([
                 else active = Common.Utils.documentSettingsType.Slide;
 
                 if (active !== undefined) {
-                    this.rightmenu.SetActivePane(active);
+                    this.rightmenu.SetActivePane(active, open);
                     this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
                 }
             }
@@ -214,8 +214,12 @@ define([
                 this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));
 
                 var selectedElements = this.api.getSelectedElements();
-                if (selectedElements.length>0)
-                    this.onFocusObject(selectedElements);
+                if (selectedElements.length>0) {
+                    var open = Common.localStorage.getItem("pe-hide-right-settings");
+                    open = (open===null || parseInt(open) == 0);
+                    
+                    this.onFocusObject(selectedElements, open);
+                }
             }
         },
 

apps/presentationeditor/main/app/view/DocumentHolder.js

@@ -69,6 +69,9 @@ define([
                         menu.alignPosition();
                     }
                     _.delay(function() {
+                        var value = Common.localStorage.getItem("pe-settings-inputmode"); // only for hieroglyphs mode
+                        if (value!==null && parseInt(value) == 1)
+                            me.api.asc_enableKeyEvents(false);
                         menu.cmpEl.focus();
                     }, 10);
 

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

@@ -176,7 +176,7 @@ define([
                     $(this.el).width(MENU_SCALE_PART);
                     target_pane_parent.css("display", "inline-block" );
                     this.minimizedMode = false;
-                    Common.localStorage.setItem("pe-hidden-right-settings", 0);
+                    Common.localStorage.setItem("pe-hide-right-settings", 0);
                 }
                 target_pane_parent.find('> .active').removeClass('active');
                 target_pane.addClass("active");
@@ -189,7 +189,7 @@ define([
                 target_pane_parent.css("display", "none" );
                 $(this.el).width(SCALE_MIN);
                 this.minimizedMode = true;
-                Common.localStorage.setItem("pe-hidden-right-settings", 1);
+                Common.localStorage.setItem("pe-hide-right-settings", 1);
             }
 
             this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]);
@@ -245,7 +245,6 @@ define([
             target_pane.css("display", "none" );
             $(this.el).width(SCALE_MIN);
             this.minimizedMode = true;
-            Common.localStorage.setItem("pe-hidden-right-settings", 1);
             Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
         },
 

apps/presentationeditor/main/index.html

@@ -306,7 +306,7 @@
 
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Overlay.js"></script>
+    <script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/Transitions.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script>

apps/spreadsheeteditor/main/app.js

@@ -24,8 +24,8 @@ require.config({
         sockjs          : '../vendor/sockjs/sockjs.min',
         jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         jsrsasign       : '../vendor/jsrsasign/jsrsasign-latest-all-min',
-        allfonts        : '../sdkjs/common/AllFonts',
-        sdk             : '../sdkjs/cell/sdk-all',
+        allfonts        : '../../sdkjs/common/AllFonts',
+        sdk             : '../../sdkjs/cell/sdk-all',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',

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

@@ -164,16 +164,20 @@ define([
                 }
             }
 
-            if (!this.rightmenu.minimizedMode) {
+            if (!this.rightmenu.minimizedMode || this._openRightMenu) {
                 var active;
 
                 if (priorityactive>-1) active = priorityactive;
                 else if (lastactive>=0 && currentactive<0) active = lastactive;
                 else if (currentactive>=0) active = currentactive;
 
+                if (active == undefined && this._openRightMenu && lastactive>=0)
+                    active = lastactive;
+
                 if (active !== undefined) {
-                    this.rightmenu.SetActivePane(active);
+                    this.rightmenu.SetActivePane(active, this._openRightMenu);
                     this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
+                    this._openRightMenu = false;
                 }
             }
 
@@ -221,6 +225,9 @@ define([
         createDelayedElements: function() {
             var me = this;
             if (this.api) {
+                 var open = Common.localStorage.getItem("sse-hide-right-settings");
+                this._openRightMenu = (open===null || parseInt(open) == 0);
+                
                 this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this));
                 this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this));
                 this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));

apps/spreadsheeteditor/main/app/view/RightMenu.js

@@ -164,7 +164,7 @@ define([
                     $(this.el).width(MENU_SCALE_PART);
                     target_pane_parent.css("display", "inline-block" );
                     this.minimizedMode = false;
-                    Common.localStorage.setItem("sse-hidden-right-settings", 0);
+                    Common.localStorage.setItem("sse-hide-right-settings", 0);
                 }
                 target_pane_parent.find('> .active').removeClass('active');
                 target_pane.addClass("active");
@@ -176,7 +176,7 @@ define([
                 target_pane_parent.css("display", "none" );
                 $(this.el).width(SCALE_MIN);
                 this.minimizedMode = true;
-                Common.localStorage.setItem("sse-hidden-right-settings", 1);
+                Common.localStorage.setItem("sse-hide-right-settings", 1);
             }
 
             this.fireEvent('rightmenuclick', [this, btn.options.asctype, this.minimizedMode]);
@@ -231,7 +231,6 @@ define([
             target_pane.css("display", "none" );
             $(this.el).width(SCALE_MIN);
             this.minimizedMode = true;
-            Common.localStorage.setItem("sse-hidden-right-settings", 1);
             Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
         },
 

apps/spreadsheeteditor/main/index.html

@@ -368,7 +368,7 @@
 	<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
 
     <script src="../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"></script>
-    <script src="../../../../sdkjs/cell/model/DrawingObjects/Overlay.js"></script>
+    <script src="../../../../sdkjs/common/Overlay.js"></script>
     <script src="../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"></script>
 
     <script src="../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"></script>

apps/spreadsheeteditor/main/index.html.deploy

@@ -8,7 +8,7 @@
     <meta name="keywords" content="" />
     <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
 
-    <link rel="stylesheet" type="text/css" href="../../../sdkjs/cell/css/main.css"/>
+    <link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
     <link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css">
 
     <!-- splash -->        

build/package.json

@@ -4,7 +4,7 @@
   "homepage": "http://www.onlyoffice.com",
   "private": true,
   "dependencies": {
-    "lodash": "3.0.0",
+    "lodash": "^4.0.0",
     "grunt": "0.4.5",
     "grunt-exec": "0.4.5",
     "grunt-replace": "0.7.3",