Merge branch pull/2376

This commit is contained in:
nightwing 2015-02-28 21:42:06 +04:00
commit 2506bb0921

View file

@ -197,8 +197,12 @@ var AcePopup = function(parentNode) {
if (data.meta) {
var maxW = popup.renderer.$size.scrollerWidth / popup.renderer.layerConfig.characterWidth;
if (data.meta.length + data.caption.length < maxW - 2)
tokens.push({type: "rightAlignedText", value: data.meta});
var metaData = 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;
};
@ -338,4 +342,4 @@ dom.importCssString("\
exports.AcePopup = AcePopup;
});
});