MAGETWO-71350: Prevent remove click listener when switch from mobile …

…to desktop mode. magento#10430

 - Merge Pull Request magento#10430 from jeroenalewijns/magento2:patch-1
 - Merged commits:
   1. 4568687
   2. 4540f30
   3. 274703e

.travis.yml

@@ -1,5 +1,6 @@
 sudo: required
 dist: trusty
+group: edge
 addons:
   apt:
     packages:

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at engcom@magento.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

app/bootstrap.php

@@ -63,5 +63,5 @@
 date_default_timezone_set('UTC');
 
 /*  Adjustment of precision value for several versions of PHP */
-ini_set('precision', 17);
-ini_set('serialize_precision', 17);
+ini_set('precision', 15);
+ini_set('serialize_precision', 15);

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml;
 
+/**
+ * @api
+ */
 abstract class Notification extends \Magento\Backend\App\AbstractAction
 {
     /**

app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

@@ -9,6 +9,7 @@
  * AdminNotification update frequency source
  *
  * @codeCoverageIgnore
+ * @api
  */
 class Frequency implements \Magento\Framework\Option\ArrayInterface
 {

app/code/Magento/AdminNotification/Model/Feed.php

@@ -12,6 +12,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Feed extends \Magento\Framework\Model\AbstractModel
 {

app/code/Magento/AdminNotification/Model/Inbox.php

@@ -29,7 +29,7 @@
  * @method int getIsRemove()
  * @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
 {

app/code/Magento/AdminNotification/Model/InboxInterface.php

@@ -9,6 +9,7 @@
  * AdminNotification Inbox interface
  *
  * @author Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 interface InboxInterface
 {

app/code/Magento/AdminNotification/Model/NotificationService.php

@@ -9,6 +9,7 @@
  * Notification service model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class NotificationService
 {

app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

@@ -11,6 +11,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 
+/**
+ * @api
+ */
 class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php

@@ -6,9 +6,7 @@
 namespace Magento\AdminNotification\Model\ResourceModel;
 
 /**
- * AdminNotification Inbox model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

@@ -10,6 +10,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
+/**
+ * @api
+ */
 class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php

@@ -11,6 +11,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
+/**
+ * @api
+ */
 class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System;
 
+/**
+ * @api
+ */
 class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
 
+/**
+ * @api
+ */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System\Message\Collection;
 
+/**
+ * @api
+ */
 class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message.php

@@ -7,6 +7,7 @@
 
 /**
  * @codeCoverageIgnore
+ * @api
  */
 class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
 {

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message;
 
+/**
+ * @api
+ */
 class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message\Media;
 
+/**
+ * @api
+ */
 abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

@@ -6,6 +6,9 @@
 
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
+/**
+ * @api
+ */
 class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
+/**
+ * @api
+ */
 class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -8,6 +8,9 @@
 
 use Magento\Store\Model\Store;
 
+/**
+ * @api
+ */
 class Security implements \Magento\Framework\Notification\MessageInterface
 {
     /**

app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php

@@ -9,7 +9,7 @@
 use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\SynchronizedFactory;
 
 /**
- * Class DataProvider
+ * @api
  */
 class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 {

app/code/Magento/AdminNotification/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-store": "100.2.*",
-        "magento/module-backend": "100.2.*",
-        "magento/module-media-storage": "100.2.*",
-        "magento/framework": "100.2.*",
-        "magento/module-ui": "100.2.*",
+        "magento/module-store": "100.3.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-media-storage": "100.3.*",
+        "magento/framework": "100.3.*",
+        "magento/module-ui": "100.3.*",
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.3.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdminNotification/i18n/en_US.csv

@@ -1,13 +1,13 @@
 "Read Details","Read Details"
 "Mark as Read","Mark as Read"
 "Are you sure?","Are you sure?"
-"Remove","Remove"
+Remove,Remove
 "Messages Inbox","Messages Inbox"
 "You have %1 new system messages","You have %1 new system messages"
 "You have %1 new system message","You have %1 new system message"
 "Incoming Message","Incoming Message"
-"close","close"
-"Notifications","Notifications"
+close,close
+Notifications,Notifications
 "The message has been marked as Read.","The message has been marked as Read."
 "We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
 "Please select messages.","Please select messages."
@@ -20,10 +20,10 @@
 "6 Hours","6 Hours"
 "12 Hours","12 Hours"
 "24 Hours","24 Hours"
-"critical","critical"
-"major","major"
-"minor","minor"
-"notice","notice"
+critical,critical
+major,major
+minor,minor
+notice,notice
 "Wrong message type","Wrong message type"
 "Wrong notification ID specified.","Wrong notification ID specified."
 "{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>."
@@ -32,20 +32,19 @@
 "We were unable to synchronize one or more media files. Please refer to the log file for details.","We were unable to synchronize one or more media files. Please refer to the log file for details."
 "Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
 "Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider.","Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider."
-"Close popup","Close popup"
-"Close","Close"
 "System Messages:","System Messages:"
 "Critical System Messages","Critical System Messages"
 "Major System Messages","Major System Messages"
 "System messages","System messages"
+Close,Close
 "See All (","See All ("
 " unread)"," unread)"
 "Show Toolbar","Show Toolbar"
 "Show List","Show List"
 "Use HTTPS to Get Feed","Use HTTPS to Get Feed"
 "Update Frequency","Update Frequency"
 "Last Update","Last Update"
-"Severity","Severity"
+Severity,Severity
 "Date Added","Date Added"
-"Message","Message"
-"Actions","Actions"
+Message,Message
+Actions,Actions

app/code/Magento/AdminNotification/registration.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_AdminNotification',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);

app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

@@ -19,11 +19,11 @@
             "autoOpen": true,
             "buttons": false,
             "modalClass": "modal-system-messages",
-            "title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
+            "title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
         }
     }'>
     <li class="message message-warning warning">
-        <?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
+        <?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
+        <a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
     </li>
 </ul>