From 0a6c4929b6d890c3640de105d196b112ca9867ff Mon Sep 17 00:00:00 2001 From: Felipe Elia Date: Tue, 23 Nov 2021 10:10:48 -0300 Subject: [PATCH 1/4] Split admin.js in notice.js and weighting.js Also alphabetically organize js and css files in package.json --- assets/js/notice.js | 19 +++++++++++++++++++ assets/js/{admin.js => weighting.js} | 20 -------------------- package.json | 20 +++++++++++--------- 3 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 assets/js/notice.js rename assets/js/{admin.js => weighting.js} (66%) diff --git a/assets/js/notice.js b/assets/js/notice.js new file mode 100644 index 0000000000..772d25263c --- /dev/null +++ b/assets/js/notice.js @@ -0,0 +1,19 @@ +const { epAdmin, ajaxurl } = window; + +jQuery('.notice').on('click', '.notice-dismiss', (event) => { + const notice = event.delegateTarget.getAttribute('data-ep-notice'); + + if (!notice) { + return; + } + + jQuery.ajax({ + method: 'post', + data: { + nonce: epAdmin.nonce, + action: 'ep_notice_dismiss', + notice, + }, + url: ajaxurl, + }); +}); diff --git a/assets/js/admin.js b/assets/js/weighting.js similarity index 66% rename from assets/js/admin.js rename to assets/js/weighting.js index cf7726587a..b73fdb01dd 100644 --- a/assets/js/admin.js +++ b/assets/js/weighting.js @@ -1,23 +1,3 @@ -const { epAdmin, ajaxurl } = window; - -jQuery('.notice').on('click', '.notice-dismiss', (event) => { - const notice = event.delegateTarget.getAttribute('data-ep-notice'); - - if (!notice) { - return; - } - - jQuery.ajax({ - method: 'post', - data: { - nonce: epAdmin.nonce, - action: 'ep_notice_dismiss', - notice, - }, - url: ajaxurl, - }); -}); - jQuery('.weighting-settings input[type=range]').on('input', function () { const el = jQuery(this); diff --git a/package.json b/package.json index b8cffc380e..498a6611dc 100644 --- a/package.json +++ b/package.json @@ -33,26 +33,28 @@ }, "10up-toolkit": { "entry": { - "admin-script.min": "./assets/js/admin.js", "autosuggest-script.min": "./assets/js/autosuggest.js", + "comments-script.min": "./assets/js/comments.js", "dashboard-script.min": "./assets/js/dashboard.js", "facets-script.min": "./assets/js/facets.js", - "sites-admin-script.min": "./assets/js/sites-admin.js", + "notice-script.min": "./assets/js/notice.js", "ordering-script.min": "./assets/js/ordering/index.js", - "stats-script.min": "./assets/js/stats.js", "related-posts-block-script.min": "./assets/js/blocks/related-posts/block.js", + "sites-admin-script.min": "./assets/js/sites-admin.js", + "stats-script.min": "./assets/js/stats.js", "synonyms-script.min": "./assets/js/synonyms/index.js", - "comments-script.min": "./assets/js/comments.js", + "weighting-script.min": "./assets/js/weighting.js", + + "autosuggest-styles.min": "./assets/css/autosuggest.css", + "comments-styles.min": "./assets/css/comments.css", "dashboard-styles.min": "./assets/css/dashboard.css", "facets-admin-styles.min": "./assets/css/facets-admin.css", "facets-styles.min": "./assets/css/facets.css", - "autosuggest-styles.min": "./assets/css/autosuggest.css", - "sites-admin-styles.min": "./assets/css/sites-admin.css", + "highlighting-styles.min": "./assets/css/highlighting.css", "ordering-styles.min": "./assets/css/ordering.css", "related-posts-block-styles.min": "./assets/css/related-posts-block.css", - "highlighting-styles.min": "./assets/css/highlighting.css", - "synonyms-styles.min": "./assets/css/synonyms.css", - "comments-styles.min": "./assets/css/comments.css" + "sites-admin-styles.min": "./assets/css/sites-admin.css", + "synonyms-styles.min": "./assets/css/synonyms.css" }, "wpDependencyExternals": false }, From a97b1484e28dc64699a17cc629915ecd1f259ab4 Mon Sep 17 00:00:00 2001 From: Felipe Elia Date: Tue, 23 Nov 2021 10:10:58 -0300 Subject: [PATCH 2/4] Built assets --- dist/js/admin-script.min.js | 1 - dist/js/autosuggest-script.min.js | 2 +- dist/js/comments-script.min.js | 2 +- dist/js/dashboard-script.min.js | 2 +- dist/js/facets-script.min.js | 2 +- dist/js/notice-script.min.js | 1 + dist/js/ordering-script.min.js | 2 +- dist/js/related-posts-block-script.min.js | 2 +- dist/js/stats-script.min.js | 2 +- dist/js/synonyms-script.min.js | 2 +- dist/js/weighting-script.min.js | 1 + 11 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 dist/js/admin-script.min.js create mode 100644 dist/js/notice-script.min.js create mode 100644 dist/js/weighting-script.min.js diff --git a/dist/js/admin-script.min.js b/dist/js/admin-script.min.js deleted file mode 100644 index d4e13ce5ca..0000000000 --- a/dist/js/admin-script.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(){var t={3099:function(t){t.exports=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t}},1223:function(t,n,r){var e=r(5112),o=r(30),i=r(3070),u=e("unscopables"),c=Array.prototype;void 0==c[u]&&i.f(c,u,{configurable:!0,value:o(null)}),t.exports=function(t){c[u][t]=!0}},9670:function(t,n,r){var e=r(111);t.exports=function(t){if(!e(t))throw TypeError(String(t)+" is not an object");return t}},1318:function(t,n,r){var e=r(5656),o=r(7466),i=r(1400),u=function(t){return function(n,r,u){var c,f=e(n),a=o(f.length),s=i(u,a);if(t&&r!=r){for(;a>s;)if((c=f[s++])!=c)return!0}else for(;a>s;s++)if((t||s in f)&&f[s]===r)return t||s||0;return!t&&-1}};t.exports={includes:u(!0),indexOf:u(!1)}},2092:function(t,n,r){var e=r(9974),o=r(8361),i=r(7908),u=r(7466),c=r(5417),f=[].push,a=function(t){var n=1==t,r=2==t,a=3==t,s=4==t,p=6==t,l=7==t,v=5==t||p;return function(y,d,h,g){for(var b,x,m=i(y),w=o(m),j=e(d,h,3),O=u(w.length),S=0,P=g||c,E=n?P(y,O):r||l?P(y,0):void 0;O>S;S++)if((v||S in w)&&(x=j(b=w[S],S,m),t))if(n)E[S]=x;else if(x)switch(t){case 3:return!0;case 5:return b;case 6:return S;case 2:f.call(E,b)}else switch(t){case 4:return!1;case 7:f.call(E,b)}return p?-1:a||s?s:E}};t.exports={forEach:a(0),map:a(1),filter:a(2),some:a(3),every:a(4),find:a(5),findIndex:a(6),filterReject:a(7)}},7475:function(t,n,r){var e=r(111),o=r(3157),i=r(5112)("species");t.exports=function(t){var n;return o(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!o(n.prototype)?e(n)&&null===(n=n[i])&&(n=void 0):n=void 0),void 0===n?Array:n}},5417:function(t,n,r){var e=r(7475);t.exports=function(t,n){return new(e(t))(0===n?0:n)}},4326:function(t){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},9920:function(t,n,r){var e=r(6656),o=r(3887),i=r(1236),u=r(3070);t.exports=function(t,n){for(var r=o(n),c=u.f,f=i.f,a=0;a=74)&&(e=u.match(/Chrome\/(\d+)/))&&(o=e[1]),t.exports=o&&+o},748:function(t){t.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},2109:function(t,n,r){var e=r(7854),o=r(1236).f,i=r(8880),u=r(1320),c=r(3505),f=r(9920),a=r(4705);t.exports=function(t,n){var r,s,p,l,v,y=t.target,d=t.global,h=t.stat;if(r=d?e:h?e[y]||c(y,{}):(e[y]||{}).prototype)for(s in n){if(l=n[s],p=t.noTargetGet?(v=o(r,s))&&v.value:r[s],!a(d?s:y+(h?".":"#")+s,t.forced)&&void 0!==p){if(typeof l===typeof p)continue;f(l,p)}(t.sham||p&&p.sham)&&i(l,"sham",!0),u(r,s,l,t)}}},7293:function(t){t.exports=function(t){try{return!!t()}catch(t){return!0}}},9974:function(t,n,r){var e=r(3099);t.exports=function(t,n,r){if(e(t),void 0===n)return t;switch(r){case 0:return function(){return t.call(n)};case 1:return function(r){return t.call(n,r)};case 2:return function(r,e){return t.call(n,r,e)};case 3:return function(r,e,o){return t.call(n,r,e,o)}}return function(){return t.apply(n,arguments)}}},5005:function(t,n,r){var e=r(7854),o=function(t){return"function"==typeof t?t:void 0};t.exports=function(t,n){return arguments.length<2?o(e[t]):e[t]&&e[t][n]}},7854:function(t,n,r){var e=function(t){return t&&t.Math==Math&&t};t.exports=e("object"==typeof globalThis&&globalThis)||e("object"==typeof window&&window)||e("object"==typeof self&&self)||e("object"==typeof r.g&&r.g)||function(){return this}()||Function("return this")()},6656:function(t,n,r){var e=r(7908),o={}.hasOwnProperty;t.exports=Object.hasOwn||function(t,n){return o.call(e(t),n)}},3501:function(t){t.exports={}},490:function(t,n,r){var e=r(5005);t.exports=e("document","documentElement")},4664:function(t,n,r){var e=r(9781),o=r(7293),i=r(317);t.exports=!e&&!o((function(){return 7!=Object.defineProperty(i("div"),"a",{get:function(){return 7}}).a}))},8361:function(t,n,r){var e=r(7293),o=r(4326),i="".split;t.exports=e((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==o(t)?i.call(t,""):Object(t)}:Object},2788:function(t,n,r){var e=r(5465),o=Function.toString;"function"!=typeof e.inspectSource&&(e.inspectSource=function(t){return o.call(t)}),t.exports=e.inspectSource},9909:function(t,n,r){var e,o,i,u=r(8536),c=r(7854),f=r(111),a=r(8880),s=r(6656),p=r(5465),l=r(6200),v=r(3501),y="Object already initialized",d=c.WeakMap;if(u||p.state){var h=p.state||(p.state=new d),g=h.get,b=h.has,x=h.set;e=function(t,n){if(b.call(h,t))throw new TypeError(y);return n.facade=t,x.call(h,t,n),n},o=function(t){return g.call(h,t)||{}},i=function(t){return b.call(h,t)}}else{var m=l("state");v[m]=!0,e=function(t,n){if(s(t,m))throw new TypeError(y);return n.facade=t,a(t,m,n),n},o=function(t){return s(t,m)?t[m]:{}},i=function(t){return s(t,m)}}t.exports={set:e,get:o,has:i,enforce:function(t){return i(t)?o(t):e(t,{})},getterFor:function(t){return function(n){var r;if(!f(n)||(r=o(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return r}}}},3157:function(t,n,r){var e=r(4326);t.exports=Array.isArray||function(t){return"Array"==e(t)}},4705:function(t,n,r){var e=r(7293),o=/#|\.prototype\./,i=function(t,n){var r=c[u(t)];return r==a||r!=f&&("function"==typeof n?e(n):!!n)},u=i.normalize=function(t){return String(t).replace(o,".").toLowerCase()},c=i.data={},f=i.NATIVE="N",a=i.POLYFILL="P";t.exports=i},111:function(t){t.exports=function(t){return"object"===typeof t?null!==t:"function"===typeof t}},1913:function(t){t.exports=!1},2190:function(t,n,r){var e=r(5005),o=r(3307);t.exports=o?function(t){return"symbol"==typeof t}:function(t){var n=e("Symbol");return"function"==typeof n&&Object(t)instanceof n}},133:function(t,n,r){var e=r(7392),o=r(7293);t.exports=!!Object.getOwnPropertySymbols&&!o((function(){var t=Symbol();return!String(t)||!(Object(t)instanceof Symbol)||!Symbol.sham&&e&&e<41}))},8536:function(t,n,r){var e=r(7854),o=r(2788),i=e.WeakMap;t.exports="function"===typeof i&&/native code/.test(o(i))},30:function(t,n,r){var e,o=r(9670),i=r(6048),u=r(748),c=r(3501),f=r(490),a=r(317),s=r(6200),p=s("IE_PROTO"),l=function(){},v=function(t){return"