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

Merge pull request #33 from ONLYOFFICE/hotfix/v5.0.4

Browse source 
v5.0.4
This commit is contained in:
Julia Radzhabova 2017-11-13 18:33:23 +03:00 committed by GitHub
parent 9fba2a6085 27afcaba0f
commit feb493913b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/component/ListView.js
View file

@ -73,11 +73,11 @@ define([
model: record model: record
}); });
if (!this.innerEl) { if (!this.innerEl)
this.innerEl = $(this.el).find('.inner'); this.innerEl = $(this.el).find('.inner');
this.innerEl.find('.empty-text').remove();
}
if (view && this.innerEl) { if (view && this.innerEl) {
this.innerEl.find('.empty-text').remove();
if (this.options.simpleAddMode) { if (this.options.simpleAddMode) {
this.innerEl.append(view.render().el) this.innerEl.append(view.render().el)
} else { } else {

1
apps/common/main/lib/component/SynchronizeTip.js
View file

@ -104,7 +104,6 @@ define([
applyPlacement: function () { applyPlacement: function () {
var showxy = this.target.offset(); var showxy = this.target.offset();
if (this.placement == 'top') if (this.placement == 'top')
this.cmpEl.css({bottom : Common.Utils.innerHeight() - showxy.top + 'px', right: Common.Utils.innerWidth() - showxy.left - this.target.width()/2 + 'px'}); this.cmpEl.css({bottom : Common.Utils.innerHeight() - showxy.top + 'px', right: Common.Utils.innerWidth() - showxy.left - this.target.width()/2 + 'px'});
else if (this.placement == 'left') else if (this.placement == 'left')

4
apps/common/main/lib/controller/Comments.js
View file

@ -802,6 +802,8 @@ define([
saveTxtReplyId = uids[i] + '-R'; saveTxtReplyId = uids[i] + '-R';
comment = this.findComment(saveTxtId); comment = this.findComment(saveTxtId);
if (!comment) continue;
if (this.subEditStrings[saveTxtId] && !hint) { if (this.subEditStrings[saveTxtId] && !hint) {
comment.set('editTextInPopover', true); comment.set('editTextInPopover', true);
text = this.subEditStrings[saveTxtId]; text = this.subEditStrings[saveTxtId];
@ -905,6 +907,8 @@ define([
saveTxtReplyId = uids[i] + '-R'; saveTxtReplyId = uids[i] + '-R';
comment = this.findComment(saveTxtId); comment = this.findComment(saveTxtId);
if (!comment) continue;
if (this.subEditStrings[saveTxtId]) { if (this.subEditStrings[saveTxtId]) {
comment.set('editTextInPopover', true); comment.set('editTextInPopover', true);
text = this.subEditStrings[saveTxtId]; text = this.subEditStrings[saveTxtId];

5
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -91,14 +91,15 @@ var ApplicationController = new(function(){
if (docConfig) { if (docConfig) {
permissions = $.extend(permissions, docConfig.permissions); permissions = $.extend(permissions, docConfig.permissions);
var docInfo = new Asc.asc_CDocInfo(); var _permissions = $.extend({}, docConfig.permissions),
docInfo = new Asc.asc_CDocInfo();
docInfo.put_Id(docConfig.key); docInfo.put_Id(docConfig.key);
docInfo.put_Url(docConfig.url); docInfo.put_Url(docConfig.url);
docInfo.put_Title(docConfig.title); docInfo.put_Title(docConfig.title);
docInfo.put_Format(docConfig.fileType); docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey); docInfo.put_VKey(docConfig.vkey);
docInfo.put_Token(docConfig.token); docInfo.put_Token(docConfig.token);
docInfo.put_Permissions(permissions); docInfo.put_Permissions(_permissions);
if (api) { if (api) {
api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);

5
apps/presentationeditor/main/app/controller/Main.js
View file

@ -300,7 +300,8 @@ define([
if (data.doc) { if (data.doc) {
this.permissions = $.extend(this.permissions, data.doc.permissions); this.permissions = $.extend(this.permissions, data.doc.permissions);
var _user = new Asc.asc_CUserInfo(); var _permissions = $.extend({}, data.doc.permissions),
_user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id); _user.put_Id(this.appOptions.user.id);
_user.put_FullName(this.appOptions.user.fullname); _user.put_FullName(this.appOptions.user.fullname);
@ -314,7 +315,7 @@ define([
docInfo.put_UserInfo(_user); docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token); docInfo.put_Token(data.doc.token);
docInfo.put_Permissions(this.permissions); docInfo.put_Permissions(_permissions);
//docInfo.put_OfflineApp(this.editorConfig.nativeApp === true); //docInfo.put_OfflineApp(this.editorConfig.nativeApp === true);
} }

2
apps/presentationeditor/main/app/view/DocumentPreview.js
View file

@ -350,8 +350,6 @@ define([
var count = this.api.getCountPages(); var count = this.api.getCountPages();
if (count !== this.pages.get('count')) if (count !== this.pages.get('count'))
this.pages.set('count', count); this.pages.set('count', count);
this.btnPrev.setDisabled(slideNum<=0);
this.btnNext.setDisabled(slideNum>=count-1);
this.txtGoToPage.setValue(slideNum + 1); this.txtGoToPage.setValue(slideNum + 1);
this.txtGoToPage.checkValidate(); this.txtGoToPage.checkValidate();
} }

5
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -217,7 +217,8 @@ define([
if (data.doc) { if (data.doc) {
this.permissions = $.extend(this.permissions, data.doc.permissions); this.permissions = $.extend(this.permissions, data.doc.permissions);
var _user = new Asc.asc_CUserInfo(); var _permissions = $.extend({}, data.doc.permissions),
_user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id); _user.put_Id(this.appOptions.user.id);
_user.put_FullName(this.appOptions.user.fullname); _user.put_FullName(this.appOptions.user.fullname);
@ -231,7 +232,7 @@ define([
docInfo.put_UserInfo(_user); docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token); docInfo.put_Token(data.doc.token);
docInfo.put_Permissions(this.permissions); docInfo.put_Permissions(_permissions);
} }
this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));

5
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -89,14 +89,15 @@ var ApplicationController = new(function(){
if (docConfig) { if (docConfig) {
permissions = $.extend(permissions, docConfig.permissions); permissions = $.extend(permissions, docConfig.permissions);
var docInfo = new Asc.asc_CDocInfo(); var _permissions = $.extend({}, docConfig.permissions),
docInfo = new Asc.asc_CDocInfo();
docInfo.put_Id(docConfig.key); docInfo.put_Id(docConfig.key);
docInfo.put_Url(docConfig.url); docInfo.put_Url(docConfig.url);
docInfo.put_Title(docConfig.title); docInfo.put_Title(docConfig.title);
docInfo.put_Format(docConfig.fileType); docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey); docInfo.put_VKey(docConfig.vkey);
docInfo.put_Token(docConfig.token); docInfo.put_Token(docConfig.token);
docInfo.put_Permissions(permissions); docInfo.put_Permissions(_permissions);
if (api) { if (api) {
api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);

5
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -339,7 +339,8 @@ define([
if (data.doc) { if (data.doc) {
this.permissions = _.extend(this.permissions, data.doc.permissions); this.permissions = _.extend(this.permissions, data.doc.permissions);
var _user = new Asc.asc_CUserInfo(); var _permissions = $.extend({}, data.doc.permissions),
_user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id); _user.put_Id(this.appOptions.user.id);
_user.put_FullName(this.appOptions.user.fullname); _user.put_FullName(this.appOptions.user.fullname);
@ -353,7 +354,7 @@ define([
docInfo.put_UserInfo(_user); docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token); docInfo.put_Token(data.doc.token);
docInfo.put_Permissions(this.permissions); docInfo.put_Permissions(_permissions);
this.headerView.setDocumentCaption(data.doc.title); this.headerView.setDocumentCaption(data.doc.title);
} }

5
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -220,7 +220,8 @@ define([
if ( data.doc ) { if ( data.doc ) {
this.permissions = $.extend(this.permissions, data.doc.permissions); this.permissions = $.extend(this.permissions, data.doc.permissions);
var _user = new Asc.asc_CUserInfo(); var _permissions = $.extend({}, data.doc.permissions),
_user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id); _user.put_Id(this.appOptions.user.id);
_user.put_FullName(this.appOptions.user.fullname); _user.put_FullName(this.appOptions.user.fullname);
@ -234,7 +235,7 @@ define([
docInfo.put_UserInfo(_user); docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token); docInfo.put_Token(data.doc.token);
docInfo.put_Permissions(this.permissions); docInfo.put_Permissions(_permissions);
} }
this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));