diff --git a/build/package-lock.json b/build/package-lock.json index 202fa27c4c0..027d0c74f01 100644 --- a/build/package-lock.json +++ b/build/package-lock.json @@ -12,7 +12,7 @@ "tui-image-editor": "^3.10.0" }, "devDependencies": { - "@concretecms/bedrock": "^1.5.2", + "@concretecms/bedrock": "^1.5.3", "cross-env": "^5.1.1", "download": "~8.0.0", "grunt": "^1.5.3", @@ -1751,9 +1751,9 @@ } }, "node_modules/@concretecms/bedrock": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@concretecms/bedrock/-/bedrock-1.5.2.tgz", - "integrity": "sha512-rGmyPSt2uXp6P8pGRGn3N7Hcfar4zI91SqFvxfpmA8WAMAg3BGeQuJHYnFL4k+3zsYPXFmqVKV8Fq+6XXq6JwA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@concretecms/bedrock/-/bedrock-1.5.3.tgz", + "integrity": "sha512-+J8wbd9naP+S9WM19RHShHTWReygocre2AZpNw2utQ9Xg472qzdqzMRXDyHCVpNKpgqYCPu/CgzWZUWYWDQGFQ==", "dev": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", diff --git a/build/package.json b/build/package.json index cdd3e8638a2..e7cd2028014 100644 --- a/build/package.json +++ b/build/package.json @@ -13,7 +13,7 @@ "production": "mix --production" }, "devDependencies": { - "@concretecms/bedrock": "^1.5.2", + "@concretecms/bedrock": "^1.5.3", "cross-env": "^5.1.1", "download": "~8.0.0", "grunt": "^1.5.3", diff --git a/build/tasks/build-release/download.js b/build/tasks/build-release/download.js index 09965968aca..8edc066788d 100644 --- a/build/tasks/build-release/download.js +++ b/build/tasks/build-release/download.js @@ -3,7 +3,7 @@ const download = require('download'); module.exports = function(grunt, config, parameters, done) { - var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.3.4.zip'; + var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.3.5.zip'; var workFolder = parameters.releaseWorkFolder || './release'; function endForError(e) { process.stderr.write(e.message || e); diff --git a/concrete/blocks/top_navigation_bar/view.php b/concrete/blocks/top_navigation_bar/view.php index 8afc4cfdb85..7ce80a7c14b 100644 --- a/concrete/blocks/top_navigation_bar/view.php +++ b/concrete/blocks/top_navigation_bar/view.php @@ -77,7 +77,15 @@ */ if (count($item->getChildren()) > 0) { ?>
t?(o&&(clearTimeout(o),o=null),s=p,r=e.apply(i,a),o||(i=a=null)):o||!1===n.trailing||(o=setTimeout(c,l)),r};return p.cancel=function(){clearTimeout(o),s=0,o=i=a=null},p}function Rt(e,t,n){var o,i,a,r,s,c=function c(){var p=rt()-i;t>p?o=setTimeout(c,t-p):(o=null,n||(r=e.apply(s,a)),o||(a=s=null))},p=y((function(p){return s=this,a=p,i=rt(),o||(o=setTimeout(c,t),n&&(r=e.apply(s,a))),r}));return p.cancel=function(){clearTimeout(o),o=a=s=null},p}function Ct(e,t){return vt(t,e)}function xt(e){return function(){return!e.apply(this,arguments)}}function Yt(){var e=arguments,t=e.length-1;return function(){for(var n=t,o=e[t].apply(this,arguments);n--;)o=e[n].call(this,o);return o}}function Nt(e,t){return function(){if(--e<1)return t.apply(this,arguments)}}function Et(e,t){var n;return function(){return--e>0&&(n=t.apply(this,arguments)),e<=1&&(t=null),n}}const Bt=vt(Et,2);function Pt(e,t,n){t=et(t,n);for(var o,i=pe(e),a=0,r=i.length;a=3;return function(t,n,o,i){var a=!Lt(t)&&pe(t),r=(a||t).length,s=e>0?0:r-1;for(i||(o=t[a?a[s]:s],s+=e);s>=0&&s0&&void 0!==arguments[0]?arguments[0]:"#ccm-tooltip-holder";$(".modal-backdrop").appendTo(e)}}],n&&ao(t.prototype,n),o&&ao(t,o),Object.defineProperty(t,"prototype",{writable:!1}),t;var t,n,o}();__webpack_require__.g.ConcreteModal=so;var co=__webpack_require__(4333);function po(e){return po="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},po(e)}function lo(e,t){for(var n=0;n
t?(o&&(clearTimeout(o),o=null),s=p,r=e.apply(i,a),o||(i=a=null)):o||!1===n.trailing||(o=setTimeout(c,l)),r};return p.cancel=function(){clearTimeout(o),s=0,o=i=a=null},p}function Rt(e,t,n){var o,i,a,r,s,c=function c(){var p=rt()-i;t>p?o=setTimeout(c,t-p):(o=null,n||(r=e.apply(s,a)),o||(a=s=null))},p=y((function(p){return s=this,a=p,i=rt(),o||(o=setTimeout(c,t),n&&(r=e.apply(s,a))),r}));return p.cancel=function(){clearTimeout(o),o=a=s=null},p}function Ct(e,t){return vt(t,e)}function xt(e){return function(){return!e.apply(this,arguments)}}function Yt(){var e=arguments,t=e.length-1;return function(){for(var n=t,o=e[t].apply(this,arguments);n--;)o=e[n].call(this,o);return o}}function Nt(e,t){return function(){if(--e<1)return t.apply(this,arguments)}}function Et(e,t){var n;return function(){return--e>0&&(n=t.apply(this,arguments)),e<=1&&(t=null),n}}const Bt=vt(Et,2);function Pt(e,t,n){t=et(t,n);for(var o,i=pe(e),a=0,r=i.length;a=3;return function(t,n,o,i){var a=!Lt(t)&&pe(t),r=(a||t).length,s=e>0?0:r-1;for(i||(o=t[a?a[s]:s],s+=e);s>=0&&s0&&void 0!==arguments[0]?arguments[0]:"#ccm-tooltip-holder";$(".modal-backdrop").appendTo(e)}}],n&&ao(t.prototype,n),o&&ao(t,o),Object.defineProperty(t,"prototype",{writable:!1}),t;var t,n,o}();__webpack_require__.g.ConcreteModal=so;var co=__webpack_require__(4333);function po(e){return po="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},po(e)}function lo(e,t){for(var n=0;n