From cdb264199099c3941d43623ab9c119f53887df1b Mon Sep 17 00:00:00 2001 From: Bogdan Mucenica Date: Thu, 21 Apr 2022 18:27:01 +0300 Subject: [PATCH] Fix nova 4 release bugs (#321) Co-authored-by: Bogdan Mucenica --- dist/js/field.js | 2 +- readme.md | 8 +- resources/js/components/Cropper.vue | 4 +- .../js/components/CustomPropertiesModal.vue | 1 + resources/js/components/ExistingMedia.vue | 219 +++++++++--------- resources/js/components/ExistingMediaItem.vue | 58 +++-- resources/js/components/Gallery.vue | 6 +- resources/js/components/SingleMedia.vue | 14 +- .../js/components/fields/DetailField.vue | 4 +- resources/js/components/fields/FormField.vue | 200 ++++++++-------- 10 files changed, 276 insertions(+), 240 deletions(-) diff --git a/dist/js/field.js b/dist/js/field.js index 9f79a874..bc7d42cf 100644 --- a/dist/js/field.js +++ b/dist/js/field.js @@ -1,2 +1,2 @@ /*! For license information please see field.js.LICENSE.txt */ -(()=>{var e,t={7757:(e,t,n)=>{e.exports=n(5666)},9680:(e,t,n)=>{function r(e){return e&&"object"==typeof e&&"default"in e?e.default:e}var i=r(n(9669)),o=n(3454),a=r(n(9996));function s(){return(s=Object.assign||function(e){for(var t=1;t0&&"back_forward"===window.performance.getEntriesByType("navigation")[0].type},n.handleBackForwardVisit=function(e){var t=this;window.history.state.version=e.version,this.setPage(window.history.state,{preserveScroll:!0,preserveState:!0}).then((function(){t.restoreScrollPositions(),b(e)}))},n.locationVisit=function(e,t){try{window.sessionStorage.setItem("inertiaLocationVisit",JSON.stringify({preserveScroll:t})),window.location.href=e.href,v(window.location).href===v(e).href&&window.location.reload()}catch(e){return!1}},n.isLocationVisit=function(){try{return null!==window.sessionStorage.getItem("inertiaLocationVisit")}catch(e){return!1}},n.handleLocationVisit=function(e){var t,n,r,i,o=this,a=JSON.parse(window.sessionStorage.getItem("inertiaLocationVisit")||"");window.sessionStorage.removeItem("inertiaLocationVisit"),e.url+=window.location.hash,e.rememberedState=null!=(t=null==(n=window.history.state)?void 0:n.rememberedState)?t:{},e.scrollRegions=null!=(r=null==(i=window.history.state)?void 0:i.scrollRegions)?r:[],this.setPage(e,{preserveScroll:a.preserveScroll,preserveState:!0}).then((function(){a.preserveScroll&&o.restoreScrollPositions(),b(e)}))},n.isLocationVisitResponse=function(e){return e&&409===e.status&&e.headers["x-inertia-location"]},n.isInertiaResponse=function(e){return null==e?void 0:e.headers["x-inertia"]},n.createVisitId=function(){return this.visitId={},this.visitId},n.cancelVisit=function(e,t){var n=t.cancelled,r=void 0!==n&&n,i=t.interrupted,o=void 0!==i&&i;!e||e.completed||e.cancelled||e.interrupted||(e.cancelToken.cancel(),e.onCancel(),e.completed=!1,e.cancelled=r,e.interrupted=o,y(e),e.onFinish(e))},n.finishVisit=function(e){e.cancelled||e.interrupted||(e.completed=!0,e.cancelled=!1,e.interrupted=!1,y(e),e.onFinish(e))},n.resolvePreserveOption=function(e,t){return"function"==typeof e?e(t):"errors"===e?Object.keys(t.props.errors||{}).length>0:e},n.visit=function(e,n){var r=this,o=void 0===n?{}:n,a=o.method,c=void 0===a?t.n$.GET:a,u=o.data,h=void 0===u?{}:u,d=o.replace,y=void 0!==d&&d,b=o.preserveScroll,w=void 0!==b&&b,x=o.preserveState,S=void 0!==x&&x,E=o.only,_=void 0===E?[]:E,O=o.headers,A=void 0===O?{}:O,C=o.errorBag,j=void 0===C?"":C,k=o.forceFormData,P=void 0!==k&&k,M=o.onCancelToken,R=void 0===M?function(){}:M,T=o.onBefore,D=void 0===T?function(){}:T,I=o.onStart,N=void 0===I?function(){}:I,z=o.onProgress,B=void 0===z?function(){}:z,L=o.onFinish,F=void 0===L?function(){}:L,V=o.onCancel,U=void 0===V?function(){}:V,$=o.onSuccess,W=void 0===$?function(){}:$,H=o.onError,q=void 0===H?function(){}:H,X=o.queryStringArrayFormat,Y=void 0===X?"brackets":X,G="string"==typeof e?p(e):e;if(!function e(t){return t instanceof File||t instanceof Blob||t instanceof FileList&&t.length>0||t instanceof FormData&&Array.from(t.values()).some((function(t){return e(t)}))||"object"==typeof t&&null!==t&&Object.values(t).some((function(t){return e(t)}))}(h)&&!P||h instanceof FormData||(h=f(h)),!(h instanceof FormData)){var Z=m(c,G,h,Y),K=Z[1];G=p(Z[0]),h=K}var J={url:G,method:c,data:h,replace:y,preserveScroll:w,preserveState:S,only:_,headers:A,errorBag:j,forceFormData:P,queryStringArrayFormat:Y,cancelled:!1,completed:!1,interrupted:!1};if(!1!==D(J)&&function(e){return g("before",{cancelable:!0,detail:{visit:e}})}(J)){this.activeVisit&&this.cancelVisit(this.activeVisit,{interrupted:!0}),this.saveScrollPositions();var Q=this.createVisitId();this.activeVisit=s({},J,{onCancelToken:R,onBefore:D,onStart:N,onProgress:B,onFinish:F,onCancel:U,onSuccess:W,onError:q,queryStringArrayFormat:Y,cancelToken:i.CancelToken.source()}),R({cancel:function(){r.activeVisit&&r.cancelVisit(r.activeVisit,{cancelled:!0})}}),function(e){g("start",{detail:{visit:e}})}(J),N(J),i({method:c,url:v(G).href,data:c===t.n$.GET?{}:h,params:c===t.n$.GET?h:{},cancelToken:this.activeVisit.cancelToken.token,headers:s({},A,{Accept:"text/html, application/xhtml+xml","X-Requested-With":"XMLHttpRequest","X-Inertia":!0},_.length?{"X-Inertia-Partial-Component":this.page.component,"X-Inertia-Partial-Data":_.join(",")}:{},j&&j.length?{"X-Inertia-Error-Bag":j}:{},this.page.version?{"X-Inertia-Version":this.page.version}:{}),onUploadProgress:function(e){h instanceof FormData&&(e.percentage=Math.round(e.loaded/e.total*100),function(e){g("progress",{detail:{progress:e}})}(e),B(e))}}).then((function(e){var t;if(!r.isInertiaResponse(e))return Promise.reject({response:e});var n=e.data;_.length&&n.component===r.page.component&&(n.props=s({},r.page.props,n.props)),w=r.resolvePreserveOption(w,n),(S=r.resolvePreserveOption(S,n))&&null!=(t=window.history.state)&&t.rememberedState&&n.component===r.page.component&&(n.rememberedState=window.history.state.rememberedState);var i=G,o=p(n.url);return i.hash&&!o.hash&&v(i).href===o.href&&(o.hash=i.hash,n.url=o.href),r.setPage(n,{visitId:Q,replace:y,preserveScroll:w,preserveState:S})})).then((function(){var e=r.page.props.errors||{};if(Object.keys(e).length>0){var t=j?e[j]?e[j]:{}:e;return function(e){g("error",{detail:{errors:e}})}(t),q(t)}return g("success",{detail:{page:r.page}}),W(r.page)})).catch((function(e){if(r.isInertiaResponse(e.response))return r.setPage(e.response.data,{visitId:Q});if(r.isLocationVisitResponse(e.response)){var t=p(e.response.headers["x-inertia-location"]),n=G;n.hash&&!t.hash&&v(n).href===t.href&&(t.hash=n.hash),r.locationVisit(t,!0===w)}else{if(!e.response)return Promise.reject(e);g("invalid",{cancelable:!0,detail:{response:e.response}})&&l.show(e.response.data)}})).then((function(){r.activeVisit&&r.finishVisit(r.activeVisit)})).catch((function(e){if(!i.isCancel(e)){var t=g("exception",{cancelable:!0,detail:{exception:e}});if(r.activeVisit&&r.finishVisit(r.activeVisit),t)return Promise.reject(e)}}))}},n.setPage=function(e,t){var n=this,r=void 0===t?{}:t,i=r.visitId,o=void 0===i?this.createVisitId():i,a=r.replace,s=void 0!==a&&a,c=r.preserveScroll,l=void 0!==c&&c,u=r.preserveState,f=void 0!==u&&u;return Promise.resolve(this.resolveComponent(e.component)).then((function(t){o===n.visitId&&(e.scrollRegions=e.scrollRegions||[],e.rememberedState=e.rememberedState||{},(s=s||p(e.url).href===window.location.href)?n.replaceState(e):n.pushState(e),n.swapComponent({component:t,page:e,preserveState:f}).then((function(){l||n.resetScrollPositions(),s||b(e)})))}))},n.pushState=function(e){this.page=e,window.history.pushState(e,"",e.url)},n.replaceState=function(e){this.page=e,window.history.replaceState(e,"",e.url)},n.handlePopstateEvent=function(e){var t=this;if(null!==e.state){var n=e.state,r=this.createVisitId();Promise.resolve(this.resolveComponent(n.component)).then((function(e){r===t.visitId&&(t.page=n,t.swapComponent({component:e,page:n,preserveState:!1}).then((function(){t.restoreScrollPositions(),b(n)})))}))}else{var i=p(this.page.url);i.hash=window.location.hash,this.replaceState(s({},this.page,{url:i.href})),this.resetScrollPositions()}},n.get=function(e,n,r){return void 0===n&&(n={}),void 0===r&&(r={}),this.visit(e,s({},r,{method:t.n$.GET,data:n}))},n.reload=function(e){return void 0===e&&(e={}),this.visit(window.location.href,s({},e,{preserveScroll:!0,preserveState:!0}))},n.replace=function(e,t){var n;return void 0===t&&(t={}),console.warn("Inertia.replace() has been deprecated and will be removed in a future release. Please use Inertia."+(null!=(n=t.method)?n:"get")+"() instead."),this.visit(e,s({preserveState:!0},t,{replace:!0}))},n.post=function(e,n,r){return void 0===n&&(n={}),void 0===r&&(r={}),this.visit(e,s({preserveState:!0},r,{method:t.n$.POST,data:n}))},n.put=function(e,n,r){return void 0===n&&(n={}),void 0===r&&(r={}),this.visit(e,s({preserveState:!0},r,{method:t.n$.PUT,data:n}))},n.patch=function(e,n,r){return void 0===n&&(n={}),void 0===r&&(r={}),this.visit(e,s({preserveState:!0},r,{method:t.n$.PATCH,data:n}))},n.delete=function(e,n){return void 0===n&&(n={}),this.visit(e,s({preserveState:!0},n,{method:t.n$.DELETE}))},n.remember=function(e,t){var n,r;void 0===t&&(t="default"),w||this.replaceState(s({},this.page,{rememberedState:s({},null==(n=this.page)?void 0:n.rememberedState,(r={},r[t]=e,r))}))},n.restore=function(e){var t,n;if(void 0===e&&(e="default"),!w)return null==(t=window.history.state)||null==(n=t.rememberedState)?void 0:n[e]},n.on=function(e,t){var n=function(e){var n=t(e);e.cancelable&&!e.defaultPrevented&&!1===n&&e.preventDefault()};return document.addEventListener("inertia:"+e,n),function(){return document.removeEventListener("inertia:"+e,n)}},e}(),S={buildDOMElement:function(e){var t=document.createElement("template");t.innerHTML=e;var n=t.content.firstChild;if(!e.startsWith(" diff --git a/resources/js/components/ExistingMediaItem.vue b/resources/js/components/ExistingMediaItem.vue index ad4d1716..26b35e21 100644 --- a/resources/js/components/ExistingMediaItem.vue +++ b/resources/js/components/ExistingMediaItem.vue @@ -1,25 +1,53 @@ + + diff --git a/resources/js/components/Gallery.vue b/resources/js/components/Gallery.vue index 65dfa923..ac99ed04 100644 --- a/resources/js/components/Gallery.vue +++ b/resources/js/components/Gallery.vue @@ -40,10 +40,10 @@ - diff --git a/resources/js/components/SingleMedia.vue b/resources/js/components/SingleMedia.vue index 675b8c2e..f903cd97 100644 --- a/resources/js/components/SingleMedia.vue +++ b/resources/js/components/SingleMedia.vue @@ -14,16 +14,16 @@ - + -
+
{{ size }}
{{ width }}×{{ height }} px
{{ aspectRatio }} ({{ ratio }})
-
+
{{ mimeType }}
@@ -184,8 +184,8 @@ } &.show-statistics { - padding-top: 15px; - padding-bottom: 32px; + padding-top: 22px; + padding-bottom: 43px; height: #{$item-max-size + 23px}; } @@ -204,7 +204,7 @@ right: 0; .preview { - color: var(--black); + color: var(--colors-black); } .delete { @@ -257,7 +257,7 @@ cursor: pointer; position: absolute; top: 10px; - color: rgb(var(--info)); + color: rgb(var(--colors-black)); } .edit { diff --git a/resources/js/components/fields/DetailField.vue b/resources/js/components/fields/DetailField.vue index 90efec66..776b462e 100644 --- a/resources/js/components/fields/DetailField.vue +++ b/resources/js/components/fields/DetailField.vue @@ -1,7 +1,7 @@