From e9b1bac2bc9193789cc373ae76723269f760acd2 Mon Sep 17 00:00:00 2001
From: zombieFox <crudetoaster@gmail.com>
Date: Mon, 17 Jun 2019 14:33:23 +0100
Subject: [PATCH] [feature] add drag and drop link sort

---
 css/link.css                   | 20 ++++++++++++++---
 index.html                     | 22 ++++++++-----------
 js/bookmarks.js                | 40 +++++++++++++++++++---------------
 js/control.js                  | 22 +++++--------------
 js/helper.js                   | 20 +++++++++++++----
 js/init.js                     |  1 -
 js/link.js                     | 12 ++++++++++
 js/state.js                    |  3 +--
 js/update.js                   | 10 +++++++++
 js/vendor/html5sortable.min.js |  2 ++
 js/version.js                  |  2 +-
 manifest.json                  |  2 +-
 12 files changed, 97 insertions(+), 59 deletions(-)
 create mode 100755 js/vendor/html5sortable.min.js

diff --git a/css/link.css b/css/link.css
index 2be16093..0c46957c 100755
--- a/css/link.css
+++ b/css/link.css
@@ -67,6 +67,19 @@
   transition: none;
 }
 
+.link-item-placeholder {
+  background-color: rgba(var(--theme-accent), 0.2);
+  border-radius: var(--theme-radius);
+  width:  100%;
+  height:  100%;
+  position: relative;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  box-shadow: inset 0 0 0 var(--line-width) rgb(var(--theme-accent)), inset 0 0 0 calc(var(--line-width) * 4) rgba(var(--theme-accent), 0.1), inset 0 0 0 calc(var(--line-width) * 8) rgba(var(--theme-accent), 0.1);
+  pointer-events: none;
+}
+
 .link-panel-front {
   background-color: rgb(var(--gray-02));
   border-radius: var(--theme-radius);
@@ -206,6 +219,7 @@
 
 .link-control-item {
   background-color: transparent;
+  border-radius: 0;
   margin-bottom: 0;
   border: 0;
   padding: 0;
@@ -260,9 +274,9 @@
   justify-content: flex-end;
 }
 
-.link-item:focus-within .link-url,
-.link-item:focus .link-url,
-.link-item:hover .link-url {
+.is-link-url-show .link-item:focus-within .link-url,
+.is-link-url-show .link-item:focus .link-url,
+.is-link-url-show .link-item:hover .link-url {
   height: var(--link-item-url-height);
 }
 
diff --git a/index.html b/index.html
index b09fdc43..2051ddfc 100644
--- a/index.html
+++ b/index.html
@@ -875,21 +875,14 @@
               <h1 class="menu-item-header-text">Sort</h1>
             </div>
             <div class="menu-item-form">
-              <div class="input-wrap">
-                <input id="control-link-sort-none" class="control-link-sort-none" type="radio" name="control-link-sort" value="none" tabindex="1">
-                <label for="control-link-sort-none">None (as added)</label>
+              <div class="button-wrap">
+                <button class="control-link-sort-letter button mb-0" tabindex="1">By Letter</button>
               </div>
-              <div class="input-wrap">
-                <input id="control-link-sort-letter" class="control-link-sort-letter" type="radio" name="control-link-sort" value="letter" tabindex="1">
-                <label for="control-link-sort-letter">Letter</label>
+              <div class="button-wrap">
+                <button class="control-link-sort-icon button mb-0" tabindex="1">By Icon</button>
               </div>
-              <div class="input-wrap">
-                <input id="control-link-sort-icon" class="control-link-sort-icon" type="radio" name="control-link-sort" value="icon" tabindex="1">
-                <label for="control-link-sort-icon">Icon</label>
-              </div>
-              <div class="input-wrap">
-                <input id="control-link-sort-name" class="control-link-sort-name" type="radio" name="control-link-sort" value="name" tabindex="1">
-                <label for="control-link-sort-name">Name</label>
+              <div class="button-wrap">
+                <button class="control-link-sort-name button mb-0" tabindex="1">By Name</button>
               </div>
             </div>
           </div>
@@ -1010,6 +1003,9 @@
 
 </body>
 
+<!-- vendor -->
+<script src="js/vendor/html5sortable.min.js"></script>
+<!-- nightTab -->
 <script src="js/helper.js"></script>
 <script src="js/data.js"></script>
 <script src="js/fontawesome.js"></script>
diff --git a/js/bookmarks.js b/js/bookmarks.js
index e1c0627b..4a24a8b0 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -183,27 +183,10 @@ var bookmarks = (function() {
       };
       return found;
     };
-    var _allBookmarks = function() {
-      var action = {
-        none: function(array) {
-          return helper.sortObject(array, "timeStamp");
-        },
-        name: function(array) {
-          return helper.sortObject(array, "name");
-        },
-        letter: function(array) {
-          return helper.sortObject(array, "letter");
-        },
-        icon: function(array) {
-          return helper.sortObject(array, "icon.name");
-        }
-      };
-      return action[state.get().link.sort](all);
-    };
     if (data && typeof data.timeStamp == "number") {
       return _singleBookmark();
     } else {
-      return _allBookmarks();
+      return all;
     };
   };
 
@@ -233,6 +216,25 @@ var bookmarks = (function() {
     };
   };
 
+  var sort = function(by) {
+    var action = {
+      name: function(array) {
+        return helper.sortObject(array, "name");
+      },
+      letter: function(array) {
+        return helper.sortObject(array, "letter");
+      },
+      icon: function(array) {
+        return helper.sortObject(array, "icon.name");
+      }
+    };
+    all = action[by](all);
+  };
+
+  var move = function(origin, destination) {
+    all = helper.moveArrayItem(all, origin, destination);
+  };
+
   var init = function() {
     if (data.load()) {
       restore(data.load());
@@ -246,6 +248,8 @@ var bookmarks = (function() {
     get: get,
     add: add,
     edit: edit,
+    sort: sort,
+    move: move,
     remove: remove,
     restore: restore
   };
diff --git a/js/control.js b/js/control.js
index f11c814c..041c630a 100644
--- a/js/control.js
+++ b/js/control.js
@@ -1918,35 +1918,27 @@ var control = (function() {
     func: function() {
       render();
     }
-  }, {
-    element: helper.e(".control-link-sort-none"),
-    path: "link.sort",
-    type: "radio",
-    func: function() {
-      link.clear();
-      link.render.item.all();
-    }
   }, {
     element: helper.e(".control-link-sort-letter"),
-    path: "link.sort",
-    type: "radio",
+    type: "button",
     func: function() {
+      bookmarks.sort("letter");
       link.clear();
       link.render.item.all();
     }
   }, {
     element: helper.e(".control-link-sort-icon"),
-    path: "link.sort",
-    type: "radio",
+    type: "button",
     func: function() {
+      bookmarks.sort("icon");
       link.clear();
       link.render.item.all();
     }
   }, {
     element: helper.e(".control-link-sort-name"),
-    path: "link.sort",
-    type: "radio",
+    type: "button",
     func: function() {
+      bookmarks.sort("name");
       link.clear();
       link.render.item.all();
     }
@@ -2712,7 +2704,6 @@ var control = (function() {
       helper.e(".control-link-new-tab").disabled = true;
       helper.e(".control-link-style-block").disabled = true;
       helper.e(".control-link-style-list").disabled = true;
-      helper.e(".control-link-sort-none").disabled = true;
       helper.e(".control-link-sort-name").disabled = true;
       helper.e(".control-link-sort-letter").disabled = true;
       helper.e(".control-link-sort-icon").disabled = true;
@@ -2735,7 +2726,6 @@ var control = (function() {
         helper.e(".control-link-new-tab").disabled = false;
         helper.e(".control-link-style-block").disabled = false;
         helper.e(".control-link-style-list").disabled = false;
-        helper.e(".control-link-sort-none").disabled = false;
         helper.e(".control-link-sort-name").disabled = false;
         helper.e(".control-link-sort-letter").disabled = false;
         helper.e(".control-link-sort-icon").disabled = false;
diff --git a/js/helper.js b/js/helper.js
index c49863bc..fcbbf80f 100644
--- a/js/helper.js
+++ b/js/helper.js
@@ -267,7 +267,7 @@ var helper = (function() {
     return element;
   };
 
-  function _makeAddress(path) {
+  var _makeAddress = function(path) {
     var array;
     if (path.indexOf("[") != -1 && path.indexOf("]") != -1) {
       array = path.split(".").join(",").split("[").join(",").split("]").join(",").split(",");
@@ -285,7 +285,7 @@ var helper = (function() {
     return array;
   };
 
-  function setObject(override) {
+  var setObject = function(override) {
     var options = {
       path: null,
       object: null,
@@ -321,7 +321,7 @@ var helper = (function() {
     };
   };
 
-  function getObject(override) {
+  var getObject = function(override) {
     var options = {
       object: null,
       path: null
@@ -360,7 +360,7 @@ var helper = (function() {
     };
   };
 
-  function makeObject(string) {
+  var makeObject = function(string) {
     var _stringOrBooleanOrNumber = function(stringToTest) {
       if (stringToTest == "true") {
         return true;
@@ -419,6 +419,17 @@ var helper = (function() {
     };
   };
 
+  var moveArrayItem = function(array, oldIndex, newIndex) {
+    if (newIndex >= array.length) {
+      var k = newIndex - array.length + 1;
+      while (k--) {
+        array.push(undefined);
+      };
+    };
+    array.splice(newIndex, 0, array.splice(oldIndex, 1)[0]);
+    return array;
+  };
+
   var allEqual = function(array) {
     return array.every(function(arrayItem) {
       return arrayItem === array[0];
@@ -564,6 +575,7 @@ var helper = (function() {
     setObject: setObject,
     getObject: getObject,
     makeObject: makeObject,
+    moveArrayItem: moveArrayItem,
     randomNumber: randomNumber,
     toWords: toWords,
     ordinalWords: ordinalWords,
diff --git a/js/init.js b/js/init.js
index 22e4ee31..9411677b 100644
--- a/js/init.js
+++ b/js/init.js
@@ -12,7 +12,6 @@ transitional.init();
 date.init();
 clock.init();
 keyboard.init();
-tip.init();
 layout.init();
 background.init();
 search.init();
diff --git a/js/link.js b/js/link.js
index 6a1e5b36..169733f6 100644
--- a/js/link.js
+++ b/js/link.js
@@ -1,5 +1,16 @@
 var link = (function() {
 
+  var bind = function() {
+    sortable(".link-area", {
+      items: ".link-item",
+      placeholder: helper.node("div|class:link-item-placeholder")
+    });
+    sortable(".link-area")[0].addEventListener("sortupdate", function(event) {
+      bookmarks.move(event.detail.origin.index, event.detail.destination.index);
+      data.save();
+    });
+  };
+
   var _previousFocusLink = null;
 
   var _returnToPreviousFocusLink = function() {
@@ -658,6 +669,7 @@ var link = (function() {
     render.item.display.letter();
     render.item.display.icon();
     render.item.name();
+    bind();
   };
 
   // exposed methods
diff --git a/js/state.js b/js/state.js
index 1271adb5..f4b93a6c 100644
--- a/js/state.js
+++ b/js/state.js
@@ -167,8 +167,7 @@ var state = (function() {
       show: true,
       newTab: false,
       edit: false,
-      style: "block",
-      sort: "none"
+      style: "block"
     },
     layout: {
       alignment: {
diff --git a/js/update.js b/js/update.js
index 13e07322..1db73d26 100644
--- a/js/update.js
+++ b/js/update.js
@@ -478,6 +478,12 @@ var update = (function() {
     return data;
   };
 
+  var _update_3150 = function(data) {
+    data.version = "3.15.0";
+    delete data.state.link.sort;
+    return data;
+  };
+
   // var _update_300 = function(data) {
   //   data.version = 3.00;
   //   return data;
@@ -608,6 +614,10 @@ var update = (function() {
         console.log("\t= running update 3.11.0");
         data = _update_3110(data);
       };
+      if (version.compare(data.version, "3.15.0") == -1) {
+        console.log("\t= running update 3.15.0");
+        data = _update_3150(data);
+      };
     };
     // if no update is needed
     // version bump
diff --git a/js/vendor/html5sortable.min.js b/js/vendor/html5sortable.min.js
new file mode 100755
index 00000000..3a724128
--- /dev/null
+++ b/js/vendor/html5sortable.min.js
@@ -0,0 +1,2 @@
+var sortable=function(){"use strict";function c(e,t,n){if(void 0===n)return e&&e.h5s&&e.h5s.data&&e.h5s.data[t];e.h5s=e.h5s||{},e.h5s.data=e.h5s.data||{},e.h5s.data[t]=n}var d=function(e,t){if(!(e instanceof NodeList||e instanceof HTMLCollection||e instanceof Array))throw new Error("You must provide a nodeList/HTMLCollection/Array of elements to be filtered.");return"string"!=typeof t?Array.from(e):Array.from(e).filter(function(e){return 1===e.nodeType&&e.matches(t)})},u=new Map,t=function(){function e(){this._config=new Map,this._placeholder=void 0,this._data=new Map}return Object.defineProperty(e.prototype,"config",{get:function(){var n={};return this._config.forEach(function(e,t){n[t]=e}),n},set:function(e){if("object"!=typeof e)throw new Error("You must provide a valid configuration object to the config setter.");var t=Object.assign({},e);this._config=new Map(Object.entries(t))},enumerable:!0,configurable:!0}),e.prototype.setConfig=function(e,t){if(!this._config.has(e))throw new Error("Trying to set invalid configuration item: "+e);this._config.set(e,t)},e.prototype.getConfig=function(e){if(!this._config.has(e))throw new Error("Invalid configuration item requested: "+e);return this._config.get(e)},Object.defineProperty(e.prototype,"placeholder",{get:function(){return this._placeholder},set:function(e){if(!(e instanceof HTMLElement)&&null!==e)throw new Error("A placeholder must be an html element or null.");this._placeholder=e},enumerable:!0,configurable:!0}),e.prototype.setData=function(e,t){if("string"!=typeof e)throw new Error("The key must be a string.");this._data.set(e,t)},e.prototype.getData=function(e){if("string"!=typeof e)throw new Error("The key must be a string.");return this._data.get(e)},e.prototype.deleteData=function(e){if("string"!=typeof e)throw new Error("The key must be a string.");return this._data.delete(e)},e}(),p=function(e){if(!(e instanceof HTMLElement))throw new Error("Please provide a sortable to the store function.");return u.has(e)||u.set(e,new t),u.get(e)};function a(e,t,n){if(e instanceof Array)for(var r=0;r<e.length;++r)a(e[r],t,n);else e.addEventListener(t,n),p(e).setData("event"+t,n)}function i(e,t){if(e instanceof Array)for(var n=0;n<e.length;++n)i(e[n],t);else e.removeEventListener(t,p(e).getData("event"+t)),p(e).deleteData("event"+t)}function l(e,t,n){if(e instanceof Array)for(var r=0;r<e.length;++r)l(e[r],t,n);else e.setAttribute(t,n)}function r(e,t){if(e instanceof Array)for(var n=0;n<e.length;++n)r(e[n],t);else e.removeAttribute(t)}var m=function(e){if(!e.parentElement||0===e.getClientRects().length)throw new Error("target element must be part of the dom");var t=e.getClientRects()[0];return{left:t.left+window.pageXOffset,right:t.right+window.pageXOffset,top:t.top+window.pageYOffset,bottom:t.bottom+window.pageYOffset}},h=function(n,r){var o;return void 0===r&&(r=0),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];clearTimeout(o),o=setTimeout(function(){n.apply(void 0,e)},r)}},g=function(e,t){if(!(e instanceof HTMLElement&&(t instanceof NodeList||t instanceof HTMLCollection||t instanceof Array)))throw new Error("You must provide an element and a list of elements.");return Array.from(t).indexOf(e)},v=function(e){if(!(e instanceof HTMLElement))throw new Error("Element is not a node element.");return null!==e.parentNode},n=function(e,t,n){if(!(e instanceof HTMLElement&&e.parentElement instanceof HTMLElement))throw new Error("target and element must be a node");e.parentElement.insertBefore(t,"before"===n?e:e.nextElementSibling)},y=function(e,t){return n(e,t,"before")},E=function(e,t){return n(e,t,"after")},o=function(t,n,e){if(void 0===n&&(n=function(e,t){return e}),void 0===e&&(e=function(e){return e}),!(t instanceof HTMLElement)||!0==!t.isSortable)throw new Error("You need to provide a sortableContainer to be serialized.");if("function"!=typeof n||"function"!=typeof e)throw new Error("You need to provide a valid serializer for items and the container.");var r=c(t,"opts").items,o=d(t.children,r),i=o.map(function(e){return{parent:t,node:e,html:e.outerHTML,index:g(e,o)}});return{container:e({node:t,itemCount:i.length}),items:i.map(function(e){return n(e,t)})}},w=function(e,t,n){var r;if(void 0===n&&(n="sortable-placeholder"),!(e instanceof HTMLElement))throw new Error("You must provide a valid element as a sortable.");if(!(t instanceof HTMLElement)&&void 0!==t)throw new Error("You must provide a valid element as a placeholder or set ot to undefined.");return void 0===t&&(["UL","OL"].includes(e.tagName)?t=document.createElement("li"):["TABLE","TBODY"].includes(e.tagName)?(t=document.createElement("tr")).innerHTML='<td colspan="100"></td>':t=document.createElement("div")),"string"==typeof n&&(r=t.classList).add.apply(r,n.split(" ")),t},b=function(e){if(!(e instanceof HTMLElement))throw new Error("You must provide a valid dom element");var n=window.getComputedStyle(e);return["height","padding-top","padding-bottom"].map(function(e){var t=parseInt(n.getPropertyValue(e),10);return isNaN(t)?0:t}).reduce(function(e,t){return e+t})},s=function(e,t){if(!(e instanceof Array))throw new Error("You must provide a Array of HTMLElements to be filtered.");return"string"!=typeof t?e:e.filter(function(e){return e.querySelector(t)instanceof HTMLElement||e.shadowRoot&&e.shadowRoot.querySelector(t)instanceof HTMLElement}).map(function(e){return e.querySelector(t)||e.shadowRoot&&e.shadowRoot.querySelector(t)})},T=function(e){return e.composedPath&&e.composedPath()[0]||e.target},f=function(e,t,n){return{element:e,posX:n.pageX-t.left,posY:n.pageY-t.top}},L=function(e,t,n){if(!(e instanceof Event))throw new Error("setDragImage requires a DragEvent as the first argument.");if(!(t instanceof HTMLElement))throw new Error("setDragImage requires the dragged element as the second argument.");if(n||(n=f),e.dataTransfer&&e.dataTransfer.setDragImage){var r=n(t,m(t),e);if(!(r.element instanceof HTMLElement)||"number"!=typeof r.posX||"number"!=typeof r.posY)throw new Error("The customDragImage function you provided must return and object with the properties element[string], posX[integer], posY[integer].");e.dataTransfer.effectAllowed="copyMove",e.dataTransfer.setData("text/plain",T(e).id),e.dataTransfer.setDragImage(r.element,r.posX,r.posY)}},C=function(e,t){if(!0===e.isSortable){var n=p(e).getConfig("acceptFrom");if(null!==n&&!1!==n&&"string"!=typeof n)throw new Error('HTML5Sortable: Wrong argument, "acceptFrom" must be "null", "false", or a valid selector string.');if(null!==n)return!1!==n&&0<n.split(",").filter(function(e){return 0<e.length&&t.matches(e)}).length;if(e===t)return!0;if(void 0!==p(e).getConfig("connectWith")&&null!==p(e).getConfig("connectWith"))return p(e).getConfig("connectWith")===p(t).getConfig("connectWith")}return!1},M={items:null,connectWith:null,disableIEFix:null,acceptFrom:null,copy:!1,placeholder:null,placeholderClass:"sortable-placeholder",draggingClass:"sortable-dragging",hoverClass:!1,debounce:0,throttleTime:100,maxItems:0,itemSerializer:void 0,containerSerializer:void 0,customDragImage:null};var D,x,H,A,I,S,_,Y,O=function(e,t){if("string"==typeof p(e).getConfig("hoverClass")){var o=p(e).getConfig("hoverClass").split(" ");!0===t?(a(e,"mousemove",function(r,o){var i=this;if(void 0===o&&(o=250),"function"!=typeof r)throw new Error("You must provide a function as the first argument for throttle.");if("number"!=typeof o)throw new Error("You must provide a number as the second argument for throttle.");var a=null;return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=Date.now();(null===a||o<=n-a)&&(a=n,r.apply(i,e))}}(function(r){0===r.buttons&&d(e.children,p(e).getConfig("items")).forEach(function(e){var t,n;e!==r.target?(t=e.classList).remove.apply(t,o):(n=e.classList).add.apply(n,o)})},p(e).getConfig("throttleTime"))),a(e,"mouseleave",function(){d(e.children,p(e).getConfig("items")).forEach(function(e){var t;(t=e.classList).remove.apply(t,o)})})):(i(e,"mousemove"),i(e,"mouseleave"))}},P=function(e){i(e,"dragstart"),i(e,"dragend"),i(e,"dragover"),i(e,"dragenter"),i(e,"drop"),i(e,"mouseenter"),i(e,"mouseleave")},W=function(e,t){var n=e;return!0===p(t).getConfig("copy")&&(l(n=e.cloneNode(!0),"aria-copied","true"),e.parentElement.appendChild(n),n.style.display="none",n.oldDisplay=e.style.display),n},F=function(e){var t;(t=e).h5s&&delete t.h5s.data,r(e,"aria-dropeffect")},N=function(e){r(e,"aria-grabbed"),r(e,"aria-copied"),r(e,"draggable"),r(e,"role")};function j(e,t){if(t.composedPath)return t.composedPath().find(function(e){return e.isSortable});for(;!0!==e.isSortable;)e=e.parentElement;return e}function q(e,t){var n=c(e,"opts"),r=d(e.children,n.items).filter(function(e){return e.contains(t)||e.shadowRoot&&e.shadowRoot.contains(t)});return 0<r.length?r[0]:t}var z=function(e){var t=c(e,"opts"),n=d(e.children,t.items),r=s(n,t.handle);(l(e,"aria-dropeffect","move"),c(e,"_disabled","false"),l(r,"draggable","true"),!1===t.disableIEFix)&&("function"==typeof(document||window.document).createElement("span").dragDrop&&a(r,"mousedown",function(){if(-1!==n.indexOf(this))this.dragDrop();else{for(var e=this.parentElement;-1===n.indexOf(e);)e=e.parentElement;e.dragDrop()}}))},R=function(e){var t=c(e,"opts"),n=d(e.children,t.items),r=s(n,t.handle);c(e,"_disabled","false"),P(n),i(r,"mousedown"),i(e,"dragover"),i(e,"dragenter"),i(e,"drop")};function X(e,f){var i=String(f);return f=f||{},"string"==typeof e&&(e=document.querySelectorAll(e)),e instanceof HTMLElement&&(e=[e]),e=Array.prototype.slice.call(e),/serialize/.test(i)?e.map(function(e){var t=c(e,"opts");return o(e,t.itemSerializer,t.containerSerializer)}):(e.forEach(function(s){if(/enable|disable|destroy/.test(i))return X[i](s);["connectWith","disableIEFix"].forEach(function(e){f.hasOwnProperty(e)&&null!==f[e]&&console.warn('HTML5Sortable: You are using the deprecated configuration "'+e+'". This will be removed in an upcoming version, make sure to migrate to the new options when updating.')}),f=Object.assign({},M,p(s).config,f),p(s).config=f,c(s,"opts",f),s.isSortable=!0,R(s);var e,t=d(s.children,f.items);if(null!==f.placeholder&&void 0!==f.placeholder){var n=document.createElement(s.tagName);f.placeholder instanceof HTMLElement?n.appendChild(f.placeholder):n.innerHTML=f.placeholder,e=n.children[0]}p(s).placeholder=w(s,e,f.placeholderClass),c(s,"items",f.items),f.acceptFrom?c(s,"acceptFrom",f.acceptFrom):f.connectWith&&c(s,"connectWith",f.connectWith),z(s),l(t,"role","option"),l(t,"aria-grabbed","false"),O(s,!0),a(s,"dragstart",function(e){var t=T(e);if(!0!==t.isSortable&&(e.stopImmediatePropagation(),(!f.handle||t.matches(f.handle))&&"false"!==t.getAttribute("draggable"))){var n=j(t,e),r=q(n,t);S=d(n.children,f.items),A=S.indexOf(r),I=g(r,n.children),H=n,L(e,r,f.customDragImage),x=b(r),r.classList.add(f.draggingClass),l(D=W(r,n),"aria-grabbed","true"),n.dispatchEvent(new CustomEvent("sortstart",{detail:{origin:{elementIndex:I,index:A,container:H},item:D,originalTarget:t}}))}}),a(s,"dragenter",function(e){var t=T(e),n=j(t,e);n&&n!==_&&(Y=d(n.children,c(n,"items")).filter(function(e){return e!==p(s).placeholder}),n.dispatchEvent(new CustomEvent("sortenter",{detail:{origin:{elementIndex:I,index:A,container:H},destination:{container:n,itemsBeforeUpdate:Y},item:D,originalTarget:t}}))),_=n}),a(s,"dragend",function(e){if(D){D.classList.remove(f.draggingClass),l(D,"aria-grabbed","false"),"true"===D.getAttribute("aria-copied")&&"true"!==c(D,"dropped")&&D.remove(),D.style.display=D.oldDisplay,delete D.oldDisplay;var t=Array.from(u.values()).map(function(e){return e.placeholder}).filter(function(e){return e instanceof HTMLElement}).filter(v)[0];t&&t.remove(),s.dispatchEvent(new CustomEvent("sortstop",{detail:{origin:{elementIndex:I,index:A,container:H},item:D}})),x=D=_=null}}),a(s,"drop",function(e){if(C(s,D.parentElement)){e.preventDefault(),e.stopPropagation(),c(D,"dropped","true");var t=Array.from(u.values()).map(function(e){return e.placeholder}).filter(function(e){return e instanceof HTMLElement}).filter(v)[0];E(t,D),t.remove(),s.dispatchEvent(new CustomEvent("sortstop",{detail:{origin:{elementIndex:I,index:A,container:H},item:D}}));var n=p(s).placeholder,r=d(H.children,f.items).filter(function(e){return e!==n}),o=!0===this.isSortable?this:this.parentElement,i=d(o.children,c(o,"items")).filter(function(e){return e!==n}),a=g(D,Array.from(D.parentElement.children).filter(function(e){return e!==n})),l=g(D,i);I===a&&H===o||s.dispatchEvent(new CustomEvent("sortupdate",{detail:{origin:{elementIndex:I,index:A,container:H,itemsBeforeUpdate:S,items:r},destination:{index:l,elementIndex:a,container:o,itemsBeforeUpdate:Y,items:i},item:D}}))}});var o=h(function(t,e,n){if(D)if(f.forcePlaceholderSize&&(p(t).placeholder.style.height=x+"px"),-1<Array.from(t.children).indexOf(e)){var r=b(e),o=g(p(t).placeholder,e.parentElement.children),i=g(e,e.parentElement.children);if(x<r){var a=r-x,l=m(e).top;if(o<i&&n<l)return;if(i<o&&l+r-a<n)return}void 0===D.oldDisplay&&(D.oldDisplay=D.style.display),"none"!==D.style.display&&(D.style.display="none");var s=!1;try{s=m(e).top+e.offsetHeight/2<=n}catch(e){s=o<i}s?E(e,p(t).placeholder):y(e,p(t).placeholder),Array.from(u.values()).filter(function(e){return void 0!==e.placeholder}).forEach(function(e){e.placeholder!==p(t).placeholder&&e.placeholder.remove()})}else{var c=Array.from(u.values()).filter(function(e){return void 0!==e.placeholder}).map(function(e){return e.placeholder});-1!==c.indexOf(e)||t!==e||d(e.children,f.items).length||(c.forEach(function(e){return e.remove()}),e.appendChild(p(t).placeholder))}},f.debounce),r=function(e){var t=e.target,n=!0===t.isSortable?t:j(t,e);if(t=q(n,t),D&&C(n,D.parentElement)&&"true"!==c(n,"_disabled")){var r=c(n,"opts");parseInt(r.maxItems)&&d(n.children,c(n,"items")).length>=parseInt(r.maxItems)&&D.parentElement!==n||(e.preventDefault(),e.stopPropagation(),e.dataTransfer.dropEffect=!0===p(n).getConfig("copy")?"copy":"move",o(n,t,e.pageY))}};a(t.concat(s),"dragover",r),a(t.concat(s),"dragenter",r)}),e)}return X.destroy=function(e){var t,n,r,o;n=c(t=e,"opts")||{},r=d(t.children,n.items),o=s(r,n.handle),i(t,"dragover"),i(t,"dragenter"),i(t,"drop"),F(t),i(o,"mousedown"),P(r),N(r)},X.enable=function(e){z(e)},X.disable=function(e){var t,n,r,o;n=c(t=e,"opts"),r=d(t.children,n.items),o=s(r,n.handle),l(t,"aria-dropeffect","none"),c(t,"_disabled","true"),l(o,"draggable","false"),i(o,"mousedown")},X.__testing={_data:c,_removeItemEvents:P,_removeItemData:N,_removeSortableData:F},X}();
+//# sourceMappingURL=html5sortable.min.js.map
diff --git a/js/version.js b/js/version.js
index 32c22bf2..3a62247f 100644
--- a/js/version.js
+++ b/js/version.js
@@ -1,6 +1,6 @@
 var version = (function() {
 
-  var current = "3.14.0";
+  var current = "3.15.0";
 
   var compare = function(a, b) {
     var pa = a.split(".");
diff --git a/manifest.json b/manifest.json
index f24042c8..c4c2865b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "name": "nightTab",
   "short_name": "nightTab",
   "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "manifest_version": 2,
   "chrome_url_overrides": {
     "newtab": "index.html"