corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 945068 - Image preview tooltip displays correct image dimensions, r=harth

Browse Source
This commit is contained in:
Patrick Brosset
2013-12-12 09:31:23 +01:00
parent 560549528a
commit 18855a8ff0
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
browser/devtools/markupview/markup-view.js
View File

@@ -1173,10 +1173,11 @@ MarkupContainer.prototype = {
this.node.getImageData(IMAGE_PREVIEW_MAX_DIM).then(data => {
if (data) {
data.data.string().then(str => {
let res = {data: str, size: data.size};
// Resolving the data promise and, to always keep tooltipData.data
// as a promise, create a new one that resolves immediately
def.resolve(str, data.size);
this.tooltipData.data = promise.resolve(str, data.size);
def.resolve(res);
this.tooltipData.data = promise.resolve(res);
});
}
});
@@ -1186,7 +1187,7 @@ MarkupContainer.prototype = {
_buildTooltipContent: function(target, tooltip) {
if (this.tooltipData && target === this.tooltipData.target) {
this.tooltipData.data.then((data, size) => {
this.tooltipData.data.then(({data, size}) => {
tooltip.setImageContent(data, size);
});
return true;