From 338496d02fb5be7d60fdfdf0909a52b831ec119f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 14:48:49 +0300 Subject: [PATCH 1/4] [PE] refactoring --- .../presentationeditor/main/app/view/DocumentHolder.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 5c272393f..30dddf552 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -911,15 +911,15 @@ define([ var mnuDeleteSlide = new Common.UI.MenuItem({ caption : me.txtDeleteSlide - }).on('click', _.bind(function(item) { + }).on('click', function(item) { if (me.api){ me._isFromSlideMenu = true; me.api.DeleteSlide(); - me.fireEvent('editcomplete', this); + me.fireEvent('editcomplete', me); Common.component.Analytics.trackEvent('DocumentHolder', 'Delete Slide'); } - }, me)); + }); var mnuChangeSlide = new Common.UI.MenuItem({ caption : me.txtChangeLayout, @@ -1024,7 +1024,7 @@ define([ me._isFromSlideMenu = true; me.api.AddSlide(); - me.fireEvent('editcomplete', this); + me.fireEvent('editcomplete', me); Common.component.Analytics.trackEvent('DocumentHolder', 'Add Slide'); } }), @@ -1035,7 +1035,7 @@ define([ me._isFromSlideMenu = true; me.api.DublicateSlide(); - me.fireEvent('editcomplete', this); + me.fireEvent('editcomplete', me); Common.component.Analytics.trackEvent('DocumentHolder', 'Dublicate Hyperlink'); } }), From ff39cf93e7b4472cb7c052d8f57ece3c40b6364a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 16:05:21 +0300 Subject: [PATCH 2/4] Close password window with Enter. --- apps/common/main/lib/view/OpenDialog.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index e3f929b3a..a3cdb84de 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -138,6 +138,11 @@ define([ this.close(); }, + onPrimary: function() { + this.onBtnClick(); + return false; + }, + initCodePages: function () { var i, c, codepage, encodedata = [], listItems = [], length = 0; From 8ffbd2319929d50e29a15ff248f8ee8c62623825 Mon Sep 17 00:00:00 2001 From: alexandervnuchkov Date: Tue, 30 Aug 2016 16:32:11 +0300 Subject: [PATCH 3/4] Update README.md Added link to Stack Overflow --- Readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index cd886d63c..7e97180eb 100644 --- a/Readme.md +++ b/Readme.md @@ -14,10 +14,11 @@ SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www. ## 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]. +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]. [1]: http://dev.onlyoffice.org [2]: https://github.com/ONLYOFFICE/DocumentServer + [3]: http://stackoverflow.com/questions/tagged/onlyoffice ## License From af21b7eb50b7a4b969c7c9cd340d0d6840ca52fa Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 17:03:00 +0300 Subject: [PATCH 4/4] [SSE] Apply row/column size by pressing the Enter when size isn't changed. --- apps/spreadsheeteditor/main/app/view/SetValueDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js index bcf923ac5..5ecb9ba3d 100644 --- a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js @@ -104,7 +104,7 @@ define([ var $window = this.getChild(); $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); - this.spnSize.on('entervalue', _.bind(this.onEnterValue, this)); + this.spnSize.on('entervalue', _.bind(this.onPrimary, this)); this.spnSize.on('change', _.bind(this.onChange, this)); this.spnSize.$el.find('input').focus(); }, @@ -121,10 +121,6 @@ define([ this._handleInput(event.currentTarget.attributes['result'].value); }, - onEnterValue: function(event) { - this._handleInput('ok'); - }, - onChange: function () { var val = this.spnSize.getNumberValue(); val = val / this.step; val = (val | val) * this.step; @@ -135,6 +131,10 @@ define([ return this.spnSize.getNumberValue(); }, + onPrimary: function() { + this._handleInput('ok'); + }, + cancelButtonText: 'Cancel', okButtonText: 'Ok', txtMinText: 'The minimum value for this field is {0}',