Skip to content

Commit dba6863

Browse files
committed
cover new behavior with unit tests, static test fix
1 parent f8730c9 commit dba6863

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ define([
7878
'?isAjax=true&current_tree_path=d3lzaXd5Zw,,',
7979
null,
8080
null,
81-
'Hello world'
81+
'Hello world',
82+
{
83+
targetElementId: 'theTargetId'
84+
}
8285
);
8386
});
8487
});

dev/tests/js/jasmine/tests/lib/mage/browser.test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ define([
3737
*/
3838
done: function () {
3939
obj.targetElementId = 1;
40+
obj.modalLoaded = true;
4041
}
4142
};
4243
});
@@ -58,8 +59,8 @@ define([
5859
}
5960
};
6061
});
61-
obj.openDialog('instance/url', 100, 100, 'title', undefined);
62-
obj.openDialog('instance/url', 100, 100, 'title', undefined);
62+
obj.openDialog('instance/url/target_element_id/YDW2424/', 100, 100, 'title', undefined);
63+
obj.openDialog('instance/target_element_id/Y45GDRg/', 100, 100, 'title', undefined);
6364
expect($.ajax.calls.count()).toBe(1);
6465
});
6566
});

lib/web/mage/adminhtml/browser.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ define([
5656

5757
if (this.modalLoaded) {
5858

59-
if (typeof options.closed !== 'undefined') {
59+
if (!_.isUndefined(options)) {
6060
this.modal.modal('option', 'closed', options.closed);
6161
}
6262

@@ -322,16 +322,18 @@ define([
322322
* return {HTMLElement|null}
323323
*/
324324
getTargetElement: function () {
325-
var opener, targetElementId;
325+
var opener,
326+
targetElementId,
327+
mediaBrowser = window.MediabrowserUtility;
326328

327-
if (!_.isUndefined(wysiwyg) && wysiwyg.get(window.MediabrowserUtility.targetElementId)) {
329+
if (!_.isUndefined(wysiwyg) && wysiwyg.get(mediaBrowser.targetElementId)) {
328330
opener = this.getMediaBrowserOpener() || window;
329-
targetElementId = tinyMceEditors.get(window.MediabrowserUtility.targetElementId).getMediaBrowserTargetElementId();
331+
targetElementId = tinyMceEditors.get(mediaBrowser.targetElementId).getMediaBrowserTargetElementId();
330332

331333
return $(opener.document.getElementById(targetElementId));
332334
}
333335

334-
return $('#' + window.MediabrowserUtility.targetElementId);
336+
return $('#' + mediaBrowser.targetElementId);
335337
},
336338

337339
/**

0 commit comments

Comments
 (0)