diff --git a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
index 2509891d02256..d34b73997bf1b 100644
--- a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
+++ b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
@@ -6,11 +6,10 @@
define([
'jquery',
'domReady',
- 'consoleLogger',
'Magento_PageCache/js/form-key-provider',
'jquery-ui-modules/widget',
'mage/cookies'
-], function ($, domReady, consoleLogger, formKeyInit) {
+], function ($, domReady, formKeyInit) {
'use strict';
/**
@@ -45,18 +44,6 @@ define([
* @param {jQuery} element - Comment holder
*/
(function lookup(element) {
- var iframeHostName;
-
- // prevent cross origin iframe content reading
- if ($(element).prop('tagName') === 'IFRAME') {
- iframeHostName = $('').prop('href', $(element).prop('src'))
- .prop('hostname');
-
- if (window.location.hostname !== iframeHostName) {
- return [];
- }
- }
-
/**
* Rewrite jQuery contents().
*
@@ -64,12 +51,24 @@ define([
*/
contents = function (elem) {
return $.map(elem, function (el) {
+ var iframeHostName;
+
+ // prevent cross origin iframe content reading
+ if ($(element).prop('tagName') === 'IFRAME') {
+ iframeHostName = $('').prop('href', $(element).prop('src'))
+ .prop('hostname');
+
+ if (window.location.hostname !== iframeHostName) {
+ return [];
+ }
+ }
+
try {
return el.nodeName.toLowerCase() === 'iframe' ?
el.contentDocument || (el.contentWindow ? el.contentWindow.document : []) :
$.merge([], el.childNodes);
} catch (e) {
- consoleLogger.error(e);
+ console.error(e);
return [];
}
diff --git a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
index 5240fe55f6a74..f55a4bc838d7d 100644
--- a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
+++ b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
@@ -8,9 +8,8 @@ define([
'jquery',
'mageUtils',
'uiRegistry',
- './types',
- '../../lib/logger/console-logger'
-], function (_, $, utils, registry, types, consoleLogger) {
+ './types'
+], function (_, $, utils, registry, types) {
'use strict';
var templates = registry.create(),
@@ -71,25 +70,7 @@ define([
* @returns {jQueryPromise}
*/
function loadDeps(node) {
- var loaded = $.Deferred(),
- loggerUtils = consoleLogger.utils;
-
- if (node.deps) {
- consoleLogger.utils.asyncLog(
- loaded,
- {
- data: {
- component: node.name,
- deps: node.deps
- },
- messages: loggerUtils.createMessages(
- 'depsStartRequesting',
- 'depsFinishRequesting',
- 'depsLoadingFail'
- )
- }
- );
- }
+ var loaded = $.Deferred();
registry.get(node.deps, function (deps) {
node.provider = node.extendProvider ? deps && deps.name : node.provider;
@@ -109,17 +90,18 @@ define([
var loaded = $.Deferred(),
source = node.component;
- consoleLogger.info('componentStartLoading', {
+ console.info('componentStartLoading', {
component: node.component
});
require([source], function (constr) {
- consoleLogger.info('componentFinishLoading', {
+ console.info('componentFinishLoading', {
component: node.component
});
loaded.resolve(node, constr);
- }, function () {
- consoleLogger.error('componentLoadingFail', {
+ }, function (e) {
+ console.log(e);
+ console.error('componentLoadingFail', {
component: node.component
});
});
@@ -136,7 +118,7 @@ define([
function initComponent(node, Constr) {
var component = new Constr(_.omit(node, 'children'));
- consoleLogger.info('componentStartInitialization', {
+ console.info('componentStartInitialization', {
component: node.component,
componentName: node.name
});
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/scope.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/scope.js
index 59e82eb88a299..bc47e45d94ee1 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/scope.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/scope.js
@@ -8,9 +8,8 @@ define([
'uiRegistry',
'mage/translate',
'../template/renderer',
- 'jquery',
- '../../logger/console-logger'
-], function (ko, registry, $t, renderer, $, consoleLogger) {
+ 'jquery'
+], function (ko, registry, $t, renderer, $) {
'use strict';
/**
@@ -58,24 +57,9 @@ define([
update: function (el, valueAccessor, allBindings, viewModel, bindingContext) {
var component = valueAccessor(),
promise = $.Deferred(),
- apply = applyComponents.bind(this, el, bindingContext, promise),
- loggerUtils = consoleLogger.utils;
+ apply = applyComponents.bind(this, el, bindingContext, promise);
if (typeof component === 'string') {
- loggerUtils.asyncLog(
- promise,
- {
- data: {
- component: component
- },
- messages: loggerUtils.createMessages(
- 'requestingComponent',
- 'requestingComponentIsLoaded',
- 'requestingComponentIsFailed'
- )
- }
- );
-
registry.get(component, apply);
} else if (typeof component === 'function') {
component(apply);
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/engine.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/engine.js
index 3575225c74602..a7fed653e3a17 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/engine.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/engine.js
@@ -7,9 +7,8 @@ define([
'ko',
'underscore',
'./observable_source',
- './renderer',
- '../../logger/console-logger'
-], function ($, ko, _, Source, renderer, consoleLogger) {
+ './renderer'
+], function ($, ko, _, Source, renderer) {
'use strict';
var RemoteTemplateEngine,
@@ -70,13 +69,14 @@ define([
}
if (!options.name) {
- consoleLogger.error('Could not find template name', options);
+ console.error('Could not find template name', options);
}
+
templateName = options.name;
} else if (typeof options === 'string') {
templateName = options;
} else {
- consoleLogger.error('Could not build a template binding', options);
+ console.error('Could not build a template binding', options);
}
engine._trackRender(templateName);
isSync = engine._hasTemplateLoaded(templateName);
@@ -184,20 +184,21 @@ define([
source.requestedBy = bindingContext.$data.name;
sources[templateId] = source;
- consoleLogger.info('templateStartLoading', {
+ console.info('templateStartLoading', {
template: templateId,
component: bindingContext.$data.name
});
renderer.render(template).then(function (rendered) {
- consoleLogger.info('templateLoadedFromServer', {
+ console.info('templateLoadedFromServer', {
template: templateId,
component: bindingContext.$data.name
});
+
source.nodes(rendered);
engine._releaseRender(templateId, 'async');
}).fail(function () {
- consoleLogger.error('templateLoadingFail', {
+ console.error('templateLoadingFail', {
template: templateId,
component: bindingContext.$data.name
});
@@ -205,7 +206,7 @@ define([
}
if (source.requestedBy !== bindingContext.$data.name) {
- consoleLogger.info('templateLoadedFromCache', {
+ console.info('templateLoadedFromCache', {
template: templateId,
component: bindingContext.$data.name
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageCache/frontend/js/page-cache.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageCache/frontend/js/page-cache.test.js
index 2fc3a737ba38c..a2a367c3573dc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageCache/frontend/js/page-cache.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageCache/frontend/js/page-cache.test.js
@@ -39,7 +39,7 @@ define([
it('on empty node comments() returns empty Array', function () {
expect($(element).comments()).toEqual([]);
- expect($(iframe).insertAfter('body').comments()).toEqual([]);
+ expect($(iframe).comments()).toEqual([]);
});
it('on non-empty node comments() returns empty Array with nodes', function () {