diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index c1cc0ea62..b0118523e 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -163,6 +163,9 @@ define([ _intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls')); $filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height')); + + toolbar = me.getApplication().getController('Toolbar').getView(); + toolbar.btnCollabChanges = me.header.btnSave; } }, diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 6d80c3200..bd7495fea 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -100,7 +100,6 @@ define([ 'save:disabled' : function (state) { if ( me.header.btnSave ) me.header.btnSave.setDisabled(state); - console.log('header save: ' + state); } }, // Events generated by main view @@ -167,6 +166,9 @@ define([ _intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls')); $filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height')); + + toolbar = me.getApplication().getController('Toolbar').getView('Toolbar'); + toolbar.btnCollabChanges = me.header.btnSave; } }, diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index 9998b0722..93ddc559a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -76,6 +76,11 @@ define([ var config = SSE.getController('Main').appOptions; toolbar.setExtra('right', me.header.getPanel('right', config)); toolbar.setExtra('left', me.header.getPanel('left', config)); + + if ( me.appConfig && me.appConfig.isDesktopApp && + me.appConfig.isEdit && toolbar.btnCollabChanges ) + toolbar.btnCollabChanges = me.header.btnSave; + }, 'view:compact' : function (toolbar, state) { me.viewport.vlayout.getItem('toolbar').height = state ?