Skip to content

Commit 9b3de29

Browse files
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-46832
2 parents b209971 + 8cf5dc6 commit 9b3de29

File tree

10 files changed

+18
-15
lines changed

10 files changed

+18
-15
lines changed

app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected function setUp()
9797
false
9898
);
9999
$this->hydratorMock = $this->getMock(
100-
'Magento\Framework\Model\Entity\EntityHydrator',
100+
'Magento\Framework\Model\Entity\Hydrator',
101101
['extract'],
102102
[],
103103
'',

app/code/Magento/Ui/view/base/web/js/form/element/date.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,12 @@ define([
113113
}
114114

115115
shiftedValue = shiftedValue.format(this.datetimeFormat);
116+
} else {
117+
shiftedValue = '';
118+
}
116119

117-
if (shiftedValue !== this.shiftedValue()) {
118-
this.shiftedValue(shiftedValue);
119-
}
120+
if (shiftedValue !== this.shiftedValue()) {
121+
this.shiftedValue(shiftedValue);
120122
}
121123
},
122124

@@ -130,17 +132,20 @@ define([
130132
var value;
131133

132134
if (shiftedValue) {
135+
133136
if (this.showsTime) {
134137
value = moment.utc(shiftedValue, this.datetimeFormat);
135138
value = value.subtract(this.timeOffset, 'seconds').toISOString();
136139
} else {
137140
value = moment(shiftedValue, this.datetimeFormat);
138141
value = value.format(this.outputDateFormat);
139142
}
143+
} else {
144+
value = '';
145+
}
140146

141-
if (value !== this.value()) {
142-
this.value(value);
143-
}
147+
if (value !== this.value()) {
148+
this.value(value);
144149
}
145150
},
146151

app/code/Magento/Ui/view/base/web/js/modal/modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ define([
221221
this._createOverlay();
222222
this._setActive();
223223
this._setKeyListener();
224-
this.modal.one(this.options.transitionEvent, _.bind(this._trigger, this, 'opened'));
225224
this.modal.one(this.options.transitionEvent, _.bind(this._setFocus, this, 'end', 'opened'));
225+
this.modal.one(this.options.transitionEvent, _.bind(this._trigger, this, 'opened'));
226226
this.modal.addClass(this.options.modalVisibleClass);
227227

228228
if (!this.options.transitionEvent) {

dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ CalendarTest.prototype.testDateTimeMapping = function() {
7575
/*:DOC += <input type="text" id="calendar" /> */
7676
var calendar = $('#calendar').calendar({dateFormat: 'M/d/yy', timeFormat: 'h:mm a'});
7777
assertEquals('mm/d/yy', calendar.calendar('option', 'dateFormat'));
78-
assertEquals('h:mm tt', calendar.calendar('option', 'timeFormat'));
78+
assertEquals('h:mm TT', calendar.calendar('option', 'timeFormat'));
7979
calendar.calendar('destroy');
8080
calendar.calendar({dateFormat: 'MMMM/EEEE/yyyy', timeFormat: 'HH:mm'});
8181
assertEquals('MM/DD/yy', calendar.calendar('option', 'dateFormat'));

lib/internal/Magento/Framework/EntityManager/CallbackHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CallbackHandler
2525
protected $logger;
2626

2727
/**
28-
* CommitCallback constructor.
28+
* CallbackHandler constructor.
2929
*
3030
* @param MetadataPool $metadataPool
3131
* @param LoggerInterface $logger

lib/internal/Magento/Framework/EntityManager/Operation/Write/Create.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Magento\Framework\EntityManager\Operation\Write;
88

9-
use Magento\Framework\EntityManager\Operation\Write\Create\ValidateCreate;
109
use Magento\Framework\EntityManager\Operation\Write\Create\CreateMain;
1110
use Magento\Framework\EntityManager\Operation\Write\Create\CreateAttributes;
1211
use Magento\Framework\EntityManager\Operation\Write\Create\CreateExtensions;

lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Magento\Framework\EntityManager\Operation\Write;
88

9-
use Magento\Framework\EntityManager\Operation\Write\Delete\ValidateDelete;
109
use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteMain;
1110
use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteAttributes;
1211
use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteExtensions;
@@ -17,6 +16,7 @@
1716

1817
/**
1918
* Class Delete
19+
*
2020
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2121
*/
2222
class Delete

lib/internal/Magento/Framework/EntityManager/Operation/Write/Update.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Magento\Framework\EntityManager\Operation\Write;
88

9-
use Magento\Framework\EntityManager\Operation\Write\Update\ValidateUpdate;
109
use Magento\Framework\EntityManager\Operation\Write\Update\UpdateMain;
1110
use Magento\Framework\EntityManager\Operation\Write\Update\UpdateAttributes;
1211
use Magento\Framework\EntityManager\Operation\Write\Update\UpdateExtensions;

lib/internal/Magento/Framework/EntityManager/OperationPool.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class OperationPool
2424
private $objectManager;
2525

2626
/**
27-
* OrchestratorPool constructor.
27+
* OperationPool constructor.
2828
* @param ObjectManager $objectManager
2929
* @param string[] $operations
3030
*/

lib/web/mage/calendar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@
394394
'yy': 'yy' // Always long year format on frontend
395395
},
396396
time: {
397-
'a': 'tt',
397+
'a': 'TT',
398398
'HH': 'hh',
399399
'H': 'h'
400400
}

0 commit comments

Comments
 (0)