Merge branch 'dev' into v2

Author: AJIXuMuK

CHANGELOG.JSON

@@ -22,7 +22,8 @@
           "`RichText`: Fix \"Align Left\" button [#429](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/429)",
           "Documentation update for `FilePicker`: misspelling [#432](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/432)",
           "`IFramePanel`: Fix doubled scroll issue when iframe content is higher than frame height [#431](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/431)",
-          "`PeoplePicker`: `errorMessage` not showing [#420](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/420)"
+          "`PeoplePicker`: `errorMessage` not showing [#420](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/420)",
+          "`IFrameDialog`: `commitPopUp` typo causes popups with classic forms to not close after hitting save [#433](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/433)"
         ]
       },
       "contributions": [

src/controls/iFrameDialog/IFrameDialogContent.tsx

@@ -40,6 +40,8 @@ export class IFrameDialogContent extends React.Component<IIFrameDialogContentPro
         try { // for cross origin requests we can have issues with accessing frameElement
             this._iframe.contentWindow.frameElement.cancelPopUp = this.props.close;
             this._iframe.contentWindow.frameElement.commitPopUp = this.props.close;
+            // SP.UI.Dialog has misspelling of commitPopUp
+            this._iframe.contentWindow.frameElement.commitPopup = this.props.close;
         }
         catch (err) {
             if (err.name !== 'SecurityError') {

src/controls/iFramePanel/IFramePanelContent.tsx

@@ -80,6 +80,9 @@ export class IFramePanelContent extends React.Component<IIFramePanelContentProps
   private iframeOnLoad = () => {
     try { // for cross origin requests we can have issues with accessing frameElement
       this._iframe.contentWindow.frameElement.cancelPopUp = this.props.close;
+      this._iframe.contentWindow.frameElement.commitPopUp = this.props.close;
+      // SP.UI.Dialog has misspelling of commitPopUp
+      this._iframe.contentWindow.frameElement.commitPopup = this.props.close;
     }
     catch (err) {
       if (err.name !== 'SecurityError') {