Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #24 from ONLYOFFICE/release/v4.1.0

Browse source 
Release/v4.1.0
This commit is contained in:
Julia Radzhabova 2016-09-01 14:03:39 +03:00 committed by GitHub
parent 01134f7d20 362d8b6c09
commit 9a80bd3d3f
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Readme.md
View file

@ -14,10 +14,11 @@ SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.
## 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]. 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 [1]: http://dev.onlyoffice.org
[2]: https://github.com/ONLYOFFICE/DocumentServer [2]: https://github.com/ONLYOFFICE/DocumentServer
[3]: http://stackoverflow.com/questions/tagged/onlyoffice
## License ## License

5
apps/common/main/lib/view/OpenDialog.js
View file

@ -138,6 +138,11 @@ define([
this.close(); this.close();
}, },
onPrimary: function() {
this.onBtnClick();
return false;
},
initCodePages: function () { initCodePages: function () {
var i, c, codepage, encodedata = [], listItems = [], length = 0; var i, c, codepage, encodedata = [], listItems = [], length = 0;

10
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -911,15 +911,15 @@ define([
var mnuDeleteSlide = new Common.UI.MenuItem({ var mnuDeleteSlide = new Common.UI.MenuItem({
caption : me.txtDeleteSlide caption : me.txtDeleteSlide
}).on('click', _.bind(function(item) { }).on('click', function(item) {
if (me.api){ if (me.api){
me._isFromSlideMenu = true; me._isFromSlideMenu = true;
me.api.DeleteSlide(); me.api.DeleteSlide();
me.fireEvent('editcomplete', this); me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Delete Slide'); Common.component.Analytics.trackEvent('DocumentHolder', 'Delete Slide');
} }
}, me)); });
var mnuChangeSlide = new Common.UI.MenuItem({ var mnuChangeSlide = new Common.UI.MenuItem({
caption : me.txtChangeLayout, caption : me.txtChangeLayout,
@ -1024,7 +1024,7 @@ define([
me._isFromSlideMenu = true; me._isFromSlideMenu = true;
me.api.AddSlide(); me.api.AddSlide();
me.fireEvent('editcomplete', this); me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Add Slide'); Common.component.Analytics.trackEvent('DocumentHolder', 'Add Slide');
} }
}), }),
@ -1035,7 +1035,7 @@ define([
me._isFromSlideMenu = true; me._isFromSlideMenu = true;
me.api.DublicateSlide(); me.api.DublicateSlide();
me.fireEvent('editcomplete', this); me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Dublicate Hyperlink'); Common.component.Analytics.trackEvent('DocumentHolder', 'Dublicate Hyperlink');
} }
}), }),

10
apps/spreadsheeteditor/main/app/view/SetValueDialog.js
View file

@ -104,7 +104,7 @@ define([
var $window = this.getChild(); var $window = this.getChild();
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); $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.on('change', _.bind(this.onChange, this));
this.spnSize.$el.find('input').focus(); this.spnSize.$el.find('input').focus();
}, },
@ -121,10 +121,6 @@ define([
this._handleInput(event.currentTarget.attributes['result'].value); this._handleInput(event.currentTarget.attributes['result'].value);
}, },
onEnterValue: function(event) {
this._handleInput('ok');
},
onChange: function () { onChange: function () {
var val = this.spnSize.getNumberValue(); var val = this.spnSize.getNumberValue();
val = val / this.step; val = (val | val) * this.step; val = val / this.step; val = (val | val) * this.step;
@ -135,6 +131,10 @@ define([
return this.spnSize.getNumberValue(); return this.spnSize.getNumberValue();
}, },
onPrimary: function() {
this._handleInput('ok');
},
cancelButtonText: 'Cancel', cancelButtonText: 'Cancel',
okButtonText: 'Ok', okButtonText: 'Ok',
txtMinText: 'The minimum value for this field is {0}', txtMinText: 'The minimum value for this field is {0}',