diff --git a/apps/common/main/lib/component/ListView.js b/apps/common/main/lib/component/ListView.js index 39bb03d0b..0c9e99262 100644 --- a/apps/common/main/lib/component/ListView.js +++ b/apps/common/main/lib/component/ListView.js @@ -73,11 +73,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 { diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index 5d2c2018e..cb1aa968c 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -104,7 +104,6 @@ define([ applyPlacement: function () { var showxy = this.target.offset(); - 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'}); else if (this.placement == 'left') 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]; diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 9311fe8cb..d598967e4 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 39572709c..b8d13aec9 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -300,7 +300,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); @@ -314,7 +315,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/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js index 0c664a3bf..a2d60240a 100644 --- a/apps/presentationeditor/main/app/view/DocumentPreview.js +++ b/apps/presentationeditor/main/app/view/DocumentPreview.js @@ -350,8 +350,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(); } diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 7eef7efca..429eecc54 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 d8c29f1bb..f02790f27 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 fbe11d38d..5fa45fac2 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -339,7 +339,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); @@ -353,7 +354,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 7d38ea71d..e3307789b 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));