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

v5.0.4

Browse source
This commit is contained in:
Alexey Golubev 2017-11-13 17:44:37 +03:00
parent ed1aa87590 d3f6cc3443
commit 9fd0a90c38
11 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/component/DataView.js
View file

@ -718,10 +718,11 @@ define([
var el = $(this.dataViewItems[0].el), var el = $(this.dataViewItems[0].el),
itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')), itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')),
offsetLeft = this.$el.offset().left, offsetLeft = this.$el.offset().left,
offsetTop = el.offset().top,
prevtop = -1, topIdx = 0, leftIdx = 0; prevtop = -1, topIdx = 0, leftIdx = 0;
for (var i=0; i<this.dataViewItems.length; i++) { for (var i=0; i<this.dataViewItems.length; i++) {
var top = $(this.dataViewItems[i].el).offset().top; var top = $(this.dataViewItems[i].el).offset().top - offsetTop;
leftIdx = Math.floor(($(this.dataViewItems[i].el).offset().left - offsetLeft)/itemW); leftIdx = Math.floor(($(this.dataViewItems[i].el).offset().left - offsetLeft)/itemW);
if (top>prevtop) { if (top>prevtop) {
prevtop = top; prevtop = top;

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

@ -72,11 +72,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 {

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

@ -39,8 +39,6 @@ define([
'use strict'; 'use strict';
Common.UI.SynchronizeTip = Common.UI.BaseView.extend(_.extend((function() { Common.UI.SynchronizeTip = Common.UI.BaseView.extend(_.extend((function() {
var tipEl;
return { return {
options : { options : {
target : $(document.body), target : $(document.body),
@ -71,36 +69,38 @@ define([
}, },
render: function() { render: function() {
tipEl = $(this.template({ scope: this })); if (!this.cmpEl) {
tipEl.find('.close').on('click', _.bind(function() { this.trigger('closeclick');}, this)); this.cmpEl = $(this.template({ scope: this }));
tipEl.find('.show-link label').on('click', _.bind(function() { this.trigger('dontshowclick');}, this)); $(document.body).append(this.cmpEl);
this.cmpEl.find('.close').on('click', _.bind(function() { this.trigger('closeclick');}, this));
this.cmpEl.find('.show-link label').on('click', _.bind(function() { this.trigger('dontshowclick');}, this));
}
$(document.body).append(tipEl);
this.applyPlacement(); this.applyPlacement();
return this; return this;
}, },
show: function(){ show: function(){
if (tipEl) { if (this.cmpEl) {
this.applyPlacement(); this.applyPlacement();
tipEl.show() this.cmpEl.show()
} else } else
this.render(); this.render();
}, },
hide: function() { hide: function() {
if (tipEl) tipEl.hide(); if (this.cmpEl) this.cmpEl.hide();
}, },
applyPlacement: function () { applyPlacement: function () {
var showxy = this.target.offset(); var showxy = this.target.offset();
(this.placement == 'top') ? tipEl.css({bottom : Common.Utils.innerHeight() - showxy.top + 'px', right: Common.Utils.innerWidth() - showxy.left - this.target.width()/2 + 'px'}) (this.placement == 'top') ? this.cmpEl.css({bottom : Common.Utils.innerHeight() - showxy.top + 'px', right: Common.Utils.innerWidth() - showxy.left - this.target.width()/2 + 'px'})
: tipEl.css({top : showxy.top + this.target.height()/2 + 'px', left: showxy.left + this.target.width() + 'px'}); : this.cmpEl.css({top : showxy.top + this.target.height()/2 + 'px', left: showxy.left + this.target.width() + 'px'});
}, },
isVisible: function() { isVisible: function() {
return tipEl && tipEl.is(':visible'); return this.cmpEl && this.cmpEl.is(':visible');
}, },
textDontShow : 'Don\'t show this message again', textDontShow : 'Don\'t show this message again',

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

@ -299,7 +299,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);
@ -313,7 +314,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

@ -344,8 +344,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

@ -334,7 +334,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);
@ -348,7 +349,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));