Skip to content

Commit 51d12b8

Browse files
committed
stringified & common interfaces
1 parent 4f0f213 commit 51d12b8

1 file changed

Lines changed: 22 additions & 20 deletions

File tree

src/js/DumpObject.js

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var logDumper = (function($, module){
1010
})
1111
// var misc = '';
1212
var objToString = '';
13-
var toStringVal = '';
13+
var toStringVal = null;
1414
var toStringLen;
1515
var toStringValAppend;
1616
var $toStringDump;
@@ -22,8 +22,12 @@ var logDumper = (function($, module){
2222
html = strClassName +
2323
' <span class="excluded">(not inspected)</span>';
2424
} else {
25-
if (typeof abs.methods.__toString !== "undefined" && abs.methods.__toString.returnValue) {
25+
if (typeof abs.stringified !== "undefined") {
26+
toStringVal = abs.stringified
27+
} else if (typeof abs.methods.__toString !== "undefined" && abs.methods.__toString.returnValue) {
2628
toStringVal = abs.methods.__toString.returnValue;
29+
}
30+
if (toStringVal) {
2731
toStringLen = toStringVal.length;
2832
toStringValAppend = '';
2933
if (toStringLen > 100) {
@@ -53,7 +57,8 @@ var logDumper = (function($, module){
5357
: ''
5458
) +
5559
(abs.implements.length
56-
? '<dt>implements</dt><dd>' + abs.implements.join('<br />') + '</dd>'
60+
? '<dt>implements</dt>' +
61+
'<dd class="interface">' + abs.implements.join('</dd><dd class="interface">') + '</dd>'
5762
: ''
5863
) +
5964
/*
@@ -131,9 +136,11 @@ var logDumper = (function($, module){
131136
}
132137
});
133138
$.each(abs.methods, function(k, info) {
134-
if (typeof info.visibility == "string") {
135-
info.visibility = atob(info.visibility);
136-
}
139+
$.each(['implements','visibility'], function (i, what) {
140+
if (typeof info[what] == "string" && info[what].length) {
141+
info[what] = atob(info[what]);
142+
}
143+
});
137144
if (info.phpDoc) {
138145
if (typeof info.phpDoc.return != "undefined") {
139146
info.phpDoc.return.desc = atob(info.phpDoc.return.desc);
@@ -143,19 +150,11 @@ var logDumper = (function($, module){
143150
? atob(info.phpDoc.summary) : null;
144151
}
145152
$.each(info.params, function(i,info) {
146-
if (typeof info.type == "string") {
147-
info.type = atob(info.type);
148-
}
149-
if (info.desc) {
150-
info.desc = atob(info.desc);
151-
}
152-
if (info.constantName) {
153-
info.constantName = atob(info.constantName);
154-
}
155-
info.name = atob(info.name);
156-
if (typeof info.defaultValue == "string" && info.defaultValue.length) {
157-
info.defaultValue = atob(info.defaultValue);
158-
}
153+
$.each(['type','desc','constantName','name','defaultValue'], function (i, what) {
154+
if (typeof info[what] == "string" && info[what].length) {
155+
info[what] = atob(info[what]);
156+
}
157+
});
159158
});
160159
});
161160
}
@@ -226,7 +225,7 @@ var logDumper = (function($, module){
226225
var html = '<dt class="methods">' + label + '</dt>';
227226
html += magicMethodInfo(abs, ['__call', '__callStatic']);
228227
$.each(abs.methods, function(k, info) {
229-
// console.info('method info', info);
228+
// console.info('method info', k, info);
230229
var paramStr = dumpMethodParams(info.params);
231230
var modifiers = [];
232231
var returnType = '';
@@ -266,6 +265,9 @@ var logDumper = (function($, module){
266265
if (info.isDeprecated) {
267266
$dd.addClass("deprecated");
268267
}
268+
if (info.implements && info.implements.length) {
269+
$dd.attr("data-implements", info.implements);
270+
}
269271
html += $dd[0].outerHTML;
270272
});
271273
return html;

0 commit comments

Comments
 (0)