зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1427184 - devtools-reps v0.18.0: update reps bundle from GitHub;r=Honza.
MozReview-Commit-ID: 86gvJSI7grM --HG-- extra : rebase_source : ffa32f67d08eb463d3dc3eac98f52d03a9a08473
This commit is contained in:
Родитель
d740edad77
Коммит
1e02011a6f
|
@ -414,18 +414,13 @@ function getGripPreviewItems(grip) {
|
|||
* @return {boolean}
|
||||
*/
|
||||
function getGripType(object, noGrip) {
|
||||
let type = typeof object;
|
||||
if (type == "object" && object instanceof String) {
|
||||
type = "string";
|
||||
} else if (object && type == "object" && object.type && noGrip !== true) {
|
||||
type = object.type;
|
||||
if (noGrip || Object(object) !== object) {
|
||||
return typeof object;
|
||||
}
|
||||
|
||||
if (isGrip(object)) {
|
||||
type = object.class;
|
||||
if (object.type === "object") {
|
||||
return object.class;
|
||||
}
|
||||
|
||||
return type;
|
||||
return object.type;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -814,7 +809,7 @@ function StringRep(props) {
|
|||
text = sanitizeString(text);
|
||||
}
|
||||
|
||||
const shouldCrop = (!member || !member.open) && cropLimit;
|
||||
const shouldCrop = (!member || !member.open) && cropLimit && text.length > cropLimit;
|
||||
if (!containsURL(text)) {
|
||||
if (shouldCrop) {
|
||||
text = rawCropString(text, cropLimit);
|
||||
|
@ -3240,7 +3235,10 @@ function SymbolRep(props) {
|
|||
} = props;
|
||||
let { name } = object;
|
||||
|
||||
return span({ className }, `Symbol(${name || ""})`);
|
||||
return span({
|
||||
className,
|
||||
"data-link-actor-id": object.actor
|
||||
}, `Symbol(${name || ""})`);
|
||||
}
|
||||
|
||||
function supportsObject(object, noGrip = false) {
|
||||
|
@ -3809,8 +3807,19 @@ const arrayProperty = /\[(.*?)\]$/;
|
|||
const functionProperty = /([\w\d]+)[\/\.<]*?$/;
|
||||
const annonymousProperty = /([\w\d]+)\(\^\)$/;
|
||||
|
||||
function getFunctionName(grip, props) {
|
||||
let name = grip.userDisplayName || grip.displayName || grip.name || props.functionName || "";
|
||||
function getFunctionName(grip, props = {}) {
|
||||
let { functionName } = props;
|
||||
let name;
|
||||
|
||||
if (functionName) {
|
||||
let end = functionName.length - 1;
|
||||
functionName = functionName.startsWith('"') && functionName.endsWith('"') ? functionName.substring(1, end) : functionName;
|
||||
}
|
||||
|
||||
if (grip.displayName != undefined && functionName != undefined && grip.displayName != functionName) {
|
||||
name = functionName + ":" + grip.displayName;
|
||||
} else {
|
||||
name = grip.userDisplayName || grip.displayName || grip.name || props.functionName || "";
|
||||
|
||||
const scenarios = [objectProperty, arrayProperty, functionProperty, annonymousProperty];
|
||||
|
||||
|
@ -3822,6 +3831,7 @@ function getFunctionName(grip, props) {
|
|||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
return cropString(name, 100);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче