For Bug 57103: fix document name resizing in edit mode
This commit is contained in:
parent
2e43d25387
commit
73e3b370a5
|
@ -209,11 +209,24 @@ define([
|
||||||
function updateDocNamePosition(config) {
|
function updateDocNamePosition(config) {
|
||||||
if ( $labelDocName && config) {
|
if ( $labelDocName && config) {
|
||||||
var $parent = $labelDocName.parent();
|
var $parent = $labelDocName.parent();
|
||||||
if (!config.isEdit || !config.customization || !config.customization.compactHeader) {
|
if (!config.isEdit) {
|
||||||
var _left_width = $parent.position().left,
|
var _left_width = $parent.position().left,
|
||||||
_right_width = $parent.next().outerWidth();
|
_right_width = $parent.next().outerWidth();
|
||||||
$parent.css('padding-left', _left_width < _right_width ? Math.max(2, _right_width - _left_width) : 2);
|
$parent.css('padding-left', _left_width < _right_width ? Math.max(2, _right_width - _left_width) : 2);
|
||||||
$parent.css('padding-right', _left_width < _right_width ? 2 : Math.max(2, _left_width - _right_width));
|
$parent.css('padding-right', _left_width < _right_width ? 2 : Math.max(2, _left_width - _right_width));
|
||||||
|
} else if (!(config.customization && config.customization.compactHeader)) {
|
||||||
|
var _left_width = $parent.position().left,
|
||||||
|
_right_width = $parent.next().outerWidth(),
|
||||||
|
outerWidth = $labelDocName.outerWidth(),
|
||||||
|
cssWidth = $labelDocName[0].style.width;
|
||||||
|
cssWidth = cssWidth ? parseFloat(cssWidth) : outerWidth;
|
||||||
|
if (cssWidth - outerWidth > 0.1) {
|
||||||
|
$parent.css('padding-left', _left_width < _right_width ? Math.max(2, $parent.outerWidth() - 2 - cssWidth) : 2);
|
||||||
|
$parent.css('padding-right', _left_width < _right_width ? 2 : Math.max(2, $parent.outerWidth() - 2 - cssWidth));
|
||||||
|
} else {
|
||||||
|
$parent.css('padding-left', _left_width < _right_width ? Math.max(2, Math.min(_right_width - _left_width + 2, $parent.outerWidth() - 2 - cssWidth)) : 2);
|
||||||
|
$parent.css('padding-right', _left_width < _right_width ? 2 : Math.max(2, Math.min(_left_width - _right_width + 2, $parent.outerWidth() - 2 - cssWidth)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(config.customization && config.customization.toolbarHideFileName) && (!config.isEdit || config.customization && config.customization.compactHeader)) {
|
if (!(config.customization && config.customization.toolbarHideFileName) && (!config.isEdit || config.customization && config.customization.compactHeader)) {
|
||||||
|
@ -226,6 +239,12 @@ define([
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function onResize() {
|
||||||
|
if (appConfig && appConfig.isEdit && !(appConfig.customization && appConfig.customization.compactHeader)) {
|
||||||
|
updateDocNamePosition(appConfig);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function onAppShowed(config) {
|
function onAppShowed(config) {
|
||||||
// config.isCrypted =true; //delete fore merge!
|
// config.isCrypted =true; //delete fore merge!
|
||||||
if ( $labelDocName ) {
|
if ( $labelDocName ) {
|
||||||
|
@ -352,6 +371,9 @@ define([
|
||||||
|
|
||||||
if (me.btnSearch)
|
if (me.btnSearch)
|
||||||
me.btnSearch.updateHint(me.tipSearch + Common.Utils.String.platformKey('Ctrl+F'));
|
me.btnSearch.updateHint(me.tipSearch + Common.Utils.String.platformKey('Ctrl+F'));
|
||||||
|
|
||||||
|
if (appConfig.isEdit && !(appConfig.customization && appConfig.customization.compactHeader))
|
||||||
|
Common.NotificationCenter.on('window:resize', onResize);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onFocusDocName(e){
|
function onFocusDocName(e){
|
||||||
|
@ -779,6 +801,7 @@ define([
|
||||||
this.imgCrypted.toggleClass('hidden', false);
|
this.imgCrypted.toggleClass('hidden', false);
|
||||||
this._showImgCrypted = false;
|
this._showImgCrypted = false;
|
||||||
}
|
}
|
||||||
|
(width>=0) && onResize();
|
||||||
},
|
},
|
||||||
|
|
||||||
getTextWidth: function(text) {
|
getTextWidth: function(text) {
|
||||||
|
|
Loading…
Reference in a new issue