From 24e1663035b59f8453967e7e4320230b2bea3f29 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2016 10:23:02 +0300 Subject: [PATCH 1/6] [SSE] Use asc_getLockedTable() instead of cellinfo.asc_getLocked() for detecting if the table is locked. --- .../main/app/controller/DocumentHolder.js | 13 ++++++++++--- .../main/app/controller/RightMenu.js | 9 +++++---- .../main/app/controller/Toolbar.js | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index f44238bf1..4581048a5 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1141,6 +1141,7 @@ define([ documentHolder = this.documentHolder, seltype = cellinfo.asc_getFlags().asc_getSelectionType(), isCellLocked = cellinfo.asc_getLocked(), + isTableLocked = cellinfo.asc_getLockedTable()===true, isObjLocked = false, commentsController = this.getApplication().getController('Common.Controllers.Comments'), insfunc = false, @@ -1341,9 +1342,15 @@ define([ item.setDisabled(isCellLocked); }); documentHolder.pmiCopy.setDisabled(false); - documentHolder.pmiFilterCells.setDisabled(isCellLocked || (filterInfo==null)); - documentHolder.pmiSortCells.setDisabled(isCellLocked || (filterInfo==null)); - documentHolder.pmiReapply.setDisabled(isCellLocked || (isApplyAutoFilter!==true)); + documentHolder.pmiInsertEntire.setDisabled(isCellLocked || isTableLocked); + documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked); + documentHolder.pmiInsertTable.setDisabled(isCellLocked || isTableLocked); + documentHolder.pmiDeleteEntire.setDisabled(isCellLocked || isTableLocked); + documentHolder.pmiDeleteCells.setDisabled(isCellLocked || isTableLocked); + documentHolder.pmiDeleteTable.setDisabled(isCellLocked || isTableLocked); + documentHolder.pmiFilterCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null)); + documentHolder.pmiSortCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null)); + documentHolder.pmiReapply.setDisabled(isCellLocked || isTableLocked|| (isApplyAutoFilter!==true)); if (showMenu) this.showPopupMenu(documentHolder.ssMenu, {}, event); } else if (this.permissions.isEditDiagram && seltype == Asc.c_oAscSelectionType.RangeChartText) { if (!showMenu && !documentHolder.textInShapeMenu.isVisible()) return; diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index f36375fe8..ff0bb512e 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -121,9 +121,10 @@ define([ this._openRightMenu = true; } - var need_disable = info.asc_getLocked(); + var need_disable = info.asc_getLocked(), + need_disable_table = (info.asc_getLockedTable()===true); - this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable); + this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable, need_disable_table); if (this._state.prevDisabled != need_disable) { this._state.prevDisabled = need_disable; @@ -133,7 +134,7 @@ define([ } }, - onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked) { + onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked, isTableLocked) { if (!this.editMode) return; @@ -174,7 +175,7 @@ define([ if (formatTableInfo) { settingsType = Common.Utils.documentSettingsType.Table; this._settings[settingsType].props = formatTableInfo; - this._settings[settingsType].locked = isCellLocked; + this._settings[settingsType].locked = isTableLocked; this._settings[settingsType].hidden = 0; } diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 52106061d..8d25e2dea 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1604,7 +1604,7 @@ define([ if (!this.editMode) return; var selectionType = info.asc_getFlags().asc_getSelectionType(), - coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false, + coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true || info.asc_getLockedTable()===true) : false, editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable), me = this, toolbar = this.toolbar, From 0fe19076eebaeb56d9ed532f4e89f96adb9de866 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2016 11:36:52 +0300 Subject: [PATCH 2/6] [SSE] Lock text editing in the toolbar when shape/chart is selected and locked --- .../main/app/controller/RightMenu.js | 1 - .../main/app/controller/Toolbar.js | 16 +++++++- .../main/app/view/Toolbar.js | 39 ++++++++++--------- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index ff0bb512e..f181ceec4 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -147,7 +147,6 @@ define([ for (i=0; i=this._settings.length || this._settings[settingsType]===undefined) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 8d25e2dea..1a8b32f99 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2345,7 +2345,6 @@ define([ _disableEditOptions: function(seltype, coauth_disable) { if (this.api.isCellEdited) return true; if (this.api.isRangeSelection) return true; - if (this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage); var toolbar = this.toolbar, is_chart_text = seltype == Asc.c_oAscSelectionType.RangeChartText, @@ -2353,7 +2352,19 @@ define([ is_shape_text = seltype == Asc.c_oAscSelectionType.RangeShapeText, is_shape = seltype == Asc.c_oAscSelectionType.RangeShape, is_image = seltype == Asc.c_oAscSelectionType.RangeImage, - is_mode_2 = is_shape_text || is_shape || is_chart_text || is_chart; + is_mode_2 = is_shape_text || is_shape || is_chart_text || is_chart, + is_objLocked = false; + + if (!(is_mode_2 || is_image) && this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage); + + if (is_mode_2) { + var SelectedObjects = this.api.asc_getGraphicObjectProps(); + for (var i=0; i') }, @@ -302,7 +303,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-fillparag', split : true, - lock : [_set.selImage, _set.editCell, _set.coAuth, _set.lostConnect], + lock : [_set.selImage, _set.editCell, _set.coAuth, _set.coAuthText, _set.lostConnect], menu : new Common.UI.Menu({ items: [ { template: _.template('
') }, @@ -337,7 +338,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-align-left', enableToggle: true, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'alignGroup' }); @@ -346,7 +347,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-align-center', enableToggle: true, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'alignGroup' }); @@ -355,7 +356,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-align-right', enableToggle: true, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'alignGroup' }); @@ -364,7 +365,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-align-just', enableToggle: true, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup: 'alignGroup' }); @@ -402,7 +403,7 @@ define([ id : 'id-toolbar-rtn-valign-top', cls : 'btn-toolbar', iconCls : 'btn-valign-top', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], enableToggle: true, toggleGroup : 'vAlignGroup' }); @@ -412,7 +413,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-valign-middle', enableToggle: true, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], toggleGroup : 'vAlignGroup' }); @@ -420,7 +421,7 @@ define([ id : 'id-toolbar-rtn-valign-bottom', cls : 'btn-toolbar', iconCls : 'btn-valign-bottom', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], enableToggle: true, toggleGroup : 'vAlignGroup' }); @@ -438,7 +439,7 @@ define([ id : 'id-toolbar-rtn-textorient', cls : 'btn-toolbar', iconCls : 'btn-text-orient', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], menu : new Common.UI.Menu({ items: [ { @@ -961,7 +962,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-align-left', icls : 'btn-align-left', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText], menu : new Common.UI.Menu({ items: [ { @@ -1010,7 +1011,7 @@ define([ cls : 'btn-toolbar', iconCls : 'btn-valign-bottom', icls : 'btn-valign-bottom', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText], menu : new Common.UI.Menu({ items: [ { From 4939665d9fc7ddf70194bb6001dbef71db995077 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2016 12:42:43 +0300 Subject: [PATCH 3/6] [PE] Fix Bug 33519. When starting preview in the Chrome browser in fullscreen mode (F11) resize event isn't fired. --- .../main/app/controller/Statusbar.js | 8 +++++++- .../main/app/controller/Toolbar.js | 8 +++++++- .../main/app/view/DocumentHolder.js | 14 +++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js index 197be4478..cbd11c786 100644 --- a/apps/presentationeditor/main/app/controller/Statusbar.js +++ b/apps/presentationeditor/main/app/controller/Statusbar.js @@ -122,10 +122,13 @@ define([ onPreview: function(btn, e) { var previewPanel = PE.getController('Viewport').getView('DocumentPreview'), - me = this; + me = this, + isResized = false; if (previewPanel && me.api) { previewPanel.show(); var onWindowResize = function() { + if (isResized) return; + isResized = true; Common.NotificationCenter.off('window:resize', onWindowResize); var current = me.api.getCurrentPage(); @@ -136,6 +139,9 @@ define([ if (!me.statusbar.mode.isDesktopApp && !Common.Utils.isIE11) { Common.NotificationCenter.on('window:resize', onWindowResize); me.fullScreen(document.documentElement); + setTimeout(function(){ + onWindowResize(); + }, 100); } else onWindowResize(); } diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 1f8be2c25..2bfe4873a 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -763,10 +763,13 @@ define([ onPreview: function(slidenum) { var previewPanel = PE.getController('Viewport').getView('DocumentPreview'), - me = this; + me = this, + isResized = false; if (previewPanel && me.api) { previewPanel.show(); var onWindowResize = function() { + if (isResized) return; + isResized = true; Common.NotificationCenter.off('window:resize', onWindowResize); me.api.StartDemonstration('presentation-preview', _.isNumber(slidenum) ? slidenum : 0); Common.component.Analytics.trackEvent('ToolBar', 'Preview'); @@ -774,6 +777,9 @@ define([ if (!me.toolbar.mode.isDesktopApp && !Common.Utils.isIE11) { Common.NotificationCenter.on('window:resize', onWindowResize); me.fullScreen(document.documentElement); + setTimeout(function(){ + onWindowResize(); + }, 100); } else onWindowResize(); } diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index fbcdb1157..2cb7d9685 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1291,6 +1291,7 @@ define([ var hkPreview = 'command+f5,ctrl+f5'; keymap[hkPreview] = function(e) { + var isResized = false; e.preventDefault(); e.stopPropagation(); if (me.slidesCount>0) { @@ -1298,12 +1299,17 @@ define([ if (previewPanel && !previewPanel.isVisible() && me.api) { previewPanel.show(); var onWindowResize = function() { + if (isResized) return; + isResized = true; Common.NotificationCenter.off('window:resize', onWindowResize); me.api.StartDemonstration('presentation-preview', 0); }; if (!me.mode.isDesktopApp && !Common.Utils.isIE11) { Common.NotificationCenter.on('window:resize', onWindowResize); me.fullScreen(document.documentElement); + setTimeout(function(){ + onWindowResize(); + }, 100); } else onWindowResize(); } @@ -1558,10 +1564,13 @@ define([ var mnuPreview = new Common.UI.MenuItem({ caption : me.txtPreview }).on('click', function(item) { - var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); + var previewPanel = PE.getController('Viewport').getView('DocumentPreview'), + isResized = false; if (previewPanel && me.api) { previewPanel.show(); var onWindowResize = function() { + if (isResized) return; + isResized = true; Common.NotificationCenter.off('window:resize', onWindowResize); var current = me.api.getCurrentPage(); @@ -1572,6 +1581,9 @@ define([ if (!me.mode.isDesktopApp && !Common.Utils.isIE11) { Common.NotificationCenter.on('window:resize', onWindowResize); me.fullScreen(document.documentElement); + setTimeout(function(){ + onWindowResize(); + }, 100); } else onWindowResize(); } From 09ce1fb212299db758380ee9ad2dab3bc7228ead Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2016 15:26:22 +0300 Subject: [PATCH 4/6] [SSE] Fix Bug 33509. --- .../main/app/controller/RightMenu.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index f181ceec4..403f6f009 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -122,19 +122,13 @@ define([ } var need_disable = info.asc_getLocked(), - need_disable_table = (info.asc_getLockedTable()===true); + need_disable_table = (info.asc_getLockedTable()===true), + need_disable_spark = (info.asc_getLockedSparkline()===true); - this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable, need_disable_table); - - if (this._state.prevDisabled != need_disable) { - this._state.prevDisabled = need_disable; - this._settings.forEach(function(item){ - item.panel.setLocked(need_disable); - }); - } + this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable, need_disable_table, need_disable_spark); }, - onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked, isTableLocked) { + onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked, isTableLocked, isSparkLocked) { if (!this.editMode) return; @@ -181,7 +175,7 @@ define([ if (sparkLineInfo) { settingsType = Common.Utils.documentSettingsType.Chart; this._settings[settingsType].props = sparkLineInfo; - this._settings[settingsType].locked = isCellLocked; + this._settings[settingsType].locked = isSparkLocked; this._settings[settingsType].hidden = 0; } From fe0026bc3050fc844f1b4ca3c6e3b32dcb6ac1d8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2016 15:30:38 +0300 Subject: [PATCH 5/6] [SSE] Fix bug with layout for username-tip on the locked sheet. --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 4581048a5..f170bf418 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -936,12 +936,10 @@ define([ $(document.body).append(src); showPoint = [ - coAuthTip.x_point + coAuthTip.XY[0], + (is_sheet_lock) ? (coAuthTip.x_point + coAuthTip.rightMenuWidth) : (coAuthTip.bodyWidth - (coAuthTip.x_point + coAuthTip.XY[0])), coAuthTip.y_point + coAuthTip.XY[1] ]; - !is_sheet_lock && (showPoint[0] = coAuthTip.bodyWidth - showPoint[0]); - if (showPoint[1] > coAuthTip.XY[1] && showPoint[1] + coAuthTip.ttHeight < coAuthTip.XY[1] + coAuthTip.apiHeight) { src.text(getUserName(data.asc_getUserId())); @@ -1042,6 +1040,7 @@ define([ me.documentHolder.cmpEl.offset().top - $(window).scrollTop() ]; me.tooltips.coauth.apiHeight = me.documentHolder.cmpEl.height(); + me.tooltips.coauth.rightMenuWidth = $('#right-menu').width(); me.tooltips.coauth.bodyWidth = $(window).width(); } }, From e82da5ebab5be857e5d20a7fd0bdebd4e6d1b776 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 24 Nov 2016 16:44:54 +0300 Subject: [PATCH 6/6] Added "token" parameter to api config. --- apps/api/documents/api.js | 2 ++ apps/documenteditor/embed/js/ApplicationController.js | 1 + apps/documenteditor/main/app/controller/Main.js | 1 + apps/presentationeditor/embed/js/ApplicationController.js | 1 + apps/presentationeditor/main/app/controller/Main.js | 1 + apps/spreadsheeteditor/embed/js/ApplicationController.js | 1 + apps/spreadsheeteditor/main/app/controller/Main.js | 1 + 7 files changed, 8 insertions(+) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 0c5dca4a1..adbc4a6d9 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -336,6 +336,8 @@ window.alert("The \"document.key\" parameter for the config object must be string. Please correct it."); return false; } + + _config.document.token = _config.token; } return true; diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 63b60ba13..b8fb4c006 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -96,6 +96,7 @@ var ApplicationController = new(function(){ docInfo.put_Title(docConfig.title); docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); + docInfo.put_Token(docConfig.token); if (api) { api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index b23131073..b7a44bdcd 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -285,6 +285,7 @@ define([ docInfo.put_Options(data.doc.options); docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); + docInfo.put_Token(data.doc.token); // docInfo.put_Review(this.permissions.review); // docInfo.put_OfflineApp(this.editorConfig.nativeApp === true); // used in sdk for testing } diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 7712307e8..2a718c69e 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -97,6 +97,7 @@ var ApplicationController = new(function(){ docInfo.put_Title(docConfig.title); docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); + docInfo.put_Token(docConfig.token); 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 6b530a4bf..3b0902b50 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -273,6 +273,7 @@ define([ docInfo.put_Options(data.doc.options); docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); + docInfo.put_Token(data.doc.token); //docInfo.put_OfflineApp(this.editorConfig.nativeApp === true); } diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 4da663271..30924a817 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -95,6 +95,7 @@ var ApplicationController = new(function(){ docInfo.put_Title(docConfig.title); docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); + docInfo.put_Token(docConfig.token); 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 d0c371a1f..90590058d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -307,6 +307,7 @@ define([ docInfo.put_Options(data.doc.options); docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); + docInfo.put_Token(data.doc.token); this.headerView.setDocumentCaption(data.doc.title); }