lxm_front/eruda
1
0
Fork 0
mirror of https://github.com/liriliri/eruda.git synced 2026-02-02 09:49:00 +08:00
Code Issues Projects Releases Wiki Activity

Dev: Log object abstract

Browse Source
This commit is contained in:
surunzi
2016-06-10 15:21:13 +08:00
parent b5bfec7c30
commit 3a6a9af50d
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "eruda",
"version": "0.6.4",
"version": "0.6.5",
"description": "Console for Mobile Browsers",
"main": "dist/eruda.js",
"scripts": {

38
src/Console/Log.es6
View File

@@ -74,7 +74,18 @@ export default class Log extends util.Emitter
dir(obj)
{
var src = util.isObj(obj) ? extractObj(obj) : obj,
msg = util.isObj(src) ? JSON.stringify(src, null, 4) : transMsg(src, true);
msg;
if (util.isObj(src))
{
msg = JSON.stringify(src, null, 4);
msg = msg.replace(/erudaProto/g, '__proto__')
.replace(/erudaObjAbstract/g, '__abstract__');
} else
{
msg = transMsg(src, true);
}
return this.insert({
type: 'dir',
@@ -334,10 +345,10 @@ function extractSrc(args)
return util.isObj(args[0]) ? extractObj(args[0]) : args[0];
}
var extractObj = (obj, noProto) => JSON.parse(stringify(obj, null, obj, noProto));
var extractObj = (obj, simple) => JSON.parse(stringify(obj, null, obj, simple));
// Modified from: https://jsconsole.com/
function stringify(obj, visited, topObj, noProto)
function stringify(obj, visited, topObj, simple)
{
let json = '',
type = '',
@@ -384,7 +395,7 @@ function stringify(obj, visited, topObj, noProto)
visited.push(obj);
json = '[';
util.each(obj, val => parts.push(`${stringify(val, visited, null, noProto)}`));
util.each(obj, val => parts.push(`${stringify(val, visited, null, simple)}`));
json += parts.join(', ') + ']';
} else if (isObj || isFn)
{
@@ -392,8 +403,8 @@ function stringify(obj, visited, topObj, noProto)
names = Object.getOwnPropertyNames(obj);
proto = Object.getPrototypeOf(obj);
if (proto === Object.prototype || isFn || noProto) proto = null;
if (proto) proto = `"_proto_": ${stringify(proto, visited, topObj)}`;
if (proto === Object.prototype || isFn || simple) proto = null;
if (proto) proto = `"erudaProto": ${stringify(proto, visited, topObj)}`;
names.sort(sortObjName);
if (isFn)
{
@@ -411,11 +422,11 @@ function stringify(obj, visited, topObj, noProto)
// Function length is restricted to 500 for performance reason.
var fnStr = obj.toString();
if (fnStr.length > 500) fnStr = fnStr.slice(0, 500) + '...';
parts.push(`"function": "${escapeJsonStr(fnStr)}"`);
parts.push(`"erudaObjAbstract": "${escapeJsonStr(fnStr)}"`);
}
util.each(names, name =>
{
parts.push(`"${escapeJsonStr(name)}": ${stringify(obj[name], visited, null, noProto)}`);
parts.push(`"${escapeJsonStr(name)}": ${stringify(obj[name], visited, null, simple)}`);
});
if (proto) parts.push(proto);
json += parts.join(', ') + '}';
@@ -443,17 +454,18 @@ function stringify(obj, visited, topObj, noProto)
visited.push(obj);
json = '{\n';
if (!simple) parts.push(`"erudaObjAbstract": "${type.replace(/(\[object )|]/g, '')}"`);
names = Object.getOwnPropertyNames(obj);
proto = Object.getPrototypeOf(obj);
if (proto === Object.prototype || noProto) proto = null;
if (proto === Object.prototype || simple) proto = null;
if (proto)
{
try
{
proto = `"_proto_": ${stringify(proto, visited, topObj)}`;
proto = `"erudaProto": ${stringify(proto, visited, topObj)}`;
} catch(e)
{
proto = `"_proto": "${escapeJsonStr(e.message)}"`;
proto = `"erudaProto": "${escapeJsonStr(e.message)}"`;
}
}
names.sort(sortObjName);
@@ -463,7 +475,7 @@ function stringify(obj, visited, topObj, noProto)
try
{
parts.push(`"${escapeJsonStr(name)}": ${stringify(val, visited, null, noProto)}`);
parts.push(`"${escapeJsonStr(name)}": ${stringify(val, visited, null, simple)}`);
} catch (e)
{
parts.push(`"${escapeJsonStr(name)}": "${escapeJsonStr(e.message)}"`);
@@ -491,7 +503,7 @@ var sortObjName = (a, b) =>
if (isLetter(codeA) && !isLetter(codeB)) return -1;
if (!isLetter(codeA) && isLetter(codeB)) return 1;
return codeA > codeB ? 1 : -1;
return a > b ? 1 : -1;
};
var isLetter = code => (code > 64 && code < 90) || (code > 96 && code < 123);

7
src/Sources/JsonViewer.es6
View File

@@ -24,7 +24,7 @@ export default class JsonViewer
if (!$firstSpan.hasClass('eruda-expanded')) return;
e.stopPropagation();
e.stopImmediatePropagation();
var $ul = $this.find('ul').eq(0);
if ($firstSpan.hasClass('eruda-collapsed'))
@@ -46,6 +46,7 @@ function jsonToHtml(data, firstLevel)
for (let key in data)
{
if (key === 'erudaObjAbstract') continue;
if (Object.hasOwnProperty.call(data, key)) ret += createEl(key, data[key], firstLevel);
}
@@ -58,6 +59,8 @@ function createEl(key, val, firstLevel)
open = '{',
close = '}';
if (key === 'erudaProto') key = '__proto__';
if (util.isArr(val))
{
type = 'array';
@@ -77,7 +80,7 @@ function createEl(key, val, firstLevel)
var obj = `<li>
<span class="eruda-expanded ${firstLevel ? '' : 'eruda-collapsed'}"></span>
<span class="eruda-key">${encode(key)}</span>
<span class="eruda-open">${open}</span>
<span class="eruda-open">${open} ${(val['erudaObjAbstract'] || '')}</span>
<ul class="eruda-${type}" ${firstLevel ? '' : 'style="display:none"'}>`;
obj += jsonToHtml(val);
return obj + `</ul><span class="eruda-close">${close}</span></li>`;

8
src/Sources/Sources.scss
View File

@@ -106,15 +106,15 @@
height: 0;
border: 4px solid transparent;
position: absolute;
border-top-color: #000;
left: -17px;
border-top-color: $gray;
left: -12px;
top: 5px;
}
.collapsed:before {
content: "";
border-left-color: #000;
border-left-color: $gray;
border-top-color: transparent;
left: -15px;
left: -10px;
top: 3px;
}
li .collapsed ~ .close:before {