Skip to content

Commit a604300

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-52958-1' into MAGETWO-52958-1
2 parents 23057ba + e10e9c8 commit a604300

File tree

12 files changed

+43
-17
lines changed

12 files changed

+43
-17
lines changed

app/code/Magento/Ui/view/base/requirejs-config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ var config = {
1515
uiClass: 'Magento_Ui/js/lib/core/class',
1616
uiEvents: 'Magento_Ui/js/lib/core/events',
1717
uiRegistry: 'Magento_Ui/js/lib/registry/registry',
18+
consoleLogger: 'Magento_Ui/js/lib/logger/console-logger',
1819
uiLayout: 'Magento_Ui/js/core/renderer/layout',
1920
buttonAdapter: 'Magento_Ui/js/form/button-adapter'
2021
}

app/code/Magento/Ui/view/base/web/js/lib/logger/console-logger.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
16
define([
27
'./logger',
38
'./entry-factory',

app/code/Magento/Ui/view/base/web/js/lib/logger/console-output-handler.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'./levels-pool'
78
], function (logLevels) {

app/code/Magento/Ui/view/base/web/js/lib/logger/entry-factory.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'./entry'
78
], function (LogEntry) {

app/code/Magento/Ui/view/base/web/js/lib/logger/entry.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'./levels-pool'
78
], function (logLevels) {

app/code/Magento/Ui/view/base/web/js/lib/logger/formatter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'moment',
78
'mage/utils/template'

app/code/Magento/Ui/view/base/web/js/lib/logger/levels-pool.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'underscore'
78
], function (_) {

app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([], function () {
67
'use strict';
78

app/code/Magento/Ui/view/base/web/js/lib/logger/logger.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'./levels-pool'
78
], function (logLevels) {
@@ -28,7 +29,7 @@ define([
2829
* @protected
2930
* @type {Number}
3031
*/
31-
this.displayLevel_ = levels.WARN;
32+
this.displayLevel_ = levels.ERROR;
3233

3334
/**
3435
* An array of display criteria.

app/code/Magento/Ui/view/base/web/js/lib/logger/message-pool.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
16
define(function () {
27
'use strict';
38

0 commit comments

Comments
 (0)