From a57f8679c5c66bce301045c75f5c0e9d8c050e36 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 13 Jun 2017 11:45:37 +0200
Subject: [PATCH] Fix a race condition in the file app

---
 www/file/main.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/www/file/main.js b/www/file/main.js
index 7ae8a622e..2351df39c 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -17,28 +17,28 @@ define([
     var APP = {};
 
     $(function () {
-// TODO race condition with contents() here
-    var ifrw = $('#pad-iframe')[0].contentWindow;
-    var $iframe = $('#pad-iframe').contents();
-    var $form = $iframe.find('#upload-form');
-    var $dlform = $iframe.find('#download-form');
-    var $label = $form.find('label');
-    var $progress = $iframe.find('#progress');
-    var $body = $iframe.find('body');
-
-    $body.on('dragover', function (e) { e.preventDefault(); });
-    $body.on('drop', function (e) { e.preventDefault(); });
-
-    Cryptpad.addLoadingScreen();
-
-    var Title;
-
-    var myFile;
-    var myDataType;
-
-    var uploadMode = false;
 
     var andThen = function () {
+        var ifrw = $('#pad-iframe')[0].contentWindow;
+        var $iframe = $('#pad-iframe').contents();
+        var $form = $iframe.find('#upload-form');
+        var $dlform = $iframe.find('#download-form');
+        var $label = $form.find('label');
+        var $progress = $iframe.find('#progress');
+        var $body = $iframe.find('body');
+
+        $body.on('dragover', function (e) { e.preventDefault(); });
+        $body.on('drop', function (e) { e.preventDefault(); });
+
+        Cryptpad.addLoadingScreen();
+
+        var Title;
+
+        var myFile;
+        var myDataType;
+
+        var uploadMode = false;
+
         var $bar = $iframe.find('.toolbar-container');
 
         var secret;