From d115019f7cc1ce3ef6ac891daa4af9ceb657c008 Mon Sep 17 00:00:00 2001 From: hellonadya Date: Tue, 1 Jun 2021 13:54:07 +0300 Subject: [PATCH 1/2] Update Readme.md (#909) - add info on desktop - fix minor text issues --- Readme.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Readme.md b/Readme.md index 188db518f..ea3faf9c3 100644 --- a/Readme.md +++ b/Readme.md @@ -2,23 +2,21 @@ ## web-apps -The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor. +The frontend for [ONLYOFFICE Document Server][2] and [ONLYOFFICE Desktop Editors](https://github.com/ONLYOFFICE/DesktopEditors). Builds the program interface and allows the user create, edit, save and export text documents, spreadsheets, and presentations. ## Previous versions -Until 2019-10-23 the repository was called web-apps-pro +Until 2019-10-23 the repository was called web-apps-pro. -## Project Information +## Project information -Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org") +Official website: [https://www.onlyoffice.com/](https://www.onlyoffice.com "https://www.onlyoffice.com") Code repository: [https://github.com/ONLYOFFICE/web-apps](https://github.com/ONLYOFFICE/web-apps "https://github.com/ONLYOFFICE/web-apps") -SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com") +## User feedback and support -## User Feedback and Support - -If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3]. +If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3]. [1]: http://dev.onlyoffice.org [2]: https://github.com/ONLYOFFICE/DocumentServer From bbb0d0d6e2bbf4c7e7128070675f6930f7de593d Mon Sep 17 00:00:00 2001 From: Alexander Trofimov Date: Wed, 4 Aug 2021 16:34:35 +0300 Subject: [PATCH 2/2] Fix Bug 51297 (#1045) Co-authored-by: Julia Radzhabova --- apps/common/main/lib/component/DataView.js | 5 ++++- apps/common/main/lib/component/TreeView.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 9edb115e5..59e1fbb6b 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -476,7 +476,10 @@ define([ }, this); this.dataViewItems = []; - this.store.each(this.onAddItem, this); + var me = this; + this.store.each(function(item){ + me.onAddItem(item, me.store); + }, this); if (this.allowScrollbar) { this.scroller = new Common.UI.Scroller({ diff --git a/apps/common/main/lib/component/TreeView.js b/apps/common/main/lib/component/TreeView.js index 84c3fe860..d6ac4c4b4 100644 --- a/apps/common/main/lib/component/TreeView.js +++ b/apps/common/main/lib/component/TreeView.js @@ -198,7 +198,7 @@ define([ if (innerEl) { (this.dataViewItems.length<1) && innerEl.find('.empty-text').remove(); - if (opts && opts.at!==undefined) { + if (opts && (typeof opts.at==='number')) { var idx = opts.at; var innerDivs = innerEl.find('> div'); if (idx > 0)