From de091bf3ab8e0fdff8c77824cdd962056ec7a8ae Mon Sep 17 00:00:00 2001 From: Eirik Th S Date: Wed, 9 Feb 2022 16:51:19 +0100 Subject: [PATCH] New drag-and-drop system --- www/changes.txt | 1 + www/js/sortable/Sortable.min.js | 2 + www/js/sortable/jquery-sortable.js | 76 ++++++++++++++++++++++++++++++ www/plan/do.php | 13 +++-- www/plan/index.php | 6 ++- www/plan/plan.js | 68 +++++++++++++++++++++----- 6 files changed, 149 insertions(+), 17 deletions(-) create mode 100644 www/js/sortable/Sortable.min.js create mode 100644 www/js/sortable/jquery-sortable.js diff --git a/www/changes.txt b/www/changes.txt index 2b1fe56..1f4c6d3 100644 --- a/www/changes.txt +++ b/www/changes.txt @@ -1,3 +1,4 @@ +2022-02-09 Fixed drag-and-drop on iOS. 2022-02-02 Fixed wrong strikethrough. 2022-01-26 Search for products and some UI-fixes. 2022-01-19 Revamped the login-system. diff --git a/www/js/sortable/Sortable.min.js b/www/js/sortable/Sortable.min.js new file mode 100644 index 0000000..7ba6b59 --- /dev/null +++ b/www/js/sortable/Sortable.min.js @@ -0,0 +1,2 @@ +/*! Sortable 1.14.0 - MIT | git://github.com/SortableJS/Sortable.git */ +!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function e(e,t){var n,o=Object.keys(e);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(e),t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,n)),o}function A(o){for(var t=1;tt.length)&&(e=t.length);for(var n=0,o=new Array(e);n"===e[0]&&(e=e.substring(1)),t))try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return}}function N(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"!==e[0]||t.parentNode===n)&&p(t,e)||o&&t===n)return t}while(t!==n&&(t=(i=t).host&&i!==document&&i.host.nodeType?i.host:i.parentNode))}var i;return null}var g,m=/\s+/g;function I(t,e,n){var o;t&&e&&(t.classList?t.classList[n?"add":"remove"](e):(o=(" "+t.className+" ").replace(m," ").replace(" "+e+" "," "),t.className=(o+(n?" "+e:"")).replace(m," ")))}function P(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];o[e=!(e in o||-1!==e.indexOf("webkit"))?"-webkit-"+e:e]=n+("string"==typeof n?"":"px")}}function v(t,e){var n="";if("string"==typeof t)n=t;else do{var o=P(t,"transform")}while(o&&"none"!==o&&(n=o+" "+n),!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function b(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i=n.left-e&&i<=n.right+e,e=r>=n.top-e&&r<=n.bottom+e;return o&&e?a=t:void 0}}),a);if(e){var n,o={};for(n in t)t.hasOwnProperty(n)&&(o[n]=t[n]);o.target=o.rootEl=e,o.preventDefault=void 0,o.stopPropagation=void 0,e[j]._onDragOver(o)}}var i,r,a}function Yt(t){q&&q.parentNode[j]._isOutsideThisEl(t.target)}function Bt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[j]=this;var n,o,i={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return It(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==Bt.supportPointer&&"PointerEvent"in window&&!u,emptyInsertThreshold:5};for(n in K.initializePlugins(this,t,i),i)n in e||(e[n]=i[n]);for(o in Pt(e),this)"_"===o.charAt(0)&&"function"==typeof this[o]&&(this[o]=this[o].bind(this));this.nativeDraggable=!e.forceFallback&&At,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?h(t,"pointerdown",this._onTapStart):(h(t,"mousedown",this._onTapStart),h(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(h(t,"dragover",this),h(t,"dragenter",this)),Et.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,x())}function Ft(t,e,n,o,i,r,a,l){var s,c,u=t[j],d=u.options.onMove;return!window.CustomEvent||y||w?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||k(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),c=d?d.call(u,s,a):c}function jt(t){t.draggable=!1}function Ht(){Ct=!1}function Lt(t){return setTimeout(t,0)}function Kt(t){return clearTimeout(t)}Bt.prototype={constructor:Bt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(gt=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,q):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(!function(t){Tt.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&Tt.push(o)}}(o),!q&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled)&&!s.isContentEditable&&(this.nativeDraggable||!u||!l||"SELECT"!==l.tagName.toUpperCase())&&!((l=N(l,t.draggable,o,!1))&&l.animated||J===l)){if(nt=B(l),it=B(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return U({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),z("filter",n,{evt:e}),void(i&&e.cancelable&&e.preventDefault())}else if(c=c&&c.split(",").some(function(t){if(t=N(s,t.trim(),o,!1))return U({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),z("filter",n,{evt:e}),!0}))return void(i&&e.cancelable&&e.preventDefault());t.handle&&!N(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;n&&!q&&n.parentNode===r&&(o=k(n),$=r,V=(q=n).parentNode,Q=q.nextSibling,J=n,at=a.group,st={target:Bt.dragged=q,clientX:(e||t).clientX,clientY:(e||t).clientY},ht=st.clientX-o.left,ft=st.clientY-o.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,q.style["will-change"]="all",o=function(){z("delayEnded",i,{evt:t}),Bt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!s&&i.nativeDraggable&&(q.draggable=!0),i._triggerDragStart(t,e),U({sortable:i,name:"choose",originalEvent:t}),I(q,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){b(q,t.trim(),jt)}),h(l,"dragover",Xt),h(l,"mousemove",Xt),h(l,"touchmove",Xt),h(l,"mouseup",i._onDrop),h(l,"touchend",i._onDrop),h(l,"touchcancel",i._onDrop),s&&this.nativeDraggable&&(this.options.touchStartThreshold=4,q.draggable=!0),z("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(w||y)?o():Bt.eventCanceled?this._onDrop():(h(l,"mouseup",i._disableDelayedDrag),h(l,"touchend",i._disableDelayedDrag),h(l,"touchcancel",i._disableDelayedDrag),h(l,"mousemove",i._delayedDragTouchMoveHandler),h(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&h(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)))},_delayedDragTouchMoveHandler:function(t){t=t.touches?t.touches[0]:t;Math.max(Math.abs(t.clientX-this._lastX),Math.abs(t.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){q&&jt(q),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;f(t,"mouseup",this._disableDelayedDrag),f(t,"touchend",this._disableDelayedDrag),f(t,"touchcancel",this._disableDelayedDrag),f(t,"mousemove",this._delayedDragTouchMoveHandler),f(t,"touchmove",this._delayedDragTouchMoveHandler),f(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?h(document,"pointermove",this._onTouchMove):h(document,e?"touchmove":"mousemove",this._onTouchMove):(h(q,"dragend",this),h($,"dragstart",this._onDragStart));try{document.selection?Lt(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){var n;yt=!1,$&&q?(z("dragStarted",this,{evt:e}),this.nativeDraggable&&h(document,"dragover",Yt),n=this.options,t||I(q,n.dragClass,!1),I(q,n.ghostClass,!0),Bt.active=this,t&&this._appendGhost(),U({sortable:this,name:"start",originalEvent:e})):this._nulling()},_emulateDragOver:function(){if(ct){this._lastX=ct.clientX,this._lastY=ct.clientY,kt();for(var t=document.elementFromPoint(ct.clientX,ct.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(ct.clientX,ct.clientY))!==e;)e=t;if(q.parentNode[j]._isOutsideThisEl(t),e)do{if(e[j])if(e[j]._onDragOver({clientX:ct.clientX,clientY:ct.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}while(e=(t=e).parentNode);Rt()}},_onTouchMove:function(t){if(st){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=Z&&v(Z,!0),a=Z&&r&&r.a,l=Z&&r&&r.d,e=Ot&&bt&&E(bt),a=(i.clientX-st.clientX+o.x)/(a||1)+(e?e[0]-_t[0]:0)/(a||1),l=(i.clientY-st.clientY+o.y)/(l||1)+(e?e[1]-_t[1]:0)/(l||1);if(!Bt.active&&!yt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))n.right+10||t.clientX<=n.right&&t.clientY>n.bottom&&t.clientX>=n.left:t.clientX>n.right&&t.clientY>n.top||t.clientX<=n.right&&t.clientY>n.bottom+10}(n,r,this)&&!g.animated){if(g===q)return O(!1);if((l=g&&a===n.target?g:l)&&(w=k(l)),!1!==Ft($,a,q,o,l,w,n,!!l))return x(),a.appendChild(q),V=a,M(),O(!0)}else if(g&&function(t,e,n){n=k(X(n.el,0,n.options,!0));return e?t.clientX Plan - PaperBag - Plan Your Shopping + + + +
@@ -37,7 +41,7 @@ - +
diff --git a/www/plan/plan.js b/www/plan/plan.js index e919e60..e30f2bb 100644 --- a/www/plan/plan.js +++ b/www/plan/plan.js @@ -1,4 +1,7 @@ /*jshint sub:true, esversion: 6, -W083 */ + +const debug = false; + // Default timer for jquery slide, except set to 0 if the user prefers reduced motion. const prefersReducedMotion = window.matchMedia('(prefers-reduced-motion: reduce)').matches; const slideTimer = prefersReducedMotion?0:400; @@ -29,7 +32,7 @@ class Store { html += "
"; html += "
    "; html += "
  • No items added
  • "; - html += "
  • "; + // html += "
  • "; html += "
"; html += HtmlElements.store.addItemSection; @@ -62,12 +65,10 @@ class Store { if($(ev.currentTarget).hasClass('planningState')){ this.setState('planning'); - // this.selector.find(".newItemName").first().focus(); this.selector.find(".card-body").focus(); } else if($(ev.currentTarget).hasClass('shoppingState')){ this.setState('shopping'); - // this.selector.find(".checkItems input").first().focus(); this.selector.find(".card-body").focus(); } else if($(ev.currentTarget).hasClass('closedState')){ @@ -88,7 +89,46 @@ class Store { }); // INIT DRAGGING - this.draggingClass = new Draggable("draggable", 'dragHolder', 'drag-over', "#store"+storeNum,(moved, after)=> { + this.selector.find('.dragHolder').sortable({ + handle: '.draggable', + filter: '.priceWrapper, .itemButtons', + group: 'shared', + ghostClass: 'bg-secondary', + delay: 100, + delayOnTouchOnly: true, + onEnd: (evt) => { + let newStore; + if(evt.from !== evt.to){ + console.info("Item is moved to a new list."); + + let fromStoreElem= $(evt.from); + if(fromStoreElem.find("li").length <= 1){ + fromStoreElem.find('.emptyList').show(); + } + + let toStoreElem= $(evt.to); + newStore = toStoreElem.attr('data-storeid'); + toStoreElem.find('.emptyList').hide(); + } + else if(evt.oldIndex === evt.newIndex){ + console.warn("Item wasn't moved! (?)"); + return; + } + + let itemElem = $(evt.item); + let itemId = itemElem.attr('data-itemid'); + + let afterId = itemElem.prev().attr('data-itemid'); + + if(typeof afterId === "undefined"){ + afterId = 0; + } + + this.setItemPosition(itemId, afterId, newStore); + } + }); + + /*this.draggingClass = new Draggable("draggable", 'dragHolder', 'drag-over', "#store"+storeNum,(moved, after)=> { // console.log(moved, after); let movedID = moved.attr('data-itemid'); @@ -101,7 +141,7 @@ class Store { $("#refreshAll").trigger('click'); } } - }); + });*/ } setState(state, animTime){ @@ -110,22 +150,22 @@ class Store { if(state === "planning"){ this.state = "planning"; - this.selector.find('ul').addClass('storePlanState'); + this.selector.find('ul').addClass('storePlanState').find('li:not(.emptyList)').addClass('draggable'); this.selector.find('li:not(.checkedItem) .itemAmountButtons').slideDown(animTime); // this.selector.find('li:not(.checkedItem) .itemAmountText').slideUp(animTime); // this.selector.find('.checkedItem .itemAmountText:not(.oneItem)').slideDown(animTime); this.selector.find('.addItemFormWrapper').slideDown(animTime); this.selector.find('.remItem').show(); - this.draggingClass.unpause(); + // this.draggingClass.unpause(); } if(state !== "planning"){ - this.selector.find('ul').removeClass('storePlanState'); + this.selector.find('ul').removeClass('storePlanState').find('li').removeClass('draggable'); this.selector.find('.itemAmountButtons').slideUp(animTime); // this.selector.find('.itemAmountText:not(.oneItem)').slideDown(animTime); this.selector.find('.addItemFormWrapper').slideUp(animTime); this.selector.find('.remItem').hide(); - this.draggingClass.pause(); + // this.draggingClass.pause(); } if(state === "shopping"){ @@ -291,7 +331,7 @@ class Store { if(newChecked === true){ this.selector.find('#item_'+itemID).addClass("checkedItem"); - this.draggingClass.moveToBottomAnimated('#item_'+itemID); + // this.draggingClass.moveToBottomAnimated('#item_'+itemID); } else { this.selector.find('#item_'+itemID).removeClass("checkedItem"); @@ -353,10 +393,12 @@ class Store { }, 500); } - setItemPosition(itemID, afterID){ + setItemPosition(itemID, afterID, newStore){ afterID = afterID || 0; + newStore = newStore || this.storeID; + if(itemID !== afterID){ - return ajaxReq({ plan: 'moveItem', storeID: this.storeID, itemID: itemID, afterID: afterID }); + return ajaxReq({ plan: 'moveItem', storeID: this.storeID, itemID: itemID, afterID: afterID, newStoreId: newStore }); } return false; } @@ -414,7 +456,7 @@ class Store { }); // DRAGGABLE - this.draggingClass.update(); + // this.draggingClass.update(); /*let draggingObj = null, dragPos = null; this.selector.find('.draggable').unbind().on('dragstart dragover dragenter dragleave dragend', ev => { // this.selector.find('.draggable').hammer().bind('swipe', ev => {