Skip to content

[Forwardport] Fixed typo error #16326

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

Merged
merged 1 commit into from
Jun 25, 2018
Merged

[Forwardport] Fixed typo error #16326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/code/Magento/Paypal/view/frontend/web/order-review.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ define([
},

/**
* trigger change for the update of shippping methods from server
* trigger change for the update of shipping methods from server
*/
_updateOrderHandler: function () {
$(this.options.shippingSelector).trigger('change');
Expand Down Expand Up @@ -297,7 +297,7 @@ define([
this._updateOrderSubmit(true);
this._toggleButton(this.options.updateOrderSelector, true);

// form data and callBack updated based on the shippping Form element
// form data and callBack updated based on the shipping Form element
if (this.isShippingSubmitForm) {
formData = $(this.options.shippingSubmitFormSelector).serialize() + '&isAjax=true';

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
childCount = getChildCount(node);

// Remove empty nodes but only if there is multiple wrappers and they are not block
// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
dom.remove(node, 1);
return;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/dom/DOMUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@

/**
* Returns a unique id. This can be useful when generating elements on the fly.
* This method will not check if the element allready exists.
* This method will not check if the element already exists.
*
* @method uniqueId
* @param {String} p Optional prefix to add infront of all ids defaults to "mce_".
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14451,7 +14451,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
childCount = getChildCount(node);

// Remove empty nodes but only if there is multiple wrappers and they are not block
// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
dom.remove(node, 1);
return;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15301,7 +15301,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
childCount = getChildCount(node);

// Remove empty nodes but only if there is multiple wrappers and they are not block
// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
dom.remove(node, 1);
return;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15275,7 +15275,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
childCount = getChildCount(node);

// Remove empty nodes but only if there is multiple wrappers and they are not block
// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
// elements so never remove single <h1></h1> since that would remove the current empty block element where the caret is at
if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
dom.remove(node, 1);
return;
Expand Down
2 changes: 1 addition & 1 deletion lib/web/modernizr/modernizr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ window.Modernizr = (function( window, document, undefined ) {
bool = inputElem.checkValidity && inputElem.checkValidity() === false;

} else {
// If the upgraded input compontent rejects the :) text, we got a winner
// If the upgraded input component rejects the :) text, we got a winner
bool = inputElem.value != smile;
}
}
Expand Down