From 7d7e481ccb947fd7ed87181bc413c478620eb232 Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Sun, 14 Aug 2022 16:23:44 -0700 Subject: [PATCH 1/9] Add loading delay adminhtml --- js/mage/adminhtml/loader.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index c58fac2ba0c..ab19f553d8e 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -191,24 +191,23 @@ varienLoaderHandler.handler = { request.options.loaderArea = $$('#html-body .wrapper')[0]; // Blocks all page if(request && request.options.loaderArea){ - Element.clonePosition($('loading-mask'), $(request.options.loaderArea), {offsetLeft:-2}); - toggleSelectsUnderBlock($('loading-mask'), false); - Element.show('loading-mask'); - setLoaderPosition(); - if(request.options.loaderArea=='html-body'){ - //Element.show('loading-process'); - } - } - else{ - //Element.show('loading-process'); + this.interval = setInterval(function() { + Element.clonePosition($('loading-mask'), $(request.options.loaderArea), {offsetLeft:-2}); + toggleSelectsUnderBlock($('loading-mask'), false); + Element.show('loading-mask'); + setLoaderPosition(); + }, 100); } }, onComplete: function(transport) { if(Ajax.activeRequestCount == 0) { - //Element.hide('loading-process'); toggleSelectsUnderBlock($('loading-mask'), true); Element.hide('loading-mask'); + if(this.interval) { + clearInterval(this.interval); + this.interval = null; + } } } }; From 69ca7a794076f03ccf647dc64cdf2a362076d404 Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Fri, 19 Aug 2022 08:41:27 -0700 Subject: [PATCH 2/9] Add timeout to config --- app/code/core/Mage/Adminhtml/Block/Page/Head.php | 10 ++++++++++ app/code/core/Mage/Core/etc/config.xml | 3 +++ app/code/core/Mage/Core/etc/system.xml | 8 ++++++++ .../adminhtml/default/default/template/page/head.phtml | 1 + js/mage/adminhtml/loader.js | 5 ++++- 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php index 42886da968e..a82f1879b19 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Head.php @@ -44,4 +44,14 @@ public function getFormKey() { return Mage::getSingleton('core/session')->getFormKey(); } + + /** + * Retrieve Timeout Delay from Config + * + * @return string + */ + public function getLoadingTimeout() + { + return (int)Mage::getStoreConfig('admin/design/loading_timeout'); + } } diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index 3cb0b349d8d..bf138aff5b6 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -423,6 +423,9 @@ + + 100 + dashboard diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index df9b49ca33f..3f3928eedea 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -1060,6 +1060,14 @@ 0 0 + + + Number of milliseconds to delay loading indicator + 2 + 1 + 0 + 0 + diff --git a/app/design/adminhtml/default/default/template/page/head.phtml b/app/design/adminhtml/default/default/template/page/head.phtml index 918f1f99c44..ef474169bd7 100644 --- a/app/design/adminhtml/default/default/template/page/head.phtml +++ b/app/design/adminhtml/default/default/template/page/head.phtml @@ -30,6 +30,7 @@ var BASE_URL = 'getUrl('*') ?>'; var SKIN_URL = 'jsQuoteEscape($this->getSkinUrl()) ?>'; var FORM_KEY = 'getFormKey() ?>'; + var LOADING_TIMEOUT = getLoadingTimeout() ?>; getCssJsHtml() ?> diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index ab19f553d8e..bdea7b582e3 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -191,12 +191,15 @@ varienLoaderHandler.handler = { request.options.loaderArea = $$('#html-body .wrapper')[0]; // Blocks all page if(request && request.options.loaderArea){ + if(this.interval) { + clearInterval(this.interval); + } this.interval = setInterval(function() { Element.clonePosition($('loading-mask'), $(request.options.loaderArea), {offsetLeft:-2}); toggleSelectsUnderBlock($('loading-mask'), false); Element.show('loading-mask'); setLoaderPosition(); - }, 100); + }, window.LOADING_TIMEOUT || 100); } }, From 3f137a93b83b6f9e3298d10dbab434ed039b164b Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Fri, 19 Aug 2022 08:44:54 -0700 Subject: [PATCH 3/9] config validation --- app/code/core/Mage/Core/etc/system.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 3f3928eedea..f6514664b82 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -1063,6 +1063,7 @@ Number of milliseconds to delay loading indicator + validate-number validate-zero-or-greater 2 1 0 From 6271afdf41ed932b83f0e4942bf6e586976d6238 Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Fri, 19 Aug 2022 08:48:34 -0700 Subject: [PATCH 4/9] setInterval -> setTimeout --- js/mage/adminhtml/loader.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index bdea7b582e3..b208f8f8be1 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -191,10 +191,10 @@ varienLoaderHandler.handler = { request.options.loaderArea = $$('#html-body .wrapper')[0]; // Blocks all page if(request && request.options.loaderArea){ - if(this.interval) { - clearInterval(this.interval); + if(this.timeout) { + clearTimeout(this.timeout); } - this.interval = setInterval(function() { + this.timeout = setTimeout(function() { Element.clonePosition($('loading-mask'), $(request.options.loaderArea), {offsetLeft:-2}); toggleSelectsUnderBlock($('loading-mask'), false); Element.show('loading-mask'); @@ -207,9 +207,9 @@ varienLoaderHandler.handler = { if(Ajax.activeRequestCount == 0) { toggleSelectsUnderBlock($('loading-mask'), true); Element.hide('loading-mask'); - if(this.interval) { - clearInterval(this.interval); - this.interval = null; + if(this.timeout) { + clearTimeout(this.timeout); + this.timeout = null; } } } From d11ef0ff4111c9fccdbac4337ae5942bd9d8793c Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Fri, 19 Aug 2022 10:37:22 -0700 Subject: [PATCH 5/9] fix disabled loading timeout --- js/mage/adminhtml/loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index b208f8f8be1..4429bf3ed5f 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -199,7 +199,7 @@ varienLoaderHandler.handler = { toggleSelectsUnderBlock($('loading-mask'), false); Element.show('loading-mask'); setLoaderPosition(); - }, window.LOADING_TIMEOUT || 100); + }, typeof window.LOADING_TIMEOUT === 'undefined' ? 100 : window.LOADING_TIMEOUT); } }, From d97d334af5bca8d7a03cb944ce599e0edbc297e3 Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Fri, 19 Aug 2022 11:30:26 -0700 Subject: [PATCH 6/9] Make invisible loading overlay immediate to disable clicking other buttons --- .../adminhtml/default/default/template/page.phtml | 5 ++++- js/mage/adminhtml/loader.js | 11 +++++++---- skin/adminhtml/default/openmage/override.css | 10 ++++++++-- skin/adminhtml/default/openmage/override.css.map | 2 +- .../adminhtml/default/openmage/scss/override.scss | 15 ++++++++++----- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/app/design/adminhtml/default/default/template/page.phtml b/app/design/adminhtml/default/default/template/page.phtml index fc61d47d989..0871bcba3dc 100644 --- a/app/design/adminhtml/default/default/template/page.phtml +++ b/app/design/adminhtml/default/default/template/page.phtml @@ -76,7 +76,10 @@ getChildHtml('js') ?> getChildHtml('profiler') ?> getChildHtml('before_body_end') ?> diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index 4429bf3ed5f..101823c5f7f 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -191,14 +191,16 @@ varienLoaderHandler.handler = { request.options.loaderArea = $$('#html-body .wrapper')[0]; // Blocks all page if(request && request.options.loaderArea){ + Element.clonePosition($('loading-mask'), $(request.options.loaderArea), {offsetLeft:-2}); + toggleSelectsUnderBlock($('loading-mask'), false); + Element.show('loading-mask'); + Element.childElements('loading-mask').invoke('hide'); + setLoaderPosition(); if(this.timeout) { clearTimeout(this.timeout); } this.timeout = setTimeout(function() { - Element.clonePosition($('loading-mask'), $(request.options.loaderArea), {offsetLeft:-2}); - toggleSelectsUnderBlock($('loading-mask'), false); - Element.show('loading-mask'); - setLoaderPosition(); + Element.childElements('loading-mask').invoke('show'); }, typeof window.LOADING_TIMEOUT === 'undefined' ? 100 : window.LOADING_TIMEOUT); } }, @@ -207,6 +209,7 @@ varienLoaderHandler.handler = { if(Ajax.activeRequestCount == 0) { toggleSelectsUnderBlock($('loading-mask'), true); Element.hide('loading-mask'); + Element.childElements('loading-mask').invoke('hide'); if(this.timeout) { clearTimeout(this.timeout); this.timeout = null; diff --git a/skin/adminhtml/default/openmage/override.css b/skin/adminhtml/default/openmage/override.css index a9e4397da4c..fc6faec6bb2 100644 --- a/skin/adminhtml/default/openmage/override.css +++ b/skin/adminhtml/default/openmage/override.css @@ -646,10 +646,16 @@ div.autocomplete ul li.selected { } #loading-mask { + opacity: 1; +} +#loading-mask .backdrop { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; background: rgba(0, 0, 0, 0.4); - z-index: 1000; color: #2f2f2f; - opacity: 1; } #loading-mask .loader { width: 160px; diff --git a/skin/adminhtml/default/openmage/override.css.map b/skin/adminhtml/default/openmage/override.css.map index 772e4c6aff2..005f8490ef6 100644 --- a/skin/adminhtml/default/openmage/override.css.map +++ b/skin/adminhtml/default/openmage/override.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_base.scss","scss/_variables.scss","scss/_fonts.scss"],"names":[],"mappings":"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CA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAOF;EACE;;AAEA;EACE;EACA;;AAMR;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,YExfmB;EFyfnB,OE3fI;;;AF+fR;EACE,YEhgBM;EFigBN;;;AAGF;EACE,YE9gBmB;EF+gBnB;;;AAIA;EACE;;AAEA;EAEE;EACA;;AAMA;EAEE;;AAaN;EACE;EAEA;;AAEA;EACE,OE7fY;;AF+fZ;EACE,YE/iBe;;;AFwjBjB;EACE;;AAGF;EACE;;AAEA;EACE;EACA,OElhBQ;EFmhBR;EACA;EACA;;AAOF;EACE,YErjBe;;AFwjBjB;EACE,YEllBW;;AFslBf;EACE,YE9jBiB;;AFokBrB;EACE;EACA;EAEA;;AAGE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAIJ;EACE;;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAIA;EACE;;AAEA;EACE,OEvmBY;;AF2mBhB;EACE,YE5pBiB;EF6pBjB,OE7mBc;;;AFknBhB;EACE;;AAGF;EACE;;;AAIJ;EACE,YEhqBS;EFiqBT;EACA,OE9nBgB;EF+nBhB;;AAEA;EACE;EACA;EACA;EACA;EACA,OEtoBc;EFuoBd,YErrBI;EFsrBJ;EACA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE,YE3sBqB;EF4sBrB;;;AAGF;EACE,YE/sBM;;;AFktBR;EACE,YEntBM;;;AFutBN;EACE;EACA;EACA;EACA;;AAGF;EACE;;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAIA;EACE;EACA;;AAGF;EACE;;AAGF;EACE,YEpyBI;EFqyBJ;;;AAIJ;EACE,YEhzBuB;;;AFmzBzB;EACE;EACA;;AACA;EACE;;AACA;EACE,YE5vBS;;AF+vBb;EACE;;;AAGJ;EACE;;;AAGF;EACE,kBE/zBM;EFg0BN;EACA;;AAEA;EACE;EACA;EACA;EAEA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAMA;EAEE;EACA,YEv0BiB;EFw0BjB,OE/1BI;;;AFs2BN;EAEE;EACA,YE91BqB;EF+1BrB,OE12BI;;;AFi4BN;EACE;;AAGF;EACE;EACA,YEv4BI;;AFy4BJ;EACE;;AAIJ;EACE,YE/4BI;EFg5BJ,qBEh5BI;;;AFo5BR;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA,YEh6BqB;EFi6BrB;;;AAGF;EACE;;;AAOF;EACE;;;AAGF;EACE;;;AAGF;EAEE;;AAEA;EAEE;EACA;;AAWF;EAEE;;AAQJ;EACE;EACA,YEj9BM;EFk9BN;;AAEA;EACE;;;AAIJ;EACE;;AAEA;EACE,OE/6Bc;;;AFm7BlB;EACE;;;AAGF;EACE,YEt+BM;EFu+BN;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;;AAIJ;EACE;;;AAIA;EChuBA,cDiuBmD;EChuBnD;EACA,OD+tBmD;EC9tBnD;EACA,QD6tBwD;;;AAG1D;ECpuBE,cDquBoD;ECpuBpD;EACA,ODmuBoD;ECluBpD;EACA,QDiuByD;;;AAE3D;EACE,YE1hCM;;;AF6hCR;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEE;EACE,OE9iCE;;AFgjCJ;EACE;EACA;EACA;;AACA;EACE;EACA;;AAIN;EACE,YE3jCI;;AF6jCF;EACE;EACA;;;AAON;ECpxBA,cDqxByD;ECpxBzD;EACA,ODmxByD;EClxBzD;EACA,QDixB8D;;AAE9D;ECvxBA,cDwxB0D;ECvxB1D;EACA,ODsxB0D;ECrxB1D;EACA,QDoxB+D;;AAE/D;EC1xBA,cD2xBuD;EC1xBvD;EACA,ODyxBuD;ECxxBvD;EACA,QDuxB4D;EAC1D;;AAEF;EC9xBA,cD+xBwD;EC9xBxD;EACA,OD6xBwD;EC5xBxD;EACA,QD2xB6D;EAC3D;;;AAMF;ECtyBA,cDuyByD;ECtyBzD;EACA,ODqyByD;ECpyBzD;EACA,QDmyB8D;;;AAIhE;EC3yBE,cD4yBmD;EC3yBnD;EACA,OD0yBmD;ECzyBnD;EACA,QDwyBwD;;;AAG1D;EACE;;;AAGF;EACE","file":"override.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_base.scss","scss/_variables.scss","scss/_fonts.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;ACMA;EACE,OCiDgB;EDhDhB;EACA,YCLuB;;;ADUzB;EACE;EACA;EAEA;EACA;;;AAKF;EACE;EACA,OC8BgB;ED7BhB;EACA;;;AAKF;EACE,YC3BmB;ED4BnB,OCqBgB;EDpBhB;EACA;;;AAKF;EACE;EACA,YCnCqB;EDoCrB;;;AAKF;EACE;EACA;EACA;EACA;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAgBF;EACE,YCrEU;EDsEV,OC9BgB;EDgChB;;;AAKF;EACE,OCtCgB;EDuChB;EACA;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKF;EAEE;EACA;EACA;EACA;EAEA;;;AAKF;EACE;EACA;EACA;;;AAKF;EACE;EACA;EACA;;;AAKF;EACE;EACA,YChIwB;EDiIxB,OCzJM;;;ADiSR;EACE,kBClSM;EDmSN;EAEA;;;AE/SF;EACE;EACA,wLAE4D;EAC5D;EACA;;AAGF;EACE;EACA,8LAE8D;EAC9D;EACA;;AAGF;EACE;EACA,qLAE2D;EAC3D;EACA;;AAEF;EACE;EACA,iMAE+D;EAC/D;EACA;;AHpBF;EACE,OE2CgB;EF1ChB;;;AAGF;EACE,OEsCgB;EFrChB;;;AAGF;EACE,OEiCgB;EFhChB;;;AAGF;EACE,OE4BgB;EF3BhB;;;AAGF;EACE,OEuBgB;EFtBhB;;;AAGF;EACE,OEkBgB;EFjBhB;;;AAGF;EACE,OEagB;EFZhB;;;AAGF;EACE;EACA,OE5C0B;EF6C1B;;AAEA;EACE,OEhDwB;;AFmD1B;EACE,OEnDkB;EFoDlB;;AAGF;EACE,OExDkB;EFyDlB;;AAGF;EACE,OE7DkB;EF8DlB;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA,OE9BgB;;;AFiClB;EACE;EACA;EACA;;;AAGF;EAEE;;;AAOF;EAEE,YEtGuB;EFuGvB;;;AAOF;EACE;EACA;;AAMA;EACE;;AAGF;EACE;;AAGF;EACE;;;AAIJ;EAEE;EACA;;AACA;EAEE;EACA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAIF;EACE;;AAKE;EACE,OEjHY;EFkHZ;EACA;EACA;;AAGF;EACE;;AAEA;EACE;;AA2BN;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;AAIJ;EACE;EACA,YElNE;EFmNF;;AAEA;EACE;;AAGF;EACE;;AAIJ;EACE;EACA,YEhOE;;AFoOF;EACE,YEpOkB;;AFuOpB;EACE,YExOkB;;AF2OpB;EACE,YE5OkB;;AFkPtB;EACE;;AAEA;EACE;EACA;;AAIA;EACE;;AAGF;EACE;EACA;EACA;;AAIJ;EC2CJ,cD1CyD;EC2CzD;EACA,OD5CyD;EC6CzD;EACA,QD9C8D;EACxD;;AAIJ;EACE,YE5QiB;EF6QjB;;AAEA;EACE;EACA;EACA;EACA,OErRA;EFsRA;;AAEA;EACE,OEzRF;EF0RE;;AAEA;EACE,OE/RS;;AFqST;EACE;;AAEA;EAEE;EACA;;AAQJ;EACE;;AAEA;EAEE;EACA;;AAMR;EACE,OE9TF;EF+TE;;AAMJ;EACE,YEvUe;;AF0UjB;EACE,YE3Ue;;AFiVnB;EACE;;AAGF;EACE;;AAIJ;EACE;;;AAIJ;EACE,YExWmB;;;AF2WrB;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;EACA;EACA,kBEpYE;EFqYF;EACA;EAEA;EAEA;;AACA;EACE;;AAWR;EACE,YEzZqB;EF0ZrB;EACA;EACA;EACA;;;AAIA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE,YE3ae;EF4af;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA,YEjba;EFkbb;;AAMR;EACE;EACA,OE9Yc;EF+Yd;;AAEA;EACE,YEhcE;EFicF;;AAGF;EACE,YErcE;EFscF,OExZY;EFyZZ;EACA;;AAEA;EAEE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAOF;EACE;;AAEA;EACE;EACA;;AAMR;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,YExfmB;EFyfnB,OE3fI;;;AF+fR;EACE,YEhgBM;EFigBN;;;AAGF;EACE,YE9gBmB;EF+gBnB;;;AAIA;EACE;;AAEA;EAEE;EACA;;AAMA;EAEE;;AAaN;EACE;EAEA;;AAEA;EACE,OE7fY;;AF+fZ;EACE,YE/iBe;;;AFwjBjB;EACE;;AAGF;EACE;;AAEA;EACE;EACA,OElhBQ;EFmhBR;EACA;EACA;;AAOF;EACE,YErjBe;;AFwjBjB;EACE,YEllBW;;AFslBf;EACE,YE9jBiB;;AFokBrB;EACE;EACA;EAEA;;AAGE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAIJ;EACE;;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAIA;EACE;;AAEA;EACE,OEvmBY;;AF2mBhB;EACE,YE5pBiB;EF6pBjB,OE7mBc;;;AFknBhB;EACE;;AAGF;EACE;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA,YEvqBO;EFwqBP,OEpoBc;;AFsoBhB;EACE;EACA;EACA;EACA;EACA,OE3oBc;EF4oBd,YE1rBI;EF2rBJ;EACA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE,YEhtBqB;EFitBrB;;;AAGF;EACE,YEptBM;;;AFutBR;EACE,YExtBM;;;AF4tBN;EACE;EACA;EACA;EACA;;AAGF;EACE;;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAIA;EACE;EACA;;AAGF;EACE;;AAGF;EACE,YEzyBI;EF0yBJ;;;AAIJ;EACE,YErzBuB;;;AFwzBzB;EACE;EACA;;AACA;EACE;;AACA;EACE,YEjwBS;;AFowBb;EACE;;;AAGJ;EACE;;;AAGF;EACE,kBEp0BM;EFq0BN;EACA;;AAEA;EACE;EACA;EACA;EAEA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAMA;EAEE;EACA,YE50BiB;EF60BjB,OEp2BI;;;AF22BN;EAEE;EACA,YEn2BqB;EFo2BrB,OE/2BI;;;AFs4BN;EACE;;AAGF;EACE;EACA,YE54BI;;AF84BJ;EACE;;AAIJ;EACE,YEp5BI;EFq5BJ,qBEr5BI;;;AFy5BR;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA,YEr6BqB;EFs6BrB;;;AAGF;EACE;;;AAOF;EACE;;;AAGF;EACE;;;AAGF;EAEE;;AAEA;EAEE;EACA;;AAWF;EAEE;;AAQJ;EACE;EACA,YEt9BM;EFu9BN;;AAEA;EACE;;;AAIJ;EACE;;AAEA;EACE,OEp7Bc;;;AFw7BlB;EACE;;;AAGF;EACE,YE3+BM;EF4+BN;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;;AAIJ;EACE;;;AAIA;ECruBA,cDsuBmD;ECruBnD;EACA,ODouBmD;ECnuBnD;EACA,QDkuBwD;;;AAG1D;ECzuBE,cD0uBoD;ECzuBpD;EACA,ODwuBoD;ECvuBpD;EACA,QDsuByD;;;AAE3D;EACE,YE/hCM;;;AFkiCR;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEE;EACE,OEnjCE;;AFqjCJ;EACE;EACA;EACA;;AACA;EACE;EACA;;AAIN;EACE,YEhkCI;;AFkkCF;EACE;EACA;;;AAON;ECzxBA,cD0xByD;ECzxBzD;EACA,ODwxByD;ECvxBzD;EACA,QDsxB8D;;AAE9D;EC5xBA,cD6xB0D;EC5xB1D;EACA,OD2xB0D;EC1xB1D;EACA,QDyxB+D;;AAE/D;EC/xBA,cDgyBuD;EC/xBvD;EACA,OD8xBuD;EC7xBvD;EACA,QD4xB4D;EAC1D;;AAEF;ECnyBA,cDoyBwD;ECnyBxD;EACA,ODkyBwD;ECjyBxD;EACA,QDgyB6D;EAC3D;;;AAMF;EC3yBA,cD4yByD;EC3yBzD;EACA,OD0yByD;ECzyBzD;EACA,QDwyB8D;;;AAIhE;EChzBE,cDizBmD;EChzBnD;EACA,OD+yBmD;EC9yBnD;EACA,QD6yBwD;;;AAG1D;EACE;;;AAGF;EACE","file":"override.css"} \ No newline at end of file diff --git a/skin/adminhtml/default/openmage/scss/override.scss b/skin/adminhtml/default/openmage/scss/override.scss index c278132d388..07e2d608b73 100644 --- a/skin/adminhtml/default/openmage/scss/override.scss +++ b/skin/adminhtml/default/openmage/scss/override.scss @@ -690,11 +690,16 @@ div { } #loading-mask { - background: $black_40; - z-index: 1000; - color: $color_dark_grey; opacity: 1; - + .backdrop { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: $black_40; + color: $color_dark_grey; + } .loader { width: 160px; height: 100px; @@ -1135,4 +1140,4 @@ img[src$='grid-cal.gif'] { .emph, .accent { color: $color_action !important; -} \ No newline at end of file +} From 3558bd3c447ccd4af1b83c9b8533c86c786550af Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Fri, 19 Aug 2022 11:59:34 -0700 Subject: [PATCH 7/9] translations --- app/code/core/Mage/Core/etc/system.xml | 2 +- app/locale/en_US/Mage_Core.csv | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index f6514664b82..59d3a7c1a27 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -1062,7 +1062,7 @@ - Number of milliseconds to delay loading indicator + Number of milliseconds to delay showing the loading indicator. The default value is "100". Enter an empty value to disable the loading indicator delay. validate-number validate-zero-or-greater 2 1 diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv index aa662f367ac..92b01a69884 100644 --- a/app/locale/en_US/Mage_Core.csv +++ b/app/locale/en_US/Mage_Core.csv @@ -441,3 +441,5 @@ "Admin","Admin" "Frontend","Frontend" "The store view #%d is disabled.","The store view #%d is disabled." +"Loading Indicator Timeout","Loading Indicator Timeout" +"Number of milliseconds to delay showing the loading indicator. The default value is ""100"". Enter an empty value to disable the loading indicator delay.","Number of milliseconds to delay showing the loading indicator. The default value is ""100"". Enter an empty value to disable the loading indicator delay." From 2e33abdeac52a7034bcc7e7395e376bb14740a53 Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Sun, 21 Aug 2022 15:33:47 -0700 Subject: [PATCH 8/9] translation fixes --- app/code/core/Mage/Core/etc/system.xml | 2 +- app/locale/en_US/Mage_Core.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 59d3a7c1a27..b40c4a2fdb6 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -1062,7 +1062,7 @@ - Number of milliseconds to delay showing the loading indicator. The default value is "100". Enter an empty value to disable the loading indicator delay. + Number of milliseconds to delay showing the loading indicator. The default value is "100". An empty value disables the delay. validate-number validate-zero-or-greater 2 1 diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv index 92b01a69884..1cf856fa904 100644 --- a/app/locale/en_US/Mage_Core.csv +++ b/app/locale/en_US/Mage_Core.csv @@ -442,4 +442,4 @@ "Frontend","Frontend" "The store view #%d is disabled.","The store view #%d is disabled." "Loading Indicator Timeout","Loading Indicator Timeout" -"Number of milliseconds to delay showing the loading indicator. The default value is ""100"". Enter an empty value to disable the loading indicator delay.","Number of milliseconds to delay showing the loading indicator. The default value is ""100"". Enter an empty value to disable the loading indicator delay." +"Number of milliseconds to delay showing the loading indicator. The default value is ""100"". An empty value disables the delay.","Number of milliseconds to delay showing the loading indicator. The default value is ""100"". An empty value disables the delay." From 711291e3f9a20223fcf11eca65a9c1fdcb5d9e53 Mon Sep 17 00:00:00 2001 From: Justin Beaty Date: Mon, 22 Aug 2022 05:05:46 -0700 Subject: [PATCH 9/9] 100ms -> 200ms default --- app/code/core/Mage/Core/etc/config.xml | 2 +- app/code/core/Mage/Core/etc/system.xml | 2 +- app/locale/en_US/Mage_Core.csv | 2 +- js/mage/adminhtml/loader.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index bf138aff5b6..763f5525b58 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -424,7 +424,7 @@ - 100 + 200 dashboard diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index b40c4a2fdb6..1f6e61f5e28 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -1062,7 +1062,7 @@ - Number of milliseconds to delay showing the loading indicator. The default value is "100". An empty value disables the delay. + Number of milliseconds to delay showing the loading indicator. The default value is "200". An empty value disables the delay. validate-number validate-zero-or-greater 2 1 diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv index 1cf856fa904..5de5211768b 100644 --- a/app/locale/en_US/Mage_Core.csv +++ b/app/locale/en_US/Mage_Core.csv @@ -442,4 +442,4 @@ "Frontend","Frontend" "The store view #%d is disabled.","The store view #%d is disabled." "Loading Indicator Timeout","Loading Indicator Timeout" -"Number of milliseconds to delay showing the loading indicator. The default value is ""100"". An empty value disables the delay.","Number of milliseconds to delay showing the loading indicator. The default value is ""100"". An empty value disables the delay." +"Number of milliseconds to delay showing the loading indicator. The default value is ""200"". An empty value disables the delay.","Number of milliseconds to delay showing the loading indicator. The default value is ""200"". An empty value disables the delay." diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index 101823c5f7f..d6d5d835d54 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -201,7 +201,7 @@ varienLoaderHandler.handler = { } this.timeout = setTimeout(function() { Element.childElements('loading-mask').invoke('show'); - }, typeof window.LOADING_TIMEOUT === 'undefined' ? 100 : window.LOADING_TIMEOUT); + }, typeof window.LOADING_TIMEOUT === 'undefined' ? 200 : window.LOADING_TIMEOUT); } },