You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/02/20 22:57:05 UTC
svn commit: r1448436 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/views/common/chart/linear_time.js
Author: yusaku
Date: Wed Feb 20 21:57:04 2013
New Revision: 1448436
URL: http://svn.apache.org/r1448436
Log:
AMBARI-1452. Graphs look broken when network connectivity is lost between Ambari Web and Ambari Server. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/views/common/chart/linear_time.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1448436&r1=1448435&r2=1448436&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 20 21:57:04 2013
@@ -298,6 +298,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1452. Graphs look broken when network connectivity is lost between
+ Ambari Web and Ambari Server. (yusaku)
+
AMBARI-1441. Validation for username used in service configs is broken.
(yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/views/common/chart/linear_time.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/chart/linear_time.js?rev=1448436&r1=1448435&r2=1448436&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/common/chart/linear_time.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/common/chart/linear_time.js Wed Feb 20 21:57:04 2013
@@ -173,9 +173,18 @@ App.ChartLinearTimeView = Ember.View.ext
* @type: Function
*/
_showMessage: function(type, title, message){
- var chartOverlayId = '#' + this.id + '-chart';
+ var chartOverlay = '#' + this.id;
+ var chartOverlayId = chartOverlay + '-chart';
+ var chartOverlayY = chartOverlay + '-yaxis';
+ var chartOverlayX = chartOverlay + '-xaxis';
+ var chartOverlayLegend = chartOverlay + '-legend';
+ var chartOverlayTimeline = chartOverlay + '-timeline';
if (this.get('isPopup')) {
chartOverlayId += this.get('popupSuffix');
+ chartOverlayY += this.get('popupSuffix');
+ chartOverlayX += this.get('popupSuffix');
+ chartOverlayLegend += this.get('popupSuffix');
+ chartOverlayTimeline += this.get('popupSuffix');
}
var typeClass;
switch (type) {
@@ -192,7 +201,7 @@ App.ChartLinearTimeView = Ember.View.ext
typeClass = '';
break;
}
- $(chartOverlayId).html('');
+ $(chartOverlayId+', '+chartOverlayY+', '+chartOverlayX+', '+chartOverlayLegend+', '+chartOverlayTimeline).html('');
$(chartOverlayId).append('<div class=\"alert '+typeClass+'\"><strong>'+title+'</strong> '+message+'</div>');
},