diff --git a/core/built/assets/vendor.min-c9af09169347396b41adeb91d93f887f.js b/core/built/assets/vendor.min-f0b6b0576d65cebb54cdc88dc5f72755.js similarity index 99% rename from core/built/assets/vendor.min-c9af09169347396b41adeb91d93f887f.js rename to core/built/assets/vendor.min-f0b6b0576d65cebb54cdc88dc5f72755.js index 6d2f7c95d4..bd180cd848 100644 --- a/core/built/assets/vendor.min-c9af09169347396b41adeb91d93f887f.js +++ b/core/built/assets/vendor.min-f0b6b0576d65cebb54cdc88dc5f72755.js @@ -15523,7 +15523,7 @@ if(e&&a){let t=getComputedStyle(e),r=getComputedStyle(a),n=a.offsetTop,i=parseIn u=n-(i+o)/2+f}else e?u=e.offsetTop+e.offsetHeight+f:a&&(u=-26,l=30) u-=2,u+=30 let b=parseInt(s.style.left),g=parseInt(s.style.top) -u>=g-1&&u<=g+1&&m>=b-1&&m<=b+1?s.style.opacity=1:(s.style.opacity=0,this._dropIndicatorTimeout=Ember.run.later(this,function(){s.style.height="4px",s.style.width=`${p}px`,s.style.left=`${m}px`,s.style.top=`${u}px`,s.style.opacity=1},150)),i.forEach(e=>{e.style.transform="translate3d(0, 0, 0)",e.style.transitionDuration="250ms",this._transformedDroppables.push(e)}),o.forEach(e=>{e.style.transform=`translate3d(0, ${l}px, 0)`,e.style.transitionDuration="250ms",this._transformedDroppables.push(e)})}},_hideDropIndicator({clearInsertIndex:e=!0}={}){Ember.run.cancel(this._dropIndicatorTimeout),e&&this.draggableInfo&&delete this.draggableInfo.insertIndex,this._transformedDroppables.forEach(e=>{e.style.transform=""}),this.transformedDroppables=Ember.A([]),this._dropIndicator&&(this._dropIndicator.style.opacity=0)},_resetDrag(){this._waitForDragStart.cancelAll(),this._hideDropIndicator(),this._removeMoveListeners(),this._removeReleaseListeners(),this.scrollHandler.dragStop(),this.grabbedElement&&(this.grabbedElement.style.opacity=""),this.set("isDragging",!1),this.set("grabbedElement",null),this.set("sourceContainer",null),this.ghostInfo&&(this.ghostInfo.element.remove(),this.set("ghostInfo",null)),this.containers.forEach(e=>{e.onDragEnd()}),this._elementsWithHoverRemoved.forEach(e=>{e.classList.add("kg-card-hover")}),delete this._elementsWithHoverRemoved,r.applyUserSelect(document.body,""),document.querySelectorAll('[data-kg="editor"]').forEach(e=>{e.style.cursor=""})},_appendDropIndicator(){let e=document.querySelector(`#${t.DROP_INDICATOR_ID}`) +u>=g-1&&u<=g+1&&m>=b-1&&m<=b+1?s.style.opacity=1:(s.style.opacity=0,this._dropIndicatorTimeout=Ember.run.later(this,function(){s.style.height="4px",s.style.width=`${p}px`,s.style.left=`${m}px`,s.style.top=`${u}px`,s.style.opacity=1},150)),i.forEach(e=>{e.style.transform="translate3d(0, 0, 0)",e.style.transitionDuration="250ms",this._transformedDroppables.push(e)}),o.forEach(e=>{e.style.transform=`translate3d(0, ${l}px, 0)`,e.style.transitionDuration="250ms",this._transformedDroppables.push(e)})}},_hideDropIndicator({clearInsertIndex:e=!0}={}){Ember.run.cancel(this._dropIndicatorTimeout),e&&this.draggableInfo&&delete this.draggableInfo.insertIndex,this._transformedDroppables.forEach(e=>{e.style.transform=""}),this.transformedDroppables=Ember.A([]),this._dropIndicator&&(this._dropIndicator.style.opacity=0)},_resetDrag(){this._waitForDragStart.cancelAll(),this._hideDropIndicator(),this._removeMoveListeners(),this._removeReleaseListeners(),this.scrollHandler.dragStop(),this.grabbedElement&&(this.grabbedElement.style.opacity=""),this.set("isDragging",!1),this.set("grabbedElement",null),this.set("sourceContainer",null),this.ghostInfo&&(this.ghostInfo.element.remove(),this.set("ghostInfo",null)),this.containers.forEach(e=>{e.onDragEnd()}),this._elementsWithHoverRemoved&&this._elementsWithHoverRemoved.forEach(e=>{e.classList.add("kg-card-hover")}),delete this._elementsWithHoverRemoved,r.applyUserSelect(document.body,""),document.querySelectorAll('[data-kg="editor"]').forEach(e=>{e.style.cursor=""})},_appendDropIndicator(){let e=document.querySelector(`#${t.DROP_INDICATOR_ID}`) if(!e){(e=document.createElement("div")).id=t.DROP_INDICATOR_ID,e.classList.add("bg-blue","br-pill"),e.style.position="absolute",e.style.opacity=0,e.style.width="4px",e.style.height=0,e.style.zIndex=t.DROP_INDICATOR_ZINDEX,e.style.pointerEvents="none",(document.querySelector(".koenig-editor")||r.getDocumentScrollingElement()).appendChild(e)}this._dropIndicator=e},_appendGhostContainerElement(){if(!this._ghostContainerElement){let e=document.createElement("div") e.id=t.GHOST_CONTAINER_ID,e.style.position="fixed",e.style.width="100%",document.body.appendChild(e),this._ghostContainerElement=e}},_removeDropIndicator(){this._dropIndicator&&this._dropIndicator.remove()},_removeGhostContainerElement(){this.ghostContainerElement&&this.ghostContainerElement.remove()},_addGrabListeners(){this._addEventListener("mousedown",this._onMouseDown,{passive:!1})},_removeGrabListeners(){this._removeEventListener("mousedown")},_addMoveListeners(){this._addEventListener("mousemove",this._onMouseMove,{passive:!1})},_removeMoveListeners(){this._removeEventListener("mousemove")},_addReleaseListeners(){this._addEventListener("mouseup",this._onMouseUp,{passive:!1})},_removeReleaseListeners(){this._removeEventListener("mouseup")},_addKeyDownListeners(){this._addEventListener("keydown",this._onKeyDown)},_removeKeyDownListeners(){this._removeEventListener("keydown")},_addEventListener(e,t,r){if(!this._eventHandlers[e]){let n=Ember.run.bind(this,t) this._eventHandlers[e]={handler:n,options:r},document.addEventListener(e,n,r)}},_removeEventListener(e){let t=this._eventHandlers[e] diff --git a/core/server/api/v2/db.js b/core/server/api/v2/db.js index 36edd8af94..96fc71a8f7 100644 --- a/core/server/api/v2/db.js +++ b/core/server/api/v2/db.js @@ -73,7 +73,7 @@ module.exports = { method: 'importContent' }, query(frame) { - return importer.importFromFile(frame.data, {include: frame.options.withRelated}); + return importer.importFromFile(frame.file, {include: frame.options.withRelated}); } }, diff --git a/core/server/web/admin/views/default-prod.html b/core/server/web/admin/views/default-prod.html index 52867e9d1c..6e4ab2a6d4 100644 --- a/core/server/web/admin/views/default-prod.html +++ b/core/server/web/admin/views/default-prod.html @@ -52,7 +52,7 @@
- + diff --git a/core/server/web/admin/views/default.html b/core/server/web/admin/views/default.html index 52867e9d1c..6e4ab2a6d4 100644 --- a/core/server/web/admin/views/default.html +++ b/core/server/web/admin/views/default.html @@ -52,7 +52,7 @@
- + diff --git a/package.json b/package.json index adf7850562..7ec0fb0205 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "2.9.0", + "version": "2.9.1", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org",