fix bug 36857
This commit is contained in:
parent
274c785296
commit
159b26aac5
|
@ -208,7 +208,8 @@ define([
|
||||||
appConfig = mode;
|
appConfig = mode;
|
||||||
|
|
||||||
var me = this;
|
var me = this;
|
||||||
me.btnGoBack.updateHint(me.textBack);
|
if ( !me.branding.goback )
|
||||||
|
me.btnGoBack.updateHint(me.textBack);
|
||||||
me.btnGoBack.on('click', function (e) {
|
me.btnGoBack.on('click', function (e) {
|
||||||
Common.NotificationCenter.trigger('goback', true);
|
Common.NotificationCenter.trigger('goback', true);
|
||||||
});
|
});
|
||||||
|
@ -475,11 +476,17 @@ define([
|
||||||
|
|
||||||
this.branding = value;
|
this.branding = value;
|
||||||
|
|
||||||
if (value && value.logo && value.logo.image) {
|
if ( value ) {
|
||||||
element = $('#header-logo');
|
if ( value.logo && value.logo.image ) {
|
||||||
if ( element ) {
|
element = $('#header-logo');
|
||||||
element.html('<img src="' + value.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
|
if (element) {
|
||||||
element.css({'background-image': 'none', width: 'auto'});
|
element.html('<img src="' + value.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
|
||||||
|
element.css({'background-image': 'none', width: 'auto'});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !!value.goback ) {
|
||||||
|
this.btnGoBack.updateHint(value.goback.text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue