Merge branch 'MAGETWO-61143' into pr-2016

Sergey Shvets · Sergey Shvets · commit 3d998b4a089b · 2017-06-30T16:37:25.000+03:00
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
@@ -65,6 +65,7 @@ var catalogWysiwygEditor = {
                 }
             });
         }
+        this.modal.modal("option", "firedElementId", elementId);
         this.modal.modal('openModal');
         $(elementId + '_editor').value = $(elementId).value;
     },

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ var catalogWysiwygEditor = {`
`65`	`65`	`}`
`66`	`66`	`});`
`67`	`67`	`}`
	`68`	`+ this.modal.modal("option", "firedElementId", elementId);`
`68`	`69`	`this.modal.modal('openModal');`
`69`	`70`	`$(elementId + '_editor').value = $(elementId).value;`
`70`	`71`	`},`