From 89da14220468ece6905ed1b08295e8d84c62ca91 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 1 Feb 2017 15:52:47 +0100
Subject: [PATCH] Fix pad creation from the context menu

---
 customize.dist/translations/messages.fr.js |  2 +-
 customize.dist/translations/messages.js    |  1 +
 www/drive/inner.html                       |  8 +++---
 www/drive/main.js                          | 29 +++++++++++-----------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 059a315cd..ed3c2c787 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -220,7 +220,7 @@ define(function () {
                              "Quiconque se trouve en possession de celle-ci peut modifier ou supprimer tous les fichiers de ce gestionnaire.<br>" +
                              '<input type="text" id="fm_backupUrl" value="{0}"/>';
     out.fm_backup_title = 'URL de secours';
-
+    out.fm_nameFile = 'Comment souhaitez-vous nommer ce fichier ?';
     // File - Context menu
     out.fc_newfolder = "Nouveau dossier";
     out.fc_rename = "Renommer";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 1f81836dc..ac3d235b6 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -217,6 +217,7 @@ define(function () {
                              "Anybody with that URL can edit or remove all the files in your file manager.<br>" +
                              '<input type="text" id="fm_backupUrl" value="{0}"/>';
     out.fm_backup_title = 'Backup URL';
+    out.fm_nameFile = 'How would you like to name that file?';
     // File - Context menu
     out.fc_newfolder = "New folder";
     out.fc_rename = "Rename";
diff --git a/www/drive/inner.html b/www/drive/inner.html
index 421443c4e..ed34f4f1a 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -29,10 +29,10 @@
         <div id="contentContextMenu" class="contextMenu dropdown clearfix" oncontextmenu="return false;">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">
                 <li><a tabindex="-1" href="#" class="newfolder editable dropdown-item" data-localization="fc_newfolder">New folder</a></li>
-                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="pad" data-localization="fc_newpad" target="_blank">New pad</a></li>
-                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="code" data-localization="fc_newcode" target="_blank">New code</a></li>
-                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="slide" data-localization="fc_newslide" target="_blank">New slide</a></li>
-                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="poll" data-localization="fc_newpoll" target="_blank">New poll</a></li>
+                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="pad" data-localization="fc_newpad">New pad</a></li>
+                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="code" data-localization="fc_newcode">New code</a></li>
+                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="slide" data-localization="fc_newslide">New slide</a></li>
+                <li><a tabindex="-1" href="#" class="newdoc own editable dropdown-item" data-type="poll" data-localization="fc_newpoll">New poll</a></li>
             </ul>
         </div>
         <div id="defaultContextMenu" class="contextMenu dropdown clearfix" oncontextmenu="return false;">
diff --git a/www/drive/main.js b/www/drive/main.js
index 13a8c5b66..aa823c968 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -855,6 +855,18 @@ define([
             return $block;
         };
 
+        var createPadFromRootHandler = function (e) {
+            var type = $(this).data('type');
+            if (!type) {
+                throw new Error("Unable to get the pad type...");
+            }
+            var onNamed = function (name) {
+                if (!name) { return; }
+                var path = '/#?name=' + encodeURIComponent(name) + '&path=' + encodeURIComponent(currentPath);
+                window.open('/' + type + path);
+            };
+            Cryptpad.prompt(Messages.fm_nameFile, Cryptpad.getDefaultName({type: type}), onNamed);
+        };
         var createNewButton = function (isInRoot) {
             if (!APP.editable) { return; }
 
@@ -904,18 +916,7 @@ define([
                     };
                     filesOp.createNewFolder(currentPath, null, onCreated);
                 });
-                $block.find('a.newdoc').click(function () {
-                    var type = $(this).data('type');
-                    if (!type) {
-                        throw new Error("Unable to get the pad type...");
-                    }
-                    var onNamed = function (name) {
-                        var path = '/#?name=' + encodeURIComponent(name) + '&path=' + encodeURIComponent(currentPath);
-                        console.log(path);
-                        window.open('/' + type + path);
-                    };
-                    Cryptpad.prompt("How would you like to name your file?", Cryptpad.getDefaultName({type: type}), onNamed);
-                });
+                $block.find('a.newdoc').click(createPadFromRootHandler);
             }
 
             return $block;
@@ -1587,7 +1588,8 @@ define([
             }
             else if ($(this).hasClass("newdoc")) {
                 var type = $(this).data('type') || 'pad';
-                $(this).attr('href','/' + type + '/#?path=' + encodeURIComponent(path));
+                createPadFromRootHandler.apply(this);
+                e.preventDefault();
             }
             module.hideMenu();
         });
@@ -1853,7 +1855,6 @@ define([
                 $backupButton.attr('title', Messages.fm_backup_title);
                 $backupButton.on('click', function() {
                     var url = window.location.origin + window.location.pathname + '#' + editHash;
-                    //TODO change text & transalte
                     Cryptpad.alert(Messages._getKey('fm_alert_backupUrl', [url]));
                     $('#fm_backupUrl').val(url);
                     $('#fm_backupUrl').click(function () {