improve display of custom logo

diff --git a/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx b/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx
index 680654fc37ecdbf61c70f22cb22ae1fb0b231893..1860d5eaf2ab70966162c79588f0b15b71d11207 100644 (file)
--- a/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx
+++ b/server/sonar-web/src/main/js/apps/nav/global/global-nav-branding.jsx
@@ -3,8 +3,8 @@ import React from 'react';
 export default React.createClass({
   renderLogo() {
     let url = this.props.logoUrl || `${window.baseUrl}/images/logo.svg`,
-        width = this.props.logoWidth || null,
-        height = this.props.logoWidth ? 30 : null,
+        width = this.props.logoWidth || 100,
+        height = 30,
         title = window.t('layout.sonar.slogan');
     return <img src={url} width={width} height={height} alt={title} title={title}/>;
   },

diff --git a/server/sonar-web/src/main/js/apps/nav/global/global-nav.jsx b/server/sonar-web/src/main/js/apps/nav/global/global-nav.jsx
index ebbdc07db5c2def4c3c50035bfe376aa85c88880..20aaad64b31d3b844bb2541df1db6203fbec2317 100644 (file)
--- a/server/sonar-web/src/main/js/apps/nav/global/global-nav.jsx
+++ b/server/sonar-web/src/main/js/apps/nav/global/global-nav.jsx
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import _ from 'underscore';
 import React from 'react';
 import GlobalNavBranding from './global-nav-branding';
 import GlobalNavMenu from './global-nav-menu';
@@ -8,7 +9,7 @@ import ShortcutsHelpView from './shortcuts-help-view';
 
 export default React.createClass({
   getInitialState() {
-    return this.props;
+    return _.extend({}, this.props, { ready: false });
   },
 
   componentDidMount() {
@@ -22,7 +23,7 @@ export default React.createClass({
 
   loadGlobalNavDetails() {
     $.get(`${window.baseUrl}/api/navigation/global`).done(r => {
-      this.setState(r);
+      this.setState(_.extend({ ready: true }, r));
     });
   },
 
@@ -42,6 +43,10 @@ export default React.createClass({
   },
 
   render() {
+    if (!this.state.ready) {
+      return null;
+    }
+
     return (
         <div className="container">
           <GlobalNavBranding {...this.state}/>