Merge pull request #1120 from magento-engcom/2.1-develop-prs

[EngCom] Public Pull Requests - 2.1 - MAGETWO-69238: Keep transparency when resizing images [2.1 backport] #9662 - MAGETWO-69236: Add configurations for change email templates [2.1 backport] #9661 - MAGETWO-69235: Do not di:compile tests/ folder #9660 - MAGETWO-69223 Fix for #9646 #9647 - MAGETWO-69234: Backport of MAGETWO-69152: Removed workaround for old Webkit bug #9655
magento · May 19, 2017 · e1e4617 · e1e4617
2 parents 84675bb + 9ac5a2a
commit e1e4617
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 19 deletions.
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -176,6 +176,19 @@
                     <frontend_class>required-entry validate-digits</frontend_class>
                 </field>
             </group>
+            <group id="account_information" translate="label" type="text" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Account Information Options</label>
+                <field id="change_email_template" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Change Email Template</label>
+                    <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+                </field>
+                <field id="change_email_and_password_template" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Change Email and Password Template</label>
+                    <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+                </field>
+            </group>
             <group id="address" translate="label" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Name and Address Options</label>
                 <field id="street_lines" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">

diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Quote\Model\Cart\Totals\ItemConverter;
 use Magento\Quote\Api\CouponManagementInterface;
+use Magento\Framework\Api\ExtensibleDataInterface;
 
 /**
  * Cart totals data object.
@@ -94,6 +95,7 @@ public function get($cartId)
             $addressTotalsData = $quote->getShippingAddress()->getData();
             $addressTotals = $quote->getShippingAddress()->getTotals();
         }
+        unset($addressTotalsData[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
 
         /** @var \Magento\Quote\Api\Data\TotalsInterface $quoteTotals */
         $quoteTotals = $this->totalsFactory->create();

diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -346,6 +346,10 @@ public function resize($frameWidth = null, $frameHeight = null)
             $newImage = imagecreate($dims['frame']['width'], $dims['frame']['height']);
         }
 
+        if ($isAlpha) {
+            $this->_saveAlpha($newImage);
+        }
+
         // fill new image with required color
         $this->_fillBackgroundColor($newImage);
 

diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
@@ -168,6 +168,13 @@ public function resize($frameWidth = null, $frameHeight = null)
             );
         }
 
+        $newImage->compositeImage(
+            $this->_imageHandler,
+            \Imagick::COMPOSITE_COPYOPACITY,
+            $dims['dst']['x'],
+            $dims['dst']['y']
+        );
+
         $newImage->compositeImage(
             $this->_imageHandler,
             \Imagick::COMPOSITE_OVER,

diff --git a/lib/web/tiny_mce/classes/util/Quirks.js b/lib/web/tiny_mce/classes/util/Quirks.js
@@ -152,11 +152,8 @@
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);

diff --git a/lib/web/tiny_mce/tiny_mce.js b/lib/web/tiny_mce/tiny_mce.js
diff --git a/lib/web/tiny_mce/tiny_mce_jquery.js b/lib/web/tiny_mce/tiny_mce_jquery.js
diff --git a/lib/web/tiny_mce/tiny_mce_jquery_src.js b/lib/web/tiny_mce/tiny_mce_jquery_src.js
@@ -1441,11 +1441,8 @@ tinymce.create('static tinymce.util.XHR', {
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);

diff --git a/lib/web/tiny_mce/tiny_mce_prototype.js b/lib/web/tiny_mce/tiny_mce_prototype.js
diff --git a/lib/web/tiny_mce/tiny_mce_prototype_src.js b/lib/web/tiny_mce/tiny_mce_prototype_src.js
@@ -1193,11 +1193,8 @@ tinymce.create('static tinymce.util.XHR', {
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);

diff --git a/lib/web/tiny_mce/tiny_mce_src.js b/lib/web/tiny_mce/tiny_mce_src.js
@@ -1166,11 +1166,8 @@ tinymce.create('static tinymce.util.XHR', {
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);

diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -227,6 +227,7 @@ private function getExcludedModulePaths(array $modulePaths)
 
         $excludedModulePaths = [
             '#^(?:' . join('|', $basePathsRegExps) . ')/Test#',
+            '#^(?:' . join('|', $basePathsRegExps) . ')/tests#',
         ];
         return $excludedModulePaths;
     }
@@ -241,6 +242,7 @@ private function getExcludedLibraryPaths(array $libraryPaths)
     {
         $excludedLibraryPaths = [
             '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?Test#',
+            '#^(?:' . join('|', $libraryPaths) . ')/([\\w]+/)?tests#',
         ];
         return $excludedLibraryPaths;
     }