From 15d09b07332b71dea5a49446f6a04647afb55dad Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 3 Feb 2017 11:42:53 +0300 Subject: [PATCH] [DE/PE mobile] Fixed display context menu for deploy version. --- .../mobile/app/controller/DocumentHolder.js | 5 +++++ apps/documenteditor/mobile/app/view/DocumentHolder.js | 5 ++++- .../mobile/app/controller/DocumentHolder.js | 9 +++++++-- .../presentationeditor/mobile/app/view/DocumentHolder.js | 4 +++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/DocumentHolder.js b/apps/documenteditor/mobile/app/controller/DocumentHolder.js index 0c171546b..2e0c9d42a 100644 --- a/apps/documenteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/controller/DocumentHolder.js @@ -86,6 +86,7 @@ define([ me.api.asc_registerCallback('asc_onHideForeignCursorLabel', _.bind(me.onApiHideForeignCursorLabel, me)); me.api.asc_registerCallback('asc_onAuthParticipantsChanged',_.bind(me.onApiUsersChanged, me)); me.api.asc_registerCallback('asc_onConnectionStateChanged', _.bind(me.onApiUserConnection, me)); + me.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(me.onApiDocumentContentReady, me)); me.api.asc_coAuthoringGetUsers(); }, @@ -259,6 +260,10 @@ define([ } }, + onApiDocumentContentReady: function () { + _view = this.createView('DocumentHolder').render(); + }, + // Internal _openLink: function(url) { diff --git a/apps/documenteditor/mobile/app/view/DocumentHolder.js b/apps/documenteditor/mobile/app/view/DocumentHolder.js index b4310296a..c9b3625f4 100644 --- a/apps/documenteditor/mobile/app/view/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/view/DocumentHolder.js @@ -68,7 +68,10 @@ define([ // Render layout render: function() { var el = $(this.el); - el.append(this.template({})); + + if (el.length > 0 && el.find('#' + _anchorId).length < 1) { + el.append(this.template()); + } return this; }, diff --git a/apps/presentationeditor/mobile/app/controller/DocumentHolder.js b/apps/presentationeditor/mobile/app/controller/DocumentHolder.js index 4e4535f0e..34da8550d 100644 --- a/apps/presentationeditor/mobile/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/mobile/app/controller/DocumentHolder.js @@ -77,8 +77,9 @@ define([ me.api = api; - me.api.asc_registerCallback('asc_onShowPopMenu', _.bind(me.onApiShowPopMenu, me)); - me.api.asc_registerCallback('asc_onHidePopMenu', _.bind(me.onApiHidePopMenu, me)); + me.api.asc_registerCallback('asc_onShowPopMenu', _.bind(me.onApiShowPopMenu, me)); + me.api.asc_registerCallback('asc_onHidePopMenu', _.bind(me.onApiHidePopMenu, me)); + me.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(me.onApiDocumentContentReady, me)); }, setMode: function (mode) { @@ -161,6 +162,10 @@ define([ _view && _view.hideMenu(); }, + onApiDocumentContentReady: function () { + _view = this.createView('DocumentHolder').render(); + }, + // Internal _openLink: function(url) { diff --git a/apps/presentationeditor/mobile/app/view/DocumentHolder.js b/apps/presentationeditor/mobile/app/view/DocumentHolder.js index de46fad96..db0377eb8 100644 --- a/apps/presentationeditor/mobile/app/view/DocumentHolder.js +++ b/apps/presentationeditor/mobile/app/view/DocumentHolder.js @@ -68,7 +68,9 @@ define([ // Render layout render: function() { var el = $(this.el); - el.append(this.template({})); + if (el.length > 0 && el.find('#' + _anchorId).length < 1) { + el.append(this.template()); + } return this; },