You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/11/09 11:41:51 UTC
svn commit: r1768914 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources:
css/common.css js/qpid/common/util.js js/qpid/management/showMessage.js
showMessage.html
Author: kwall
Date: Wed Nov 9 11:41:51 2016
New Revision: 1768914
URL: http://svn.apache.org/viewvc?rev=1768914&view=rev
Log:
QPID-7409: [Java Broker] WMC: Show Message - Omit preview/content download for messages with no application content
* Correct CSS syntax
* Use alternative to Number.isInteger if not available on platform
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1768914&r1=1768913&r2=1768914&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css Wed Nov 9 11:41:51 2016
@@ -683,8 +683,7 @@ td.advancedSearchField, col.autoWidth {
.hexDumpHeadRow
{
- .hexDumpRow;
- display: table-header-group;
+ display: table-row;
font-family: monospace;
font-weight: bold;
}
@@ -696,9 +695,10 @@ td.advancedSearchField, col.autoWidth {
.hexCountCell
{
- .hexDumpCell;
padding-right: 25px;
font-weight: bold;
+ display: table-cell;
+ font-family: monospace;
}
.hexDumpCell
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1768914&r1=1768913&r2=1768914&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js Wed Nov 9 11:41:51 2016
@@ -75,6 +75,22 @@ define(["dojo/_base/xhr",
updater)
{
var util = {};
+
+ if (Number.isInteger)
+ {
+ util.isInteger = function(value)
+ {
+ return Number.isInteger(value);
+ };
+ }
+ else
+ {
+ util.isInteger = function(value)
+ {
+ return typeof value === "number" && isFinite(value) && Math.floor(value) === value;
+ };
+ }
+
if (Array.isArray)
{
util.isArray = function (object)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js?rev=1768914&r1=1768913&r2=1768914&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js Wed Nov 9 11:41:51 2016
@@ -116,7 +116,7 @@ define(["dojo/dom",
for (var i = 0; i < contentData.length; i++)
{
var element = contentData[i];
- if (!Number.isInteger(element) || element < -128 || element > 127)
+ if (!util.isInteger(element) || element < -128 || element > 127)
{
isByteArray = false;
break;
@@ -237,7 +237,7 @@ define(["dojo/dom",
}
}
- var preview = query('#preview', this.dialogNode)[0];
+ var contentAndPreview = query('#contentAndPreview', this.dialogNode)[0];
var confidentialInformationWarning = query('#confidentialInformationWarning', this.dialogNode)[0];
confidentialInformationWarning.style.display = includesConfidential ? "none" : "block";
var confidentialCells = query('.confidential', this.dialogNode);
@@ -266,19 +266,12 @@ define(["dojo/dom",
});
var limit = 1024;
- preview.style.display = "block";
- var previewDetail = query('#preview-detail', preview)[0];
- previewDetail.innerHTML = (limit < data.size
- ? 'showing the first ' + limit + ' of ' + data.size + ' bytes'
- : 'showing all ' + data.size + ' bytes');
- var previewContent = query("#message-content-preview", preview)[0];
var previewParameters = lang.mixin({
limit: limit,
returnJson: true
}, parameters);
management.load(contentModelObj, previewParameters, {
- handleAs: "text",
- headers: {"Content-Type": data.mimeType}
+ handleAs: "json"
})
.then(function (content)
{
@@ -286,13 +279,26 @@ define(["dojo/dom",
{
showMessage.previewWidget.destroyRecursive();
}
- var widgetDiv = construct.create("div", null, previewContent, "last");
- var contentData = json.parse(content);
- var contentWidget = showMessage.createPreviewWidget(contentData, widgetDiv);
- showMessage.previewWidget = contentWidget;
- contentWidget.startup();
- registry.byId("showMessage")
- .show();
+
+ if (content == null || (Array.isArray(content) && content.length == 0))
+ {
+ contentAndPreview.style.display = "none";
+ }
+ else
+ {
+ contentAndPreview.style.display = "block";
+ var previewDetail = query('#preview-detail', contentAndPreview)[0];
+ previewDetail.innerHTML = (limit < data.size
+ ? 'showing the first ' + limit + ' of ' + data.size + ' bytes'
+ : 'showing all ' + data.size + ' bytes');
+ var previewContent = query("#message-content-preview", contentAndPreview)[0];
+
+ var widgetDiv = construct.create("div", null, previewContent, "last");
+ var contentWidget = showMessage.createPreviewWidget(content, widgetDiv);
+ showMessage.previewWidget = contentWidget;
+ contentWidget.startup();
+ }
+ registry.byId("showMessage") .show();
});
}
else
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html?rev=1768914&r1=1768913&r2=1768914&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html Wed Nov 9 11:41:51 2016
@@ -87,12 +87,12 @@
<td style="width: 10em; vertical-align: top"><span style="font-weight: bold;">Content:</span></td>
<td>
<div class="confidential">
- <div id="preview">
+ <div id="contentAndPreview">
Preview (<span id="preview-detail"></span>):<br/>
<div id="message-content-preview"></div>
+ <br/>
+ <input type="button" id="message-download" label="Download Content" dojoType="dijit.form.Button"/>
</div>
- <br/>
- <input type="button" id="message-download" label="Download Content" dojoType="dijit.form.Button"/>
</div>
<div class="confidentialPlaceholder highlightedText">Not available</div>
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org