From 7d8b951852104cfaefe409f81c5d9e1616cdc19f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 18 Nov 2016 11:23:29 +0300 Subject: [PATCH 1/5] [SSE] Fix Bug 33436. --- apps/spreadsheeteditor/main/app/view/Statusbar.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index dc35cb971..50fa53d8b 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -310,8 +310,9 @@ define([ }); }); - this.tabbar.$el.append('
'); + this.tabbar.$el.append('
'); this.tabMenu.render(this.tabbar.$el); + this.tabMenu.cmpEl.attr({tabindex: -1}); this.tabMenu.on('show:after', _.bind(this.onTabMenuAfterShow, this)); this.tabMenu.on('hide:after', _.bind(this.onTabMenuAfterHide, this)); this.tabMenu.on('item:click', _.bind(this.onTabMenuClick, this)); @@ -552,6 +553,9 @@ define([ if (obj.atposition) { obj.setOffset(obj.atposition.left); } + _.defer(function(){ + obj.cmpEl.focus(); + }, 100); this.enableKeyEvents = true; }, From e6af089bda1b459ddd829ccd66682331d4b8ef6a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 18 Nov 2016 12:57:02 +0300 Subject: [PATCH 2/5] Update api.js --- apps/api/documents/api.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 1c298d195..3cc8595e4 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -37,10 +37,12 @@ }, permissions: { edit: , // default = true - download: , - reader: - review: // default = edit, - print: // default = true + download: , // default = true + reader: , + review: , // default = edit + print: , // default = true + rename: , // default = false + changeHistory: , // default = false } }, editorConfig: { From 7392d30a9d1af759d92b1c2de2fb55b6693fcb28 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 18 Nov 2016 14:48:24 +0300 Subject: [PATCH 3/5] Change format for editorConfig->user (use "name" instead of "lastname" and "firstname"). --- apps/api/documents/api.js | 3 +-- .../main/lib/controller/ReviewChanges.js | 2 -- apps/common/main/lib/util/utils.js | 18 ++++++++++-------- .../documenteditor/main/app/controller/Main.js | 2 -- .../mobile/app/controller/Main.js | 17 ++++++++++------- .../main/app/controller/Main.js | 2 -- .../mobile/app/controller/Main.js | 17 ++++++++++------- .../main/app/controller/Main.js | 2 -- .../mobile/app/controller/Main.js | 17 ++++++++++------- 9 files changed, 41 insertions(+), 39 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 3cc8595e4..0c5dca4a1 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -62,8 +62,7 @@ user: { id: 'user id', - firstname: 'user first name', - lastname: 'user last name' + name: 'user name' }, recent: [ { diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index d0a9b4c2c..c24bb4d33 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -99,8 +99,6 @@ define([ this.setApi(api); if (data) { - this.currentUserId = data.config.user.id; - this.currentUserName = data.config.user.name; this.sdkViewName = data['sdkviewname'] || this.sdkViewName; } }, diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 26b80a9df..87be71c2f 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -605,14 +605,16 @@ Common.Utils.applyCustomization = function(config, elmap) { Common.Utils.fillUserInfo = function(info, lang, defname) { var _user = info || {}; !_user.id && (_user.id = ('uid-' + Date.now())); - _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname); - if (_.isEmpty(_user.firstname)) - _user.fullname = _user.lastname; - else if (_.isEmpty(_user.lastname)) - _user.fullname = _user.firstname; - else - _user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; - + if (_.isEmpty(_user.name)) { + _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname); + if (_.isEmpty(_user.firstname)) + _user.fullname = _user.lastname; + else if (_.isEmpty(_user.lastname)) + _user.fullname = _user.firstname; + else + _user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; + } else + _user.fullname = _user.name; return _user; }; diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 4139d8d51..b23131073 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -274,8 +274,6 @@ define([ var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); - _user.put_FirstName(this.appOptions.user.firstname); - _user.put_LastName(this.appOptions.user.lastname); _user.put_FullName(this.appOptions.user.fullname); docInfo = new Asc.asc_CDocInfo(); diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index d9f464be8..f3fdedd3e 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -111,8 +111,6 @@ Ext.define('DE.controller.Main', { var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.editorConfig.user.id); - _user.put_FirstName(this.editorConfig.user.firstname); - _user.put_LastName(this.editorConfig.user.lastname); _user.put_FullName(this.editorConfig.user.fullname); var docInfo = new Asc.asc_CDocInfo(); @@ -375,11 +373,16 @@ Ext.define('DE.controller.Main', { _fillUserInfo: function(info, lang, defname) { var _user = info || {}; !_user.id && (_user.id = ('uid-' + Date.now())); - _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) - && (_user.firstname = defname); - - _user.fullname = /^ru/.test(lang) ? - _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; + if (_.isEmpty(_user.name)) { + _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname); + if (_.isEmpty(_user.firstname)) + _user.fullname = _user.lastname; + else if (_.isEmpty(_user.lastname)) + _user.fullname = _user.firstname; + else + _user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; + } else + _user.fullname = _user.name; return _user; }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index ac838e5da..6b530a4bf 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -262,8 +262,6 @@ define([ var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); - _user.put_FirstName(this.appOptions.user.firstname); - _user.put_LastName(this.appOptions.user.lastname); _user.put_FullName(this.appOptions.user.fullname); docInfo = new Asc.asc_CDocInfo(); diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 228d389f2..f14dfdf2d 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -110,8 +110,6 @@ Ext.define('PE.controller.Main', { var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.editorConfig.user.id); - _user.put_FirstName(this.editorConfig.user.firstname); - _user.put_LastName(this.editorConfig.user.lastname); _user.put_FullName(this.editorConfig.user.fullname); var docInfo = new Asc.asc_CDocInfo(); @@ -327,11 +325,16 @@ Ext.define('PE.controller.Main', { _fillUserInfo: function(info, lang, defname) { var _user = info || {}; !_user.id && (_user.id = ('uid-' + Date.now())); - _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) - && (_user.firstname = defname); - - _user.fullname = /^ru/.test(lang) ? - _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; + if (_.isEmpty(_user.name)) { + _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname); + if (_.isEmpty(_user.firstname)) + _user.fullname = _user.lastname; + else if (_.isEmpty(_user.lastname)) + _user.fullname = _user.firstname; + else + _user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; + } else + _user.fullname = _user.name; return _user; }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 31691f872..d0c371a1f 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -296,8 +296,6 @@ define([ var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); - _user.put_FirstName(this.appOptions.user.firstname); - _user.put_LastName(this.appOptions.user.lastname); _user.put_FullName(this.appOptions.user.fullname); docInfo = new Asc.asc_CDocInfo(); diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 82293b9d9..99bfad4fa 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -112,8 +112,6 @@ Ext.define('SSE.controller.Main', { var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.editorConfig.user.id); - _user.put_FirstName(this.editorConfig.user.firstname); - _user.put_LastName(this.editorConfig.user.lastname); _user.put_FullName(this.editorConfig.user.fullname); docInfo = new Asc.asc_CDocInfo(); @@ -348,11 +346,16 @@ Ext.define('SSE.controller.Main', { _fillUserInfo: function(info, lang, defname) { var _user = info || {}; !_user.id && (_user.id = ('uid-' + Date.now())); - _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) - && (_user.firstname = defname); - - _user.fullname = /^ru/.test(lang) ? - _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; + if (_.isEmpty(_user.name)) { + _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname); + if (_.isEmpty(_user.firstname)) + _user.fullname = _user.lastname; + else if (_.isEmpty(_user.lastname)) + _user.fullname = _user.firstname; + else + _user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; + } else + _user.fullname = _user.name; return _user; }, From de4dcb9107e3cbc9fc80c71149c548e8b32827d9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 18 Nov 2016 15:36:48 +0300 Subject: [PATCH 4/5] [SSE] Added "Freeze Panes" to the toolbar. --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 8 ++++++++ apps/spreadsheeteditor/main/app/view/Toolbar.js | 10 ++++++++++ apps/spreadsheeteditor/main/locale/cs.json | 1 + apps/spreadsheeteditor/main/locale/de.json | 1 + apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/main/locale/es.json | 1 + apps/spreadsheeteditor/main/locale/fr.json | 1 + apps/spreadsheeteditor/main/locale/it.json | 1 + apps/spreadsheeteditor/main/locale/ja.json | 1 + apps/spreadsheeteditor/main/locale/pt.json | 1 + apps/spreadsheeteditor/main/locale/ru.json | 1 + apps/spreadsheeteditor/main/locale/sl.json | 1 + apps/spreadsheeteditor/main/locale/tr.json | 1 + 13 files changed, 29 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index c403c8a9b..10f0998a3 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1137,6 +1137,7 @@ define([ case 'formula': params.formula = item.checked; option = 'sse-hidden-formula'; break; case 'headings': params.headings = item.checked; break; case 'gridlines': params.gridlines = item.checked; break; + case 'freezepanes': params.freezepanes = item.checked; break; } this.hideElements(params); @@ -1473,6 +1474,7 @@ define([ var params = this.api.asc_getSheetViewSettings(); this.toolbar.mnuitemHideHeadings.setChecked(!params.asc_getShowRowColHeaders()); this.toolbar.mnuitemHideGridlines.setChecked(!params.asc_getShowGridLines()); + this.toolbar.mnuitemFreezePanes.setChecked(params.asc_getIsFreezePane()); } }, @@ -1967,6 +1969,12 @@ define([ } } + if (!_.isUndefined(opts.freezepanes)) { + if (this.api) { + this.api.asc_freezePane(); + } + } + Common.NotificationCenter.trigger('edit:complete', this.toolbar); }, diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 3bbf5ec74..cb46ba084 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -908,6 +908,7 @@ define([ isChecked: function () { return this.conf.checked; } }; this.mnuitemHideGridlines = clone(this.mnuitemHideHeadings); + this.mnuitemFreezePanes = clone(this.mnuitemHideHeadings); this.mnuZoom = { options: {value: 100} }; @@ -1323,6 +1324,7 @@ define([ checkable : true, value : 'formula' }), + {caption: '--'}, this.mnuitemHideHeadings = new Common.UI.MenuItem({ caption : this.textHideHeadings, checkable : true, @@ -1336,6 +1338,13 @@ define([ value : 'gridlines' }), {caption: '--'}, + this.mnuitemFreezePanes = new Common.UI.MenuItem({ + caption : this.textFreezePanes, + checkable : true, + checked : this.mnuitemFreezePanes.isChecked(), + value : 'freezepanes' + }), + {caption: '--'}, this.mnuZoom = new Common.UI.MenuItem({ template: _.template([ '