Skip to content

Commit c51da50

Browse files
committed
better phpDoc summary+desc to title attr
endOutput & meta methods - look for meta values in meta-data before arguments
1 parent 26c0751 commit c51da50

2 files changed

Lines changed: 20 additions & 16 deletions

File tree

src/js/DumpObject.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ var logDumper = (function($, module){
33
module.dumpObject = function(abs) {
44
// console.info('dumpObject', abs);
55
var html = '',
6-
title = (abs.phpDoc.summary + "\n\n" + abs.phpDoc.description).trim(),
6+
title = ((abs.phpDoc.summary || "") + "\n\n" + (abs.phpDoc.description || "")).trim(),
77
strClassName = module.markupClassname(abs.className, "span", {
88
title : title.length ? title : null
99
}),
1010
objToString = '',
1111
toStringVal = null,
1212
toStringLen,
1313
toStringValAppend,
14-
$toStringDump,
15-
title;
14+
$toStringDump;
1615
if (abs.isRecursion) {
1716
html = strClassName +
1817
' <span class="t_recursion">*RECURSION*</span>';

src/js/LogDumper.js

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,14 @@ var logDumper = (function($, module) {
107107
endOutput: function (method, args, meta, info) {
108108
var $container = info.$container,
109109
i,
110-
arg;
110+
arg,
111+
responseCode = meta.responseCode || args.responseCode;
111112
$container.removeClass("working");
112113
$container.find(".panel-heading .fa-spinner").remove();
113114
$container.find(".panel-body > .fa-spinner").remove();
114-
if (args.responseCode && args.responseCode != "200") {
115-
$container.find(".panel-title").append(' <span class="label label-default" title="Response Code">' + args.responseCode + '</span>');
116-
if (args.responseCode.toString().match(/^5/)) {
115+
if (responseCode && responseCode != "200") {
116+
$container.find(".panel-title").append(' <span class="label label-default" title="Response Code">' + responseCode + '</span>');
117+
if (responseCode.toString().match(/^5/)) {
117118
$container.addClass("panel-danger");
118119
}
119120
}
@@ -203,21 +204,22 @@ var logDumper = (function($, module) {
203204
meta: function (method, args, meta, info) {
204205
var i, arg,
205206
$title = info.$container.find(".panel-heading .panel-heading-body .panel-title").html('')
207+
meta = args[0] || args;
206208
info.$container.find(".panel-heading .panel-heading-body .pull-right").remove();
207-
if (args.HTTPS === "on") {
209+
if (meta.HTTPS === "on") {
208210
$title.append('<i class="fa fa-lock fa-lg"></i> ');
209211
}
210-
if (args.REQUEST_METHOD) {
211-
$title.append(args.REQUEST_METHOD + ' ');
212+
if (meta.REQUEST_METHOD) {
213+
$title.append(meta.REQUEST_METHOD + ' ');
212214
}
213-
if (args.HTTP_HOST) {
214-
$title.append('<span class="http-host">' + args.HTTP_HOST + '</span>');
215+
if (meta.HTTP_HOST) {
216+
$title.append('<span class="http-host">' + meta.HTTP_HOST + '</span>');
215217
}
216-
if (args.REQUEST_URI) {
217-
$title.append('<span class="request-uri">' + args.REQUEST_URI + '</span>');
218+
if (meta.REQUEST_URI) {
219+
$title.append('<span class="request-uri">' + meta.REQUEST_URI + '</span>');
218220
}
219-
if (args.REQUEST_TIME) {
220-
var date = (new Date(args.REQUEST_TIME * 1000)).toString().replace(/[A-Z]{3}-\d+/, '');
221+
if (meta.REQUEST_TIME) {
222+
var date = (new Date(meta.REQUEST_TIME * 1000)).toString().replace(/[A-Z]{3}-\d+/, '');
221223
info.$container
222224
.find(".panel-heading .panel-heading-body")
223225
.prepend('<span class="pull-right">'+date+'</span>');
@@ -702,6 +704,9 @@ var logDumper = (function($, module) {
702704
if (indexes['c'].length) {
703705
arg0 += '</span>';
704706
}
707+
if (hasSubs) {
708+
args = [ arg0 ];
709+
}
705710
return args;
706711
}
707712

0 commit comments

Comments
 (0)