From c8a9afb6c8a845c9793e4bccebd13c458e622e46 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 21 Nov 2017 15:09:53 +0100
Subject: [PATCH 1/3] remove duplicate loading screen

---
 www/todo/inner.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/www/todo/inner.js b/www/todo/inner.js
index e7391c50d..d9b0fca3e 100644
--- a/www/todo/inner.js
+++ b/www/todo/inner.js
@@ -186,8 +186,6 @@ define([
         };
 
         var onInit = function () {
-            UI.addLoadingScreen();
-
             $body.on('dragover', function (e) { e.preventDefault(); });
             $body.on('drop', function (e) { e.preventDefault(); });
 

From d726c95f0b9390af98b63980dfe7952606f7493c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 21 Nov 2017 15:10:28 +0100
Subject: [PATCH 2/3] fix namespace collision

---
 www/contacts/inner.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/contacts/inner.js b/www/contacts/inner.js
index 8298354ac..1606ff622 100644
--- a/www/contacts/inner.js
+++ b/www/contacts/inner.js
@@ -9,6 +9,7 @@ define([
     '/contacts/messenger-ui.js',
     '/common/sframe-messenger-inner.js',
     '/customize/messages.js',
+    '/common/common-interface.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
@@ -21,9 +22,10 @@ define([
     nThen,
     SFCommon,
     h,
-    UI,
+    MessengerUI,
     Messenger,
-    Messages
+    Messages,
+    UI
     )
 {
     var APP = {};
@@ -73,7 +75,7 @@ define([
 
         var messenger = Messenger.create(sFrameChan);
 
-        UI.create(messenger, $(friendList), $(messaging), common);
+        MessengerUI.create(messenger, $(friendList), $(messaging), common);
 
         UI.removeLoadingScreen();
 

From 9d662bd337c192720c1fc7654fda74383527ab1e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 21 Nov 2017 15:21:37 +0100
Subject: [PATCH 3/3] fix right-click pad creation in drive

---
 www/drive/inner.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/drive/inner.js b/www/drive/inner.js
index 917ac22d2..957d44932 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -2695,8 +2695,10 @@ define([
             }
             else if ($(this).hasClass("cp-app-drive-context-newdoc")) {
                 var type = $(this).data('type') || 'pad';
-                sessionStorage[Cryptpad.newPadPathKey] = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
-                window.open(APP.origin + '/' + type + '/');
+                var path2 = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
+                common.sessionStorage.put(Cryptpad.newPadPathKey, path2, function () {
+                    common.openURL('/' + type + '/');
+                });
             }
             APP.hideMenu();
         });