From cbd29794b85606734c062baf127c4ddcaad69685 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 8 Mar 2018 12:16:40 +0100
Subject: [PATCH] Improve keyboard shortcuts in the pad creation screen

---
 www/common/common-ui-elements.js | 16 ++++++++++++++--
 www/settings/inner.js            |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 15e3c7b8c..5239f43f7 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1804,6 +1804,7 @@ define([
         };
 
         // Owned pads
+        // Default is Owned pad
         var owned = h('div.cp-creation-owned', [
             h('h2', [
                 Messages.creation_ownedTitle,
@@ -1829,7 +1830,7 @@ define([
         ]);
         $creation.append(owned);
 
-        // If set to "open pad" or not set, check "open pad"
+        // If set to "open pad", check "open pad"
         if (!cfg.owned && typeof cfg.owned !== "undefined") {
             $creation.find('#cp-creation-owned-false').attr('checked', true);
         }
@@ -1877,6 +1878,16 @@ define([
             ])
         ]);
         $creation.append(expire);
+        $creation.find('#cp-creation-expire-val').keydown(function (e) {
+            if (e.which === 9) {
+                e.stopPropagation();
+            }
+        });
+        $creation.find('#cp-creation-expire-unit').keydown(function (e) {
+            if (e.which === 9 && e.shiftKey) {
+                e.stopPropagation();
+            }
+        });
 
         UIElements.setExpirationValue(cfg.expire, $creation);
 
@@ -1945,6 +1956,7 @@ define([
         });
 
         var $button = $('<button>').text(Messages.creation_createFromScratch).appendTo($create);
+        $button.addClass('cp-creation-button-selected');
         $button.click(function () {
             create();
         });
@@ -1985,7 +1997,7 @@ define([
             $spinner[0]
         ])).appendTo($creation);
 
-        var selected = -1;
+        var selected = 0;
         var next = function () {
             selected = ++selected % $creation.find('button').length;
             $creation.find('button').removeClass('cp-creation-button-selected');
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 5105ad2b7..86870d950 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -335,13 +335,13 @@ define([
                 type: 'radio',
                 name: 'cp-creation-owned',
                 value: 1,
+                checked: 'checked'
             }),
             h('label', { 'for': 'cp-creation-owned-true' }, Messages.creation_ownedTrue),
             h('input#cp-creation-owned-false.cp-creation-owned-value', {
                 type: 'radio',
                 name: 'cp-creation-owned',
                 value: 0,
-                checked: 'checked'
             }),
             h('label', { 'for': 'cp-creation-owned-false' }, Messages.creation_ownedFalse),
             h('span.fa.fa-check', {title: Messages.saved}),
@@ -364,8 +364,8 @@ define([
             });
         });
         common.getAttribute(['general', 'creation', 'owned'], function (e, val) {
-            if (val) {
-                $owned.find('#cp-creation-owned-true').attr('checked', true);
+            if (!val && typeof val !== "undefined") {
+                $owned.find('#cp-creation-owned-false').attr('checked', true);
             }
         });