Merge branch pull/2376
This commit is contained in:
commit
2506bb0921
1 changed files with 7 additions and 3 deletions
|
|
@ -197,8 +197,12 @@ var AcePopup = function(parentNode) {
|
||||||
|
|
||||||
if (data.meta) {
|
if (data.meta) {
|
||||||
var maxW = popup.renderer.$size.scrollerWidth / popup.renderer.layerConfig.characterWidth;
|
var maxW = popup.renderer.$size.scrollerWidth / popup.renderer.layerConfig.characterWidth;
|
||||||
if (data.meta.length + data.caption.length < maxW - 2)
|
var metaData = data.meta;
|
||||||
tokens.push({type: "rightAlignedText", value: data.meta});
|
if (metaData.length + data.caption.length > maxW - 2) {
|
||||||
|
// trim meta to fit this popup and add ellipsis
|
||||||
|
metaData = metaData.substr(0, maxW - data.caption.length - 3) + "\u2026"
|
||||||
|
}
|
||||||
|
tokens.push({type: "rightAlignedText", value: metaData});
|
||||||
}
|
}
|
||||||
return tokens;
|
return tokens;
|
||||||
};
|
};
|
||||||
|
|
@ -338,4 +342,4 @@ dom.importCssString("\
|
||||||
|
|
||||||
exports.AcePopup = AcePopup;
|
exports.AcePopup = AcePopup;
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue