From cb5e41fa78a2349dd928d50839df37c4f24bdf23 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 2 Aug 2017 14:52:52 +0300 Subject: [PATCH] [Common] setCanRename caused a error before doc name label wasn't created --- apps/common/main/lib/view/Header.js | 42 ++++++++++++++++------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 789ca95062..6d2728fb06 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -386,6 +386,14 @@ define([ 'keydown': onDocNameKeyDown.bind(this) }); + if ( this.documentCaption ) { + this.labelDocName.text( Common.Utils.String.htmlEncode(this.documentCaption) ); + } + + if ( !_.isUndefined(this.options.canRename) ) { + this.setCanRename(this.options.canRename); + } + $saveStatus = $html.find('#rib-save-status'); $saveStatus.hide(); @@ -431,11 +439,6 @@ define([ } } - if ( this.documentCaption ) { - $html.find('#rib-doc-name').text( - Common.Utils.String.htmlEncode(this.documentCaption) ); - } - $userList = $html.find('.cousers-list'); $panelUsers = $html.find('.box-cousers'); $btnUsers = $html.find('.btn-users'); @@ -518,19 +521,22 @@ define([ setCanRename: function (rename) { rename = false; - var me = this, - label = me.labelDocName; - if ( rename ) { - label.removeAttr('disabled').tooltip({ - title: me.txtRename, - placement: 'cursor'} - ); - } else { - label.attr('disabled', true); - var tip = label.data('bs.tooltip'); - if ( tip ) { - tip.options.title = ''; - tip.setContent(); + var me = this; + me.options.canRename = rename; + if ( me.labelDocName ) { + var label = me.labelDocName; + if ( rename ) { + label.removeAttr('disabled').tooltip({ + title: me.txtRename, + placement: 'cursor'} + ); + } else { + label.attr('disabled', true); + var tip = label.data('bs.tooltip'); + if ( tip ) { + tip.options.title = ''; + tip.setContent(); + } } } },