From c137d11aa2df111e2a42bc42295576fdd366fd68 Mon Sep 17 00:00:00 2001
From: "louismaxime.piton" <louismaxime.piton@orange.com>
Date: Thu, 19 May 2022 15:35:44 +0200
Subject: Re-ordering js default objects

---
 js/src/util/backdrop.js         | 12 ++++++------
 js/src/util/focustrap.js        |  8 ++++----
 js/src/util/swipe.js            |  8 ++++----
 js/src/util/template-factory.js | 16 ++++++++--------
 4 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'js/src/util')

diff --git a/js/src/util/backdrop.js b/js/src/util/backdrop.js
index 31619de71..bb01fbb99 100644
--- a/js/src/util/backdrop.js
+++ b/js/src/util/backdrop.js
@@ -20,18 +20,18 @@ const EVENT_MOUSEDOWN = `mousedown.bs.${NAME}`
 
 const Default = {
   className: 'modal-backdrop',
-  isVisible: true, // if false, we use the backdrop helper without adding any element to the dom
+  clickCallback: null,
   isAnimated: false,
-  rootElement: 'body', // give the choice to place backdrop under different elements
-  clickCallback: null
+  isVisible: true, // if false, we use the backdrop helper without adding any element to the dom
+  rootElement: 'body' // give the choice to place backdrop under different elements
 }
 
 const DefaultType = {
   className: 'string',
-  isVisible: 'boolean',
+  clickCallback: '(function|null)',
   isAnimated: 'boolean',
-  rootElement: '(element|string)',
-  clickCallback: '(function|null)'
+  isVisible: 'boolean',
+  rootElement: '(element|string)'
 }
 
 /**
diff --git a/js/src/util/focustrap.js b/js/src/util/focustrap.js
index 40509c1ba..51dd19f22 100644
--- a/js/src/util/focustrap.js
+++ b/js/src/util/focustrap.js
@@ -24,13 +24,13 @@ const TAB_NAV_FORWARD = 'forward'
 const TAB_NAV_BACKWARD = 'backward'
 
 const Default = {
-  trapElement: null, // The element to trap focus inside of
-  autofocus: true
+  autofocus: true,
+  trapElement: null // The element to trap focus inside of
 }
 
 const DefaultType = {
-  trapElement: 'element',
-  autofocus: 'boolean'
+  autofocus: 'boolean',
+  trapElement: 'element'
 }
 
 /**
diff --git a/js/src/util/swipe.js b/js/src/util/swipe.js
index 66baa3dad..3676b57e6 100644
--- a/js/src/util/swipe.js
+++ b/js/src/util/swipe.js
@@ -26,15 +26,15 @@ const CLASS_NAME_POINTER_EVENT = 'pointer-event'
 const SWIPE_THRESHOLD = 40
 
 const Default = {
+  endCallback: null,
   leftCallback: null,
-  rightCallback: null,
-  endCallback: null
+  rightCallback: null
 }
 
 const DefaultType = {
+  endCallback: '(function|null)',
   leftCallback: '(function|null)',
-  rightCallback: '(function|null)',
-  endCallback: '(function|null)'
+  rightCallback: '(function|null)'
 }
 
 /**
diff --git a/js/src/util/template-factory.js b/js/src/util/template-factory.js
index 39fa450c0..cc2551c8f 100644
--- a/js/src/util/template-factory.js
+++ b/js/src/util/template-factory.js
@@ -17,28 +17,28 @@ import Config from './config'
 const NAME = 'TemplateFactory'
 
 const Default = {
-  extraClass: '',
-  template: '<div></div>',
+  allowList: DefaultAllowlist,
   content: {}, // { selector : text ,  selector2 : text2 , }
+  extraClass: '',
   html: false,
   sanitize: true,
   sanitizeFn: null,
-  allowList: DefaultAllowlist
+  template: '<div></div>'
 }
 
 const DefaultType = {
-  extraClass: '(string|function)',
-  template: 'string',
+  allowList: 'object',
   content: 'object',
+  extraClass: '(string|function)',
   html: 'boolean',
   sanitize: 'boolean',
   sanitizeFn: '(null|function)',
-  allowList: 'object'
+  template: 'string'
 }
 
 const DefaultContentType = {
-  selector: '(string|element)',
-  entry: '(string|element|function|null)'
+  entry: '(string|element|function|null)',
+  selector: '(string|element)'
 }
 
 /**
-- 
cgit v1.2.3