From cacb5e4d4ac71477a582eb0f086576c097941842 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Oct 2017 11:52:56 +0300 Subject: [PATCH 1/6] [PE] Don't disable prev-next buttons for slide demonstration. --- apps/presentationeditor/main/app/view/DocumentPreview.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js index c948a37bd..f91dd33de 100644 --- a/apps/presentationeditor/main/app/view/DocumentPreview.js +++ b/apps/presentationeditor/main/app/view/DocumentPreview.js @@ -344,8 +344,6 @@ define([ var count = this.api.getCountPages(); if (count !== this.pages.get('count')) this.pages.set('count', count); - this.btnPrev.setDisabled(slideNum<=0); - this.btnNext.setDisabled(slideNum>=count-1); this.txtGoToPage.setValue(slideNum + 1); this.txtGoToPage.checkValidate(); } From 0f6213f9db487377e49a58a63aeda613fc957c1d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 30 Oct 2017 14:50:59 +0300 Subject: [PATCH 2/6] For Bug 36122. --- apps/presentationeditor/embed/js/ApplicationController.js | 5 +++-- apps/presentationeditor/main/app/controller/Main.js | 5 +++-- apps/presentationeditor/mobile/app/controller/Main.js | 5 +++-- apps/spreadsheeteditor/embed/js/ApplicationController.js | 5 +++-- apps/spreadsheeteditor/main/app/controller/Main.js | 5 +++-- apps/spreadsheeteditor/mobile/app/controller/Main.js | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index f8c11f498..bec396de7 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -91,14 +91,15 @@ var ApplicationController = new(function(){ if (docConfig) { 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_Url(docConfig.url); docInfo.put_Title(docConfig.title); docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); docInfo.put_Token(docConfig.token); - docInfo.put_Permissions(permissions); + docInfo.put_Permissions(_permissions); if (api) { api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index bfa635fe1..9412332c1 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -299,7 +299,8 @@ define([ if (data.doc) { 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_FullName(this.appOptions.user.fullname); @@ -313,7 +314,7 @@ define([ docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); - docInfo.put_Permissions(this.permissions); + docInfo.put_Permissions(_permissions); //docInfo.put_OfflineApp(this.editorConfig.nativeApp === true); } diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index e2e9d6ced..121372001 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -217,7 +217,8 @@ define([ if (data.doc) { 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_FullName(this.appOptions.user.fullname); @@ -231,7 +232,7 @@ define([ docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); 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)); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 111997a78..2fb85a683 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -89,14 +89,15 @@ var ApplicationController = new(function(){ if (docConfig) { 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_Url(docConfig.url); docInfo.put_Title(docConfig.title); docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); docInfo.put_Token(docConfig.token); - docInfo.put_Permissions(permissions); + docInfo.put_Permissions(_permissions); if (api) { api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 7a8e1aa01..9bf081dbd 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -334,7 +334,8 @@ define([ if (data.doc) { 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_FullName(this.appOptions.user.fullname); @@ -348,7 +349,7 @@ define([ docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); - docInfo.put_Permissions(this.permissions); + docInfo.put_Permissions(_permissions); this.headerView.setDocumentCaption(data.doc.title); } diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 078c1ef74..aeeae8a11 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -220,7 +220,8 @@ define([ if ( data.doc ) { 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_FullName(this.appOptions.user.fullname); @@ -234,7 +235,7 @@ define([ docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); 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)); From c8879d7c077142a2842b8f1b4455a9712b45d80d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 31 Oct 2017 11:51:45 +0300 Subject: [PATCH 3/6] Comments refactoring. --- apps/common/main/lib/controller/Comments.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index bc59760eb..7fd24d159 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -802,6 +802,8 @@ define([ saveTxtReplyId = uids[i] + '-R'; comment = this.findComment(saveTxtId); + if (!comment) continue; + if (this.subEditStrings[saveTxtId] && !hint) { comment.set('editTextInPopover', true); text = this.subEditStrings[saveTxtId]; @@ -905,6 +907,8 @@ define([ saveTxtReplyId = uids[i] + '-R'; comment = this.findComment(saveTxtId); + if (!comment) continue; + if (this.subEditStrings[saveTxtId]) { comment.set('editTextInPopover', true); text = this.subEditStrings[saveTxtId]; From 24f1b6d1ab0251dcdcdf3986d8634ead75d55ae7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Nov 2017 10:10:56 +0300 Subject: [PATCH 4/6] Bug with removing and adding items from listview. --- apps/common/main/lib/component/ListView.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/component/ListView.js b/apps/common/main/lib/component/ListView.js index b080a5100..aa2e457af 100644 --- a/apps/common/main/lib/component/ListView.js +++ b/apps/common/main/lib/component/ListView.js @@ -72,11 +72,11 @@ define([ model: record }); - if (!this.innerEl) { + if (!this.innerEl) this.innerEl = $(this.el).find('.inner'); - this.innerEl.find('.empty-text').remove(); - } + if (view && this.innerEl) { + this.innerEl.find('.empty-text').remove(); if (this.options.simpleAddMode) { this.innerEl.append(view.render().el) } else { From 7d9f2d22b3090509080a13363f1b3819f12f9239 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 8 Nov 2017 14:19:44 +0300 Subject: [PATCH 5/6] Bug with creating several synchronize tips. --- .../main/lib/component/SynchronizeTip.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index a6c3f24ed..c8146b1cc 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -39,8 +39,6 @@ define([ 'use strict'; Common.UI.SynchronizeTip = Common.UI.BaseView.extend(_.extend((function() { - var tipEl; - return { options : { target : $(document.body), @@ -71,36 +69,38 @@ define([ }, render: function() { - tipEl = $(this.template({ scope: this })); - tipEl.find('.close').on('click', _.bind(function() { this.trigger('closeclick');}, this)); - tipEl.find('.show-link label').on('click', _.bind(function() { this.trigger('dontshowclick');}, this)); + if (!this.cmpEl) { + this.cmpEl = $(this.template({ scope: 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(); return this; }, show: function(){ - if (tipEl) { + if (this.cmpEl) { this.applyPlacement(); - tipEl.show() + this.cmpEl.show() } else this.render(); }, hide: function() { - if (tipEl) tipEl.hide(); + if (this.cmpEl) this.cmpEl.hide(); }, applyPlacement: function () { 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'}) - : tipEl.css({top : showxy.top + this.target.height()/2 + 'px', left: showxy.left + this.target.width() + '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'}) + : this.cmpEl.css({top : showxy.top + this.target.height()/2 + 'px', left: showxy.left + this.target.width() + 'px'}); }, isVisible: function() { - return tipEl && tipEl.is(':visible'); + return this.cmpEl && this.cmpEl.is(':visible'); }, textDontShow : 'Don\'t show this message again', From d3f6cc3443b96349cf492c92d507d32f8d0cb5d3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 9 Nov 2017 11:39:11 +0300 Subject: [PATCH 6/6] [SSE] Fix Bug 36290. --- apps/common/main/lib/component/DataView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 5aa890434..01c399756 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -718,10 +718,11 @@ define([ var el = $(this.dataViewItems[0].el), itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')), offsetLeft = this.$el.offset().left, + offsetTop = el.offset().top, prevtop = -1, topIdx = 0, leftIdx = 0; for (var i=0; iprevtop) { prevtop = top;