Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use U.S. English spelling for 'optimization'. #11584

Closed
wants to merge 2 commits into from
Closed

Use U.S. English spelling for 'optimization'. #11584

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c8ea0f
Use U.S. English spelling for 'optimization'.
davidangel Oct 20, 2017
2535e0d
Revert changes to knockout.js
davidangel Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
</formElements>
</field>
</fieldset>
<fieldset name="search_engine_optimisation" sortOrder="20">
<fieldset name="search_engine_optimization" sortOrder="20">
<settings>
<collapsible>true</collapsible>
<label translate="true">Search Engine Optimization</label>
Expand Down
4 changes: 2 additions & 2 deletions lib/web/knockoutjs/knockout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ ko.exportSymbol('utils.domNodeDisposal.removeDisposeCallback', ko.utils.domNodeD
}

ko.utils.parseHtmlFragment = function(html, documentContext) {
return jQueryInstance ? jQueryHtmlParse(html, documentContext) // As below, benefit from jQuery's optimisations where possible
return jQueryInstance ? jQueryHtmlParse(html, documentContext) // As below, benefit from jQuery's optimizations where possible
: simpleHtmlParse(html, documentContext); // ... otherwise, this simple logic will do in most common cases.
};

Expand Down Expand Up @@ -2840,7 +2840,7 @@ ko.exportSymbol('bindingProvider', ko.bindingProvider);
function applyBindingsToNodeAndDescendantsInternal (bindingContext, nodeVerified, bindingContextMayDifferFromDomParentElement) {
var shouldBindDescendants = true;

// Perf optimisation: Apply bindings only if...
// Perf optimization: Apply bindings only if...
// (1) We need to store the binding context on this node (because it may differ from the DOM parent node's binding context)
// Note that we can't store binding contexts on non-elements (e.g., text nodes), as IE doesn't allow expando properties for those
// (2) It might have bindings (e.g., it has a data-bind attribute, or it's a marker for a containerless template)
Expand Down