From 5b3de6d2a317728b6b7739906b78357640760055 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 10 Aug 2017 15:07:30 +0200 Subject: [PATCH] Do post render stuff after the iframe is loaded --- package.json | 2 +- src/asset_manager/view/FileUploader.js | 2 +- src/editor/index.js | 11 +++++--- yarn.lock | 35 +++++++++++++------------- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 6018b55bc..639f4ff97 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "eslint": "^4.1.1", "expect": "^1.20.2", "istanbul": "^0.4.2", - "jsdom": "^11.0.0", + "jsdom": "^11.1.0", "mocha": "^3.1.2", "node-sass": "^3.4.2", "sinon": "^1.17.6", diff --git a/src/asset_manager/view/FileUploader.js b/src/asset_manager/view/FileUploader.js index 90013b00a..c6d47c2cb 100644 --- a/src/asset_manager/view/FileUploader.js +++ b/src/asset_manager/view/FileUploader.js @@ -102,7 +102,7 @@ module.exports = Backbone.View.extend({ const em = ev.model; const edEl = ev.el; const editor = em && em.get('Editor'); - const frameEl = ev.model.get('Canvas').getBody();;//.getBody(); + const frameEl = ev.model.get('Canvas').getBody(); const ppfx = this.ppfx; const updatedCls = `${ppfx}dropzone-active`; const dropzoneCls = `${ppfx}dropzone`; diff --git a/src/editor/index.js b/src/editor/index.js index db4ae6b96..4df32e796 100644 --- a/src/editor/index.js +++ b/src/editor/index.js @@ -516,12 +516,15 @@ module.exports = config => { * @return {HTMLElement} */ render() { - editorView.render(); - - em.get('modules').forEach((module) => { - module.postRender && module.postRender(editorView); + // Do post render stuff after the iframe is loaded otherwise it'll + // be empty during tests + em.on('loaded', () => { + em.get('modules').forEach((module) => { + module.postRender && module.postRender(editorView); + }); }); + editorView.render(); return editorView.el; }, diff --git a/yarn.lock b/yarn.lock index 227a42309..2abf66791 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3026,9 +3026,9 @@ jschardet@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a" -jsdom@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5" +jsdom@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.1.0.tgz#6c48d7a48ffc5c300283c312904d15da8360509b" dependencies: abab "^1.0.3" acorn "^4.0.4" @@ -3039,7 +3039,7 @@ jsdom@^11.0.0: cssstyle ">= 0.2.37 < 0.3.0" escodegen "^1.6.1" html-encoding-sniffer "^1.0.1" - nwmatcher ">= 1.3.9 < 2.0.0" + nwmatcher "^1.4.1" parse5 "^3.0.2" pn "^1.0.0" request "^2.79.0" @@ -3049,7 +3049,7 @@ jsdom@^11.0.0: tough-cookie "^2.3.2" webidl-conversions "^4.0.0" whatwg-encoding "^1.0.1" - whatwg-url "^4.3.0" + whatwg-url "^6.1.0" xml-name-validator "^2.0.1" jsesc@^1.3.0: @@ -3237,6 +3237,10 @@ lodash.keys@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -3649,9 +3653,9 @@ number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" -"nwmatcher@>= 1.3.9 < 2.0.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf" +nwmatcher@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f" oauth-sign@~0.8.1: version "0.8.2" @@ -5222,11 +5226,7 @@ wbuf@^1.1.0, wbuf@^1.7.2: dependencies: minimalistic-assert "^1.0.0" -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - -webidl-conversions@^4.0.0: +webidl-conversions@^4.0.0, webidl-conversions@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0" @@ -5310,12 +5310,13 @@ whatwg-encoding@^1.0.1: dependencies: iconv-lite "0.4.13" -whatwg-url@^4.3.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0" +whatwg-url@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.1.0.tgz#5fc8279b93d75483b9ced8b26239854847a18578" dependencies: + lodash.sortby "^4.7.0" tr46 "~0.0.3" - webidl-conversions "^3.0.0" + webidl-conversions "^4.0.1" which-module@^1.0.0: version "1.0.0"