Skip to content

Commit 8611ea7

Browse files
magento-teammagento-team
committed
2.0.0.0-dev73
* Framework Improvements: * Eliminated the StoreConfig class, and ability to work with Configuration through the Store object. Scope Config was introduced instead. * Fixed performance degradation caused by DI argument processors * Covered Magento library components with unit tests: * Magento/App/Request * Magento/App/Resource directory and Magento/App/Resource.php * Magento/App/Response * Magento/App/Route * Magento/App/Router * Magento/App/Http.php * Magento/Translate.php * Improved the Web API framework based on Customer Service * Updated the API Service Exception Handling * Changed the conventional notation of Vendor name in theme path: from `app/design/<area>/<vendor>_<theme>` to `app/design/<area>/<vendor>/<theme>` * Renamed the 3DSecure library to CardinalCommerce, and removed the unused flex library * Themes update: * Updated the look&feel of the Admin theme * Modularity improvements: * Introduced a new Store module. Moved all Store related logic from Magento_Core to Magento_Store * Moved the library part of the Config component from the Magento_Core module to the library * Moved the Session related logic from the Magento_Core module to the library * Moved the abstract logic related to Magento "Module" from Magento_Core to the library * Moved the form key related functionality to the library * Introduced a new Magento_UrlRewrite module and moved related classes from Magento_Core to the new module * Moved the resource model to Magento_Install module * Eliminated the Core\Helper\Js class * Moved the Email related logic from Magento_Core module to Magento_Email module * Moved the Cache related logic from the Magento_Core module to the library * Resolved issues which appeared when an order had been placed before the Magento_Payment module was disabled * Eliminated Magento_Catalog dependency on Magento_Rating * Removed the Magento_Rating module, its logic moved to Magento_Review * Moved the View related components from Magento_Core to the Magento/View library * Refactored the following modules to use Customer Service * Magento_Multishipping * Magento_Paypal * Magento_Log * Magento_RSS * Magento_Review * Magento_Wishlist * Magento_Weee * Magento_CatalogInventory * Magento_CatalogRule * Magento_SalesRule * GitHub requests: * [#520] (#520) -- Fixed spelling in Magento\Payment\Model\Method\AbstractMethod * [#481] (#481) -- GD2 Adapter PHP memory_limit * [#516] (#516) -- Make Sure That save_before Event Is Dispatched * [#465] (#465) -- Absolute path is assembled incorrectly when merging js/css files * [#504] (#504) -- Renamed "contacts" module to "contact" * [#529] (#529) -- Fixed exception at admin dashboard * [#535] (#535) -- Fixed an issue during creating or editing product template * [#535] (#535) -- Fixed Typo in the module name * [#538] (#538) -- Fixed missing tax amount in the invoice * [#518] (#518) -- Change to Magento\Customer\Block\Widget\Dob new version * Fixed bugs: * Fixed implementation issues with Cron task group threading * Fixed inability to place order during customer registration flow * Fixed an issue where after JS minification errors appeared when loading pages which contained minified JS * Fixed an issue where it was impossible for users with restricted permission to export certain entities * Fixed an issue where checkout was blocked by the "Please enter the State/Province" pop-up for customers that had saved addresses * Fixed an issue where a fatal error appeared when trying to check out the second time with OnePageCheckout * Fixed an issue where a fatal error appeared when trying to create an online invoice for an order placed with PayPal Express Checkout (Payment Action = Order) * Fixed an issue where the special price for a bundle product was calculated wrongly * Fixed an issue where a fatal error appeared when trying to create a shipment for an order if Magento was installed without the USPS module * Fixed an issue where the Lifetime Sales and Average Orders sections of the Admin Dashboard were missing * Fixed an issue where the active tab changed after changing the attribute set * Fixed an issue with incorrect order of product types in the Add Product menu in the backend * Fixed an issue with saving the tier price attribute * JavaScript improvements: * Upgraded the frontend jQuery library to version 1.11 * Upgraded the frontend jQuery UI library to version 1.10.4 * Modified the loader widget to render content using handlebars * Added the 'use strict' mode to the accordion widget * Added the 'use strict' mode to the tab widget
1 parent 342b298 commit 8611ea7

File tree

2,427 files changed

+79432
-40446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,427 files changed

+79432
-40446
lines changed

‎CHANGELOG.md

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,80 @@
1+
2.0.0.0-dev73
2+
=============
3+
* Framework Improvements:
4+
* Eliminated the StoreConfig class, and ability to work with Configuration through the Store object. Scope Config was introduced instead.
5+
* Fixed performance degradation caused by DI argument processors
6+
* Covered Magento library components with unit tests:
7+
* Magento/App/Request
8+
* Magento/App/Resource directory and Magento/App/Resource.php
9+
* Magento/App/Response
10+
* Magento/App/Route
11+
* Magento/App/Router
12+
* Magento/App/Http.php
13+
* Magento/Translate.php
14+
* Improved the Web API framework based on Customer Service
15+
* Updated the API Service Exception Handling
16+
* Changed the conventional notation of Vendor name in theme path: from `app/design/<area>/<vendor>_<theme>` to `app/design/<area>/<vendor>/<theme>`
17+
* Renamed the 3DSecure library to CardinalCommerce, and removed the unused flex library
18+
* Themes update:
19+
* Updated the look&feel of the Admin theme
20+
* Modularity improvements:
21+
* Introduced a new Store module. Moved all Store related logic from Magento_Core to Magento_Store
22+
* Moved the library part of the Config component from the Magento_Core module to the library
23+
* Moved the Session related logic from the Magento_Core module to the library
24+
* Moved the abstract logic related to Magento "Module" from Magento_Core to the library
25+
* Moved the form key related functionality to the library
26+
* Introduced a new Magento_UrlRewrite module and moved related classes from Magento_Core to the new module
27+
* Moved the resource model to Magento_Install module
28+
* Eliminated the Core\Helper\Js class
29+
* Moved the Email related logic from Magento_Core module to Magento_Email module
30+
* Moved the Cache related logic from the Magento_Core module to the library
31+
* Resolved issues which appeared when an order had been placed before the Magento_Payment module was disabled
32+
* Eliminated Magento_Catalog dependency on Magento_Rating
33+
* Removed the Magento_Rating module, its logic moved to Magento_Review
34+
* Moved the View related components from Magento_Core to the Magento/View library
35+
* Refactored the following modules to use Customer Service
36+
* Magento_Multishipping
37+
* Magento_Paypal
38+
* Magento_Log
39+
* Magento_RSS
40+
* Magento_Review
41+
* Magento_Wishlist
42+
* Magento_Weee
43+
* Magento_CatalogInventory
44+
* Magento_CatalogRule
45+
* Magento_SalesRule
46+
* GitHub requests:
47+
* [#520] (https://github.com/magento/magento2/issues/520) -- Fixed spelling in Magento\Payment\Model\Method\AbstractMethod
48+
* [#481] (https://github.com/magento/magento2/issues/481) -- GD2 Adapter PHP memory_limit
49+
* [#516] (https://github.com/magento/magento2/issues/516) -- Make Sure That save_before Event Is Dispatched
50+
* [#465] (https://github.com/magento/magento2/issues/465) -- Absolute path is assembled incorrectly when merging js/css files
51+
* [#504] (https://github.com/magento/magento2/issues/504) -- Renamed "contacts" module to "contact"
52+
* [#529] (https://github.com/magento/magento2/issues/529) -- Fixed exception at admin dashboard
53+
* [#535] (https://github.com/magento/magento2/issues/535) -- Fixed an issue during creating or editing product template
54+
* [#535] (https://github.com/magento/magento2/issues/535) -- Fixed Typo in the module name
55+
* [#538] (https://github.com/magento/magento2/issues/538) -- Fixed missing tax amount in the invoice
56+
* [#518] (https://github.com/magento/magento2/issues/518) -- Change to Magento\Customer\Block\Widget\Dob new version
57+
* Fixed bugs:
58+
* Fixed implementation issues with Cron task group threading
59+
* Fixed inability to place order during customer registration flow
60+
* Fixed an issue where after JS minification errors appeared when loading pages which contained minified JS
61+
* Fixed an issue where it was impossible for users with restricted permission to export certain entities
62+
* Fixed an issue where checkout was blocked by the "Please enter the State/Province" pop-up for customers that had saved addresses
63+
* Fixed an issue where a fatal error appeared when trying to check out the second time with OnePageCheckout
64+
* Fixed an issue where a fatal error appeared when trying to create an online invoice for an order placed with PayPal Express Checkout (Payment Action = Order)
65+
* Fixed an issue where the special price for a bundle product was calculated wrongly
66+
* Fixed an issue where a fatal error appeared when trying to create a shipment for an order if Magento was installed without the USPS module
67+
* Fixed an issue where the Lifetime Sales and Average Orders sections of the Admin Dashboard were missing
68+
* Fixed an issue where the active tab changed after changing the attribute set
69+
* Fixed an issue with incorrect order of product types in the Add Product menu in the backend
70+
* Fixed an issue with saving the tier price attribute
71+
* JavaScript improvements:
72+
* Upgraded the frontend jQuery library to version 1.11
73+
* Upgraded the frontend jQuery UI library to version 1.10.4
74+
* Modified the loader widget to render content using handlebars
75+
* Added the 'use strict' mode to the accordion widget
76+
* Added the 'use strict' mode to the tab widget
77+
178
2.0.0.0-dev72
279
=============
380
* Framework Improvements:
@@ -55,7 +132,7 @@
55132
* Updated the whitelist filter with library code for integration tests code coverage calculation
56133
* GitHub requests:
57134
* [#512] (https://github.com/magento/magento2/issues/512) -- Theme Thumbnails not showing
58-
* [#520] (https://github.com/magento/magento2/pull/502) -- Corrected Search Engine Optimization i18n
135+
* [#520] (https://github.com/magento/magento2/pull/520) -- Corrected Search Engine Optimization i18n
59136
* [#519] (https://github.com/magento/magento2/issues/519) -- New Theme Activation
60137
* Customer Service usage:
61138
* Refactored the Log module to use Customer Service
@@ -567,7 +644,7 @@
567644
* Design loader moved to library
568645
* Theme label moved to library
569646
* Themes update:
570-
* Reduced amount of templates and layouts in magento_plushe theme
647+
* Reduced amount of templates and layouts in Magento/plushe theme
571648
* Responsive design improvements
572649
* Integrity improvements:
573650
* Covered all Magento classes with argument sequence validator

‎app/code/Magento/AdminNotification/Block/Inbox.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@ protected function _construct()
3838
$this->_blockGroup = 'Magento_AdminNotification';
3939
$this->_headerText = __('Messages Inbox');
4040
parent::_construct();
41-
}
42-
43-
/**
44-
* @return $this
45-
*/
46-
protected function _prepareLayout()
47-
{
48-
parent::_prepareLayout();
4941
$this->_removeButton('add');
50-
return $this;
5142
}
5243
}

‎app/code/Magento/AdminNotification/Helper/Data.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ class Data extends \Magento\App\Helper\AbstractHelper
6565
protected $_unreadNoticeCounts;
6666

6767
/**
68-
* @var \Magento\Core\Model\Store\Config
68+
* @var \Magento\App\Config\ScopeConfigInterface
6969
*/
70-
protected $_coreStoreConfig;
70+
protected $_scopeConfig;
7171

7272
/**
7373
* @var \Magento\AdminNotification\Model\InboxFactory
@@ -76,16 +76,16 @@ class Data extends \Magento\App\Helper\AbstractHelper
7676

7777
/**
7878
* @param \Magento\App\Helper\Context $context
79-
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
79+
* @param \Magento\App\Config\ScopeConfigInterface $scopeConfig
8080
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
8181
*/
8282
public function __construct(
8383
\Magento\App\Helper\Context $context,
84-
\Magento\Core\Model\Store\Config $coreStoreConfig,
84+
\Magento\App\Config\ScopeConfigInterface $scopeConfig,
8585
\Magento\AdminNotification\Model\InboxFactory $inboxFactory
8686
) {
8787
parent::__construct($context);
88-
$this->_coreStoreConfig = $coreStoreConfig;
88+
$this->_scopeConfig = $scopeConfig;
8989
$this->_inboxFactory = $inboxFactory;
9090
}
9191

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,31 @@ class Baseurl implements \Magento\AdminNotification\Model\System\MessageInterfac
3131
protected $_urlBuilder;
3232

3333
/**
34-
* @var \Magento\App\ConfigInterface
34+
* @var \Magento\App\Config\ScopeConfigInterface
3535
*/
3636
protected $_config;
3737

3838
/**
39-
* @var \Magento\Core\Model\StoreManagerInterface
39+
* @var \Magento\Store\Model\StoreManagerInterface
4040
*/
4141
protected $_storeManager;
4242

4343
/**
44-
* @var \Magento\Core\Model\Config\ValueFactory
44+
* @var \Magento\App\Config\ValueFactory
4545
*/
4646
protected $_configValueFactory;
4747

4848
/**
49-
* @param \Magento\App\ConfigInterface $config
50-
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
49+
* @param \Magento\App\Config\ScopeConfigInterface $config
50+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5151
* @param \Magento\UrlInterface $urlBuilder
52-
* @param \Magento\Core\Model\Config\ValueFactory $configValueFactory
52+
* @param \Magento\App\Config\ValueFactory $configValueFactory
5353
*/
5454
public function __construct(
55-
\Magento\App\ConfigInterface $config,
56-
\Magento\Core\Model\StoreManagerInterface $storeManager,
55+
\Magento\App\Config\ScopeConfigInterface $config,
56+
\Magento\Store\Model\StoreManagerInterface $storeManager,
5757
\Magento\UrlInterface $urlBuilder,
58-
\Magento\Core\Model\Config\ValueFactory $configValueFactory
58+
\Magento\App\Config\ValueFactory $configValueFactory
5959
) {
6060
$this->_urlBuilder = $urlBuilder;
6161
$this->_config = $config;
@@ -71,18 +71,18 @@ public function __construct(
7171
protected function _getConfigUrl()
7272
{
7373
$output = '';
74-
$defaultUnsecure = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
74+
$defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
7575

76-
$defaultSecure = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
76+
$defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
7777

78-
if ($defaultSecure == \Magento\Core\Model\Store::BASE_URL_PLACEHOLDER ||
79-
$defaultUnsecure == \Magento\Core\Model\Store::BASE_URL_PLACEHOLDER
78+
if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ||
79+
$defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER
8080
) {
8181
$output = $this->_urlBuilder->getUrl('adminhtml/system_config/edit', array('section' => 'web'));
8282
} else {
8383
/** @var $dataCollection \Magento\Core\Model\Resource\Config\Data\Collection */
8484
$dataCollection = $this->_configValueFactory->create()->getCollection();
85-
$dataCollection->addValueFilter(\Magento\Core\Model\Store::BASE_URL_PLACEHOLDER);
85+
$dataCollection->addValueFilter(\Magento\Store\Model\Store::BASE_URL_PLACEHOLDER);
8686

8787
/** @var $data \Magento\App\Config\ValueInterface */
8888
foreach ($dataCollection as $data) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Security implements \Magento\AdminNotification\Model\System\MessageInterfa
5454
protected $_backendConfig;
5555

5656
/**
57-
* @var \Magento\App\ConfigInterface
57+
* @var \Magento\App\Config\ScopeConfigInterface
5858
*/
5959
protected $_config;
6060

@@ -66,13 +66,13 @@ class Security implements \Magento\AdminNotification\Model\System\MessageInterfa
6666
/**
6767
* @param \Magento\App\CacheInterface $cache
6868
* @param \Magento\Backend\App\ConfigInterface $backendConfig
69-
* @param \Magento\App\ConfigInterface $config
69+
* @param \Magento\App\Config\ScopeConfigInterface $config
7070
* @param \Magento\HTTP\Adapter\CurlFactory $curlFactory
7171
*/
7272
public function __construct(
7373
\Magento\App\CacheInterface $cache,
7474
\Magento\Backend\App\ConfigInterface $backendConfig,
75-
\Magento\App\ConfigInterface $config,
75+
\Magento\App\Config\ScopeConfigInterface $config,
7676
\Magento\HTTP\Adapter\CurlFactory $curlFactory
7777
) {
7878
$this->_cache = $cache;
@@ -108,7 +108,7 @@ private function _canShowNotification()
108108
*/
109109
private function _isFileAccessible()
110110
{
111-
$unsecureBaseURL = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
111+
$unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
112112

113113
/** @var $http \Magento\HTTP\Adapter\Curl */
114114
$http = $this->_curlFactory->create();

‎app/code/Magento/AdminNotification/etc/adminhtml/di.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,11 @@
3636
</argument>
3737
</arguments>
3838
</type>
39+
<type name="Magento\Module\Setup\Migration">
40+
<arguments>
41+
<argument name="compositeModules" xsi:type="array">
42+
<item name="adminnotification" xsi:type="string">Magento_AdminNotification</item>
43+
</argument>
44+
</arguments>
45+
</type>
3946
</config>

‎app/code/Magento/AdminNotification/etc/module.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
<module name="Magento_AdminNotification" version="2.0.0.0" active="true">
2828
<sequence>
2929
<module name="Magento_Core"/>
30+
<module name="Magento_Store"/>
3031
</sequence>
3132
<depends>
33+
<module name="Magento_Store"/>
3234
<module name="Magento_Core"/>
3335
<module name="Magento_Backend"/>
3436
<module name="Magento_Theme"/>

‎app/code/Magento/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Magento Core Team <[email protected]>
3333
*/
3434
$installer = $this;
35-
/* @var $installer \Magento\Core\Model\Resource\Setup */
35+
/* @var $installer \Magento\Module\Setup */
3636

3737
$installer->startSetup();
3838
/**

‎app/code/Magento/AdminNotification/sql/adminnotification_setup/upgrade-1.6.0.0-2.0.0.0.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
2424
$installer = $this;
25-
/* @var $installer \Magento\Core\Model\Resource\Setup */
25+
/* @var $installer \Magento\Module\Setup */
2626

2727
$installer->startSetup();
2828
/**

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup" name="unread_system_messages" as="unread_system_messages" after="system_messages" template="Magento_AdminNotification::system/messages/popup.phtml"/>
3030
<block class="Magento\AdminNotification\Block\Window" name="notification_window" as="notification_window" acl="Magento_AdminNotification::show_toolbar" template="notification/window.phtml"/>
3131
</referenceContainer>
32-
<referenceBlock name="header">
33-
<block class="Magento\AdminNotification\Block\ToolbarEntry" template="toolbar_entry.phtml" before="-"/>
34-
</referenceBlock>
32+
<referenceContainer name="header">
33+
<block class="Magento\AdminNotification\Block\ToolbarEntry" template="toolbar_entry.phtml" />
34+
</referenceContainer>
3535
<referenceBlock name="head">
3636
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js" after="jquery-jquery-js">
3737
<arguments>

‎app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
$(document).ready(function() {
2929
// Mark notification as read via AJAX call
3030
var markNotificationAsRead = function(notificationId) {
31-
var requestUrl = $('.notifications .dropdown-menu').attr('data-mark-as-read-url');
31+
var requestUrl = $('.notifications-summary .dropdown-menu').attr('data-mark-as-read-url');
3232
$.ajax({
3333
url: requestUrl,
3434
type: 'POST',
@@ -39,36 +39,36 @@
3939
showLoader: false
4040
});
4141
};
42-
var notificationCount = $('.notifications').attr('data-notification-count');
42+
var notificationCount = $('.notifications-summary').attr('data-notification-count');
4343
// Remove notification from the list
4444
var removeNotificationFromList = function(notificationEntry) {
4545
notificationEntry.remove();
4646
notificationCount--;
47-
$('.notifications').attr('data-notification-count', notificationCount);
47+
$('.notifications-summary').attr('data-notification-count', notificationCount);
4848

4949
if (notificationCount == 0) {
5050
// Change appearance of the bubble and its behavior when the last notification is removed
51-
$('.notifications .dropdown-menu').remove();
52-
var notificationIcon = $('.notifications .notifications-icon');
51+
$('.notifications-summary .dropdown-menu').remove();
52+
var notificationIcon = $('.notifications-summary .notifications-icon');
5353
notificationIcon.removeAttr('data-toggle');
5454
notificationIcon.off('click.dropdown');
55-
$('.notifications .notifications-icon .value').text('');
56-
$('.notifications .notifications-icon .value').hide();
55+
$('.notifications-action .counter').text('');
56+
$('.notifications-action .counter').hide();
5757
} else {
58-
$('.notifications .notifications-icon .value').text(notificationCount);
58+
$('.notifications-action .counter').text(notificationCount);
5959
// Modify caption of the 'See All' link
60-
var actionElement = $('.notifications .dropdown-menu .last .action-more');
60+
var actionElement = $('.notifications-summary .dropdown-menu .last .action-more');
6161
actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
6262
}
6363
};
6464

6565
// Show popup with notification details
6666
var showNotificationDetails = function(notificationEntry) {
67-
var popupElement = notificationEntry.find('.notification-dialog-content').clone();
67+
var popupElement = notificationEntry.find('.notifications-dialog-content').clone();
6868
var notificationId = notificationEntry.attr('data-notification-id');
69-
var dialogClassSeverity = 'notification-entry-dialog';
69+
var dialogClassSeverity = 'notifications-entry-dialog';
7070
if (notificationEntry.attr('data-notification-severity')) {
71-
dialogClassSeverity = 'notification-entry-dialog notification-entry-dialog-critical';
71+
dialogClassSeverity = 'notifications-entry-dialog notifications-entry-dialog-critical';
7272
}
7373
popupElement.dialog({
7474
title: popupElement.attr('data-title'),
@@ -99,16 +99,16 @@
9999
};
100100

101101
// Show notification description when corresponding item is clicked
102-
$('.notifications .dropdown-menu .notification-entry').on('click.showNotification', function(event) {
102+
$('.notifications-summary .dropdown-menu .notifications-entry').on('click.showNotification', function(event) {
103103
// hide notification dropdown
104-
$('.notifications .notifications-icon').trigger('click.dropdown');
104+
$('.notifications-summary .notifications-icon').trigger('click.dropdown');
105105
showNotificationDetails($(this));
106106
event.stopPropagation();
107107
});
108108

109109
// Remove corresponding notification from the list and mark it as read
110-
$('.notifications .dropdown-menu .notification-entry .action-close').on('click.removeNotification', function(event) {
111-
var notificationEntry = $(this).closest('.notification-entry')
110+
$('.notifications-close').on('click.removeNotification', function(event) {
111+
var notificationEntry = $(this).closest('.notifications-entry')
112112
var notificationId = notificationEntry.attr('data-notification-id');
113113
markNotificationAsRead(notificationId);
114114
removeNotificationFromList(notificationEntry);
@@ -117,9 +117,9 @@
117117

118118
// Hide notifications bubble
119119
if (notificationCount == 0) {
120-
$('.notifications .notifications-icon .value').hide();
120+
$('.notifications-action .counter').hide();
121121
} else {
122-
$('.notifications .notifications-icon .value').show();
122+
$('.notifications-action .counter').show();
123123
}
124124
});
125125
})(window.jQuery);

0 commit comments

Comments
 (0)