Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v19 -> v20 #2571

Merged
merged 86 commits into from
Nov 7, 2022
Merged
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
ad144a0
Fixed whitespace for docblocks (#2550)
fballiano Sep 4, 2022
88442db
Remove redundant polyfill code for error reporting constants (#2555)
elidrissidev Sep 5, 2022
3759da2
Fixed whitespace for docblocks (#2556)
fballiano Sep 5, 2022
63fe2f8
Some CSS fixes to OpenMage adminhtml theme (#2422)
sreichel Sep 5, 2022
9c3292d
Fixed whitespace for docblocks (#2558)
fballiano Sep 5, 2022
39786c3
Set default width for grid datetime columns, ref #2239 (#2544)
sreichel Sep 6, 2022
38e6465
Removed PHP 5.3 compatibility code from Mage_Adminhtml_Model_System_C…
fballiano Sep 6, 2022
72cf5aa
Added info about targetNamespace change in README (#2559)
fballiano Sep 7, 2022
2fdc338
Removed unused controller Mage_Shipping_ShippingController (#2564)
fballiano Sep 7, 2022
81abc58
PHPStan: fixed calls on Varien_Object/Mage_Core_Model_Abstract (#2565)
sreichel Sep 7, 2022
1493f9d
Added scss-cache and .phar files to .gitignore (#2566)
sreichel Sep 7, 2022
fc7568b
Changed boolean/integer to bool/int in docblocks (#2567)
sreichel Sep 7, 2022
ff9bb2c
Fixed whitespace for docblocks (#2562)
fballiano Sep 7, 2022
76e6ee9
An Exception is thrown and logged if file is not found while merging …
fballiano Sep 7, 2022
082269a
Fixed PHPStan error with Mage_Catalog_Model_Resource_Product_Option_C…
fballiano Sep 7, 2022
c96b38b
Make php7.3 minimum requirement (#2413)
sreichel Sep 7, 2022
70051ea
Added missing css.map for adminhtml (openmage theme) (#2573)
sreichel Sep 7, 2022
59550af
Added php-extension "intl" as requirement, updated composer (#2437)
sreichel Sep 8, 2022
d985c65
Deleted Mage_AmazonPayments.csv (#2579)
elidrissidev Sep 8, 2022
96d5bf9
Update label for `system/csrf/use_form_key` config (#2578)
elidrissidev Sep 9, 2022
51883f3
Replaced dirname(__FILE__) with __DIR__ (#2582)
Sdfendor Sep 9, 2022
4b6d9b4
Fixed some docs for phpdocumentor (#2577)
sreichel Sep 9, 2022
51f21fb
Added some return statements to match parent class or interface (#2574)
sreichel Sep 10, 2022
6d42223
PHPStan: return type fixes (#2587)
sreichel Sep 11, 2022
1ea13bf
Use null coalescing operator (#2543)
sreichel Sep 12, 2022
afa28c2
Updated phpstan experimental (#2589)
sreichel Sep 12, 2022
19f1b3c
PHPStan: fixed "Access to an undefined property" (#2554)
sreichel Sep 12, 2022
526f463
Stripped null bytes from strings and filter conditions (#1430)
colinmollenhour Sep 12, 2022
14b5218
Fixed phpstan-workflow (#2593)
sreichel Sep 12, 2022
765aab2
Some fixes for phpdocs (#2588)
sreichel Sep 12, 2022
abad397
Removed unused Mage_GoogleBase.csv (#2599)
sreichel Sep 14, 2022
3ad4739
Better admin/config validation for allowed currencies (#2597)
sreichel Sep 14, 2022
b848075
Fix admin grid filter, ref #1430 (#2602)
sreichel Sep 14, 2022
eaceabf
Update deprecated using ${var} (#2611)
sreichel Sep 19, 2022
34bc580
fix #1192 (#1198)
Sep 19, 2022
4f55deb
PHPStan: fixes for Mage_Catalog_Model_Product_Type_Abstract (#2605)
sreichel Sep 20, 2022
0dd2476
PHPDocs: Undefined methods (#2613)
sreichel Sep 21, 2022
5ae4f7f
Downgraded composer dependencies to also fit php7.3 (#2576)
sreichel Sep 21, 2022
75532e6
Added two indexes on sales_flat_order and sales_flat_order_item table…
fballiano Sep 22, 2022
0705626
Phpdocs/phpstan update (#2596)
sreichel Sep 23, 2022
f5ea92b
Replace Date Format String Literals With Existing Constants (#2592)
Sdfendor Sep 23, 2022
641a41d
Fix passing null to preg_split limit param (#2616)
elidrissidev Sep 24, 2022
a6f6b44
Updated github workflow (#2608)
sreichel Sep 24, 2022
5c3cf6f
Updated README (#2618)
sreichel Sep 26, 2022
976d8bd
Fixed typos in various files (#2591)
Sdfendor Sep 12, 2022
1b1f289
Fixed detect changes in custom options section (product edit) (#2444)
fballiano Sep 26, 2022
34c0acf
Add/Remove mark when region/zip is required (#2149)
luigifab Sep 27, 2022
437ed6c
Optimize EAV collections (#911)
Sekiphp Sep 28, 2022
3c8108b
Converted Exception to Throwable in Mage_Core_Block_Template. (#2623)
kiatng Sep 28, 2022
984e928
Added CSS class for sorted columns in adminhtml (#2604)
sreichel Sep 29, 2022
1409fa9
Improvements to cron scripts (#2380)
fballiano Sep 29, 2022
44ba74d
Fixed javascript error on adminhtml login page caused by #2149 (#2624)
fballiano Sep 29, 2022
c3b3601
Fixed bug caused by #2605 (#2625)
fballiano Sep 29, 2022
836e86f
Fixed workflow badges in README (#2626)
elidrissidev Sep 29, 2022
e78a65a
Update hardcoded credit card message in checkout (#2628)
elidrissidev Sep 30, 2022
6ea44e1
Added module names to helper (#2617)
sreichel Oct 1, 2022
ca719cc
Get catalog search result collection from engine (#2634)
elidrissidev Oct 1, 2022
48829da
Add PHP dependencies security check workflow (#2639)
elidrissidev Oct 2, 2022
b245946
[security-workflow] Fixed cron syntax (#2640)
sreichel Oct 2, 2022
cdf15ee
Added OpenMage Contributors Copyright (#2295)
justinbeaty Oct 3, 2022
d98db45
Added ddev snippets to docs (#2575)
sreichel Oct 3, 2022
421e426
Only run workflows when relevant files change (#2641)
elidrissidev Oct 3, 2022
3f48521
Add back notification popup severity icons URL (#2633)
elidrissidev Oct 4, 2022
d141289
Merge branch '20.0' into merge_v19_v20
fballiano Oct 4, 2022
1e735c0
Reduce reprocessed jpeg file size by defaulting quality to 85% (#2629)
kiatng Oct 5, 2022
31c75af
Prevented editing of a non-editable order (#2632)
elidrissidev Oct 5, 2022
021857b
Fix dev/openmage/install.sh script setting permissions on var directory.
colinmollenhour Oct 5, 2022
f0b29ca
Allowed automatic full invoice from API (#2393)
luigifab Oct 5, 2022
8f7545f
Merge branch '20.0' into merge_v19_v20
fballiano Oct 6, 2022
843b59d
Add check if array key isset before using it (#2649)
przemyslaw-p Oct 7, 2022
e406290
Refresh admin ACL when user is updated and on refresh roles, without …
luigifab Oct 11, 2022
f1c1ce3
Merge branch '20.0' into merge_v19_v20
fballiano Oct 13, 2022
2072089
Fixed Mage_Catalog_Model_Product_Status::addSaleableFilterToCollectio…
fballiano Oct 14, 2022
184a7ba
EAV indexer now indexes only active storeviews (#2651)
fballiano Oct 14, 2022
fe5aa88
Check if DB file storage is enabled before saving local file (#2627)
elidrissidev Oct 17, 2022
5caab82
Cast getLoadingTimeout() to int in template (#2661)
sreichel Oct 19, 2022
61508a6
Revert changes to Mage_Catalog_Model_Layer::prepareProductCollection(…
sreichel Oct 20, 2022
39bf8c4
Re-added composer validation to github workflow (#2667)
sreichel Oct 21, 2022
efca826
Fixed bug on clonePosition() in prototype.js. (#2669)
kiatng Oct 28, 2022
99d3afb
Phpstan: fixed return types (docs only) (#2636)
sreichel Oct 17, 2022
6c575af
Removed strict validation from PHPUnit workflow (#2672)
sreichel Nov 1, 2022
2d403c8
Reduce getId calls (#2677)
luigifab Nov 6, 2022
96c14d4
Allow to save configuration without any fields (#2679)
luigifab Nov 7, 2022
a3f6b53
Redirect to grid when creditmemo does not exist (#2684)
luigifab Nov 7, 2022
f6fd7b3
Fixed ESI parsing error with turpentine (#2682)
luigifab Nov 7, 2022
7d2e310
Removed useless "try catch throw" (#2676)
luigifab Nov 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed bug on clonePosition() in prototype.js. (#2669)
  • Loading branch information
kiatng authored and fballiano committed Oct 31, 2022
commit efca82645a5b510f4f4f043ea7eabb62d3216c81
53 changes: 33 additions & 20 deletions js/prototype/prototype.js
Original file line number Diff line number Diff line change
Expand Up @@ -4271,55 +4271,68 @@ Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
offsetLeft: 0
}, options || {});

var docEl = document.documentElement;

// Find page position of source.
source = $(source);
element = $(element);
var p, delta, layout, styles = {};

var isAbsolute = Element.getStyle(element, 'position') === 'absolute';
var parent = Element.getOffsetParent(element);

if (options.setLeft || options.setTop) {
// We start by measuring the source's viewport offset.
p = Element.viewportOffset(source);

// If the element we're altering is `position: fixed`, that's all the
// information we need: later we'll apply that offset to the `top` and
// `left` properties directly.
delta = [0, 0];
if (Element.getStyle(element, 'position') === 'absolute') {
var parent = Element.getOffsetParent(element);
if (parent !== document.body) delta = Element.viewportOffset(parent);

// But if it's `position: absolute`, we have to know where its offset
// parent is positioned and take those measurements into account as
// well.
if (isAbsolute && parent !== document.body) {
delta = Element.viewportOffset(parent);
}
}

function pageScrollXY() {
var x = 0, y = 0;
if (Object.isNumber(window.pageXOffset)) {
// Modern browsers.
x = window.pageXOffset;
y = window.pageYOffset;
} else if (document.body && (document.body.scrollLeft || document.body.scrollTop)) {
x = document.body.scrollLeft;
y = document.body.scrollTop;
} else if (docEl && (docEl.scrollLeft || docEl.scrollTop)) {
x = docEl.scrollLeft;
y = docEl.scrollTop;
}
return { x: x, y: y };
}

var pageXY = pageScrollXY();


if (options.setWidth || options.setHeight) {
layout = Element.getLayout(source);
}
// When the offset parent is the document body, we need to account for
// scroll offsets when we set `top` and `left`. (Unless the element is
// `position: fixed`; in that case we should always ignore scroll
// position.)
var pageXY = (isAbsolute && parent === document.body) ? pageScrollXY() : { x: 0, y: 0 };

// Set position.
if (options.setLeft)
styles.left = (p[0] + pageXY.x - delta[0] + options.offsetLeft) + 'px';
if (options.setTop)
styles.top = (p[1] + pageXY.y - delta[1] + options.offsetTop) + 'px';

var currentLayout = element.getLayout();
if (options.setWidth || options.setHeight) {
layout = Element.getLayout(source);

if (options.setWidth) {
styles.width = layout.get('width') + 'px';
}
if (options.setHeight) {
styles.height = layout.get('height') + 'px';
// Use content box when setting width/height. If padding/border are
// different between source and target, that's for the user to fix;
// there's no good option for us.
if (options.setWidth) {
styles.width = layout.get('width') + 'px';
}
if (options.setHeight) {
styles.height = layout.get('height') + 'px';
}
}

return Element.setStyle(element, styles);
Expand Down