Skip to content

Commit 7573af8

Browse files
committed
Reduce async console logger
1 parent 9b8d557 commit 7573af8

File tree

4 files changed

+21
-101
lines changed

4 files changed

+21
-101
lines changed

app/code/Magento/PageCache/view/frontend/web/js/page-cache.js

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
define([
77
'jquery',
88
'domReady',
9-
'consoleLogger',
109
'Magento_PageCache/js/form-key-provider',
1110
'jquery-ui-modules/widget',
1211
'mage/cookies'
13-
], function ($, domReady, consoleLogger, formKeyInit) {
12+
], function ($, domReady, formKeyInit) {
1413
'use strict';
1514

1615
/**
@@ -45,32 +44,30 @@ define([
4544
* @param {jQuery} element - Comment holder
4645
*/
4746
(function lookup(element) {
48-
var iframeHostName;
49-
50-
// prevent cross origin iframe content reading
51-
if ($(element).prop('tagName') === 'IFRAME') {
52-
iframeHostName = $('<a>').prop('href', $(element).prop('src'))
53-
.prop('hostname');
54-
55-
if (window.location.hostname !== iframeHostName) {
56-
return [];
57-
}
58-
}
59-
6047
/**
6148
* Rewrite jQuery contents().
6249
*
6350
* @param {jQuery} elem
6451
*/
6552
contents = function (elem) {
6653
return $.map(elem, function (el) {
54+
var iframeHostName;
55+
56+
// prevent cross origin iframe content reading
57+
if ($(element).prop('tagName') === 'IFRAME') {
58+
iframeHostName = $('<a>').prop('href', $(element).prop('src'))
59+
.prop('hostname');
60+
61+
if (window.location.hostname !== iframeHostName) {
62+
return [];
63+
}
64+
}
65+
6766
try {
6867
return el.nodeName.toLowerCase() === 'iframe' ?
6968
el.contentDocument || (el.contentWindow ? el.contentWindow.document : []) :
7069
$.merge([], el.childNodes);
7170
} catch (e) {
72-
consoleLogger.error(e);
73-
7471
return [];
7572
}
7673
});

app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ define([
88
'jquery',
99
'mageUtils',
1010
'uiRegistry',
11-
'./types',
12-
'../../lib/logger/console-logger'
13-
], function (_, $, utils, registry, types, consoleLogger) {
11+
'./types'
12+
], function (_, $, utils, registry, types) {
1413
'use strict';
1514

1615
var templates = registry.create(),
@@ -71,25 +70,7 @@ define([
7170
* @returns {jQueryPromise}
7271
*/
7372
function loadDeps(node) {
74-
var loaded = $.Deferred(),
75-
loggerUtils = consoleLogger.utils;
76-
77-
if (node.deps) {
78-
consoleLogger.utils.asyncLog(
79-
loaded,
80-
{
81-
data: {
82-
component: node.name,
83-
deps: node.deps
84-
},
85-
messages: loggerUtils.createMessages(
86-
'depsStartRequesting',
87-
'depsFinishRequesting',
88-
'depsLoadingFail'
89-
)
90-
}
91-
);
92-
}
73+
var loaded = $.Deferred();
9374

9475
registry.get(node.deps, function (deps) {
9576
node.provider = node.extendProvider ? deps && deps.name : node.provider;
@@ -109,19 +90,8 @@ define([
10990
var loaded = $.Deferred(),
11091
source = node.component;
11192

112-
consoleLogger.info('componentStartLoading', {
113-
component: node.component
114-
});
115-
11693
require([source], function (constr) {
117-
consoleLogger.info('componentFinishLoading', {
118-
component: node.component
119-
});
12094
loaded.resolve(node, constr);
121-
}, function () {
122-
consoleLogger.error('componentLoadingFail', {
123-
component: node.component
124-
});
12595
});
12696

12797
return loaded.promise();
@@ -136,11 +106,6 @@ define([
136106
function initComponent(node, Constr) {
137107
var component = new Constr(_.omit(node, 'children'));
138108

139-
consoleLogger.info('componentStartInitialization', {
140-
component: node.component,
141-
componentName: node.name
142-
});
143-
144109
registry.set(node.name, component);
145110
}
146111

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/scope.js

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ define([
88
'uiRegistry',
99
'mage/translate',
1010
'../template/renderer',
11-
'jquery',
12-
'../../logger/console-logger'
13-
], function (ko, registry, $t, renderer, $, consoleLogger) {
11+
'jquery'
12+
], function (ko, registry, $t, renderer, $) {
1413
'use strict';
1514

1615
/**
@@ -58,24 +57,9 @@ define([
5857
update: function (el, valueAccessor, allBindings, viewModel, bindingContext) {
5958
var component = valueAccessor(),
6059
promise = $.Deferred(),
61-
apply = applyComponents.bind(this, el, bindingContext, promise),
62-
loggerUtils = consoleLogger.utils;
60+
apply = applyComponents.bind(this, el, bindingContext, promise);
6361

6462
if (typeof component === 'string') {
65-
loggerUtils.asyncLog(
66-
promise,
67-
{
68-
data: {
69-
component: component
70-
},
71-
messages: loggerUtils.createMessages(
72-
'requestingComponent',
73-
'requestingComponentIsLoaded',
74-
'requestingComponentIsFailed'
75-
)
76-
}
77-
);
78-
7963
registry.get(component, apply);
8064
} else if (typeof component === 'function') {
8165
component(apply);

app/code/Magento/Ui/view/base/web/js/lib/knockout/template/engine.js

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ define([
77
'ko',
88
'underscore',
99
'./observable_source',
10-
'./renderer',
11-
'../../logger/console-logger'
12-
], function ($, ko, _, Source, renderer, consoleLogger) {
10+
'./renderer'
11+
], function ($, ko, _, Source, renderer) {
1312
'use strict';
1413

1514
var RemoteTemplateEngine,
@@ -69,14 +68,9 @@ define([
6968
return origUpdate.apply(this, arguments);
7069
}
7170

72-
if (!options.name) {
73-
consoleLogger.error('Could not find template name', options);
74-
}
7571
templateName = options.name;
7672
} else if (typeof options === 'string') {
7773
templateName = options;
78-
} else {
79-
consoleLogger.error('Could not build a template binding', options);
8074
}
8175
engine._trackRender(templateName);
8276
isSync = engine._hasTemplateLoaded(templateName);
@@ -184,30 +178,10 @@ define([
184178
source.requestedBy = bindingContext.$data.name;
185179
sources[templateId] = source;
186180

187-
consoleLogger.info('templateStartLoading', {
188-
template: templateId,
189-
component: bindingContext.$data.name
190-
});
191-
192181
renderer.render(template).then(function (rendered) {
193-
consoleLogger.info('templateLoadedFromServer', {
194-
template: templateId,
195-
component: bindingContext.$data.name
196-
});
197182
source.nodes(rendered);
198183
engine._releaseRender(templateId, 'async');
199184
}).fail(function () {
200-
consoleLogger.error('templateLoadingFail', {
201-
template: templateId,
202-
component: bindingContext.$data.name
203-
});
204-
});
205-
}
206-
207-
if (source.requestedBy !== bindingContext.$data.name) {
208-
consoleLogger.info('templateLoadedFromCache', {
209-
template: templateId,
210-
component: bindingContext.$data.name
211185
});
212186
}
213187

0 commit comments

Comments
 (0)