Merge branch 'master' into fix-5133

pull/5144/head
Nick O'Leary 2025-06-06 09:45:09 +01:00 committed by GitHub
commit 1d9b4de8d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 6 additions and 20 deletions

View File

@ -206,12 +206,10 @@ body {
} }
img { img {
width: auto\9;
height: auto; height: auto;
max-width: 100%; max-width: 100%;
vertical-align: middle; vertical-align: middle;
border: 0; border: 0;
-ms-interpolation-mode: bicubic;
} }
blockquote { blockquote {

View File

@ -216,14 +216,11 @@
.uneditable-input:focus { .uneditable-input:focus {
border-color: var(--red-ui-form-input-focus-color); border-color: var(--red-ui-form-input-focus-color);
outline: 0; outline: 0;
outline: thin dotted \9;
} }
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
margin: 4px 0 0; margin: 4px 0 0;
margin-top: 1px \9;
*margin-top: 0;
line-height: normal; line-height: normal;
} }
@ -285,12 +282,6 @@
color: var(--red-ui-form-placeholder-color); color: var(--red-ui-form-placeholder-color);
} }
input:-ms-input-placeholder,
div[contenteditable="true"]:-ms-input-placeholder,
textarea:-ms-input-placeholder {
color: var(--red-ui-form-placeholder-color);
}
input::-webkit-input-placeholder, input::-webkit-input-placeholder,
div[contenteditable="true"]::-webkit-input-placeholder, div[contenteditable="true"]::-webkit-input-placeholder,
textarea::-webkit-input-placeholder { textarea::-webkit-input-placeholder {
@ -568,11 +559,7 @@
input.search-query { input.search-query {
padding-right: 14px; padding-right: 14px;
padding-right: 4px \9;
padding-left: 14px; padding-left: 14px;
padding-left: 4px \9;
/* IE7-8 doesn't have border-radius, so don't indent the padding */
margin-bottom: 0; margin-bottom: 0;
border-radius: 15px; border-radius: 15px;
} }

View File

@ -18,7 +18,6 @@
-webkit-user-select: none; -webkit-user-select: none;
-khtml-user-select: none; -khtml-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none;
user-select: none; user-select: none;
} }
@ -26,7 +25,6 @@
-webkit-user-select: auto; -webkit-user-select: auto;
-khtml-user-select: auto; -khtml-user-select: auto;
-moz-user-select: auto; -moz-user-select: auto;
-ms-user-select: auto;
user-select: auto; user-select: auto;
} }

View File

@ -29,7 +29,7 @@
<div class="form-row"> <div class="form-row">
<label for="node-input-url"><i class="fa fa-globe"></i> <span data-i18n="httpin.label.url"></span></label> <label for="node-input-url"><i class="fa fa-globe"></i> <span data-i18n="httpin.label.url"></span></label>
<input id="node-input-url" type="text" placeholder="http://"> <input id="node-input-url" type="text" placeholder="https://">
</div> </div>
<div class="form-row node-input-paytoqs-row"> <div class="form-row node-input-paytoqs-row">

View File

@ -21,7 +21,7 @@
<input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name"> <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-property"><i class="fa fa-forward"></i> <span data-i18n="split.splitThe"></span></label> <label for="node-input-property" style="padding-left:10px; margin-right:-10px;" data-i18n="split.splitThe"></label>
<input type="text" id="node-input-property" style="width:70%;"/> <input type="text" id="node-input-property" style="width:70%;"/>
</div> </div>
<div class="form-row"><span data-i18n="[html]split.strBuff"></span></div> <div class="form-row"><span data-i18n="[html]split.strBuff"></span></div>

View File

@ -1017,7 +1017,7 @@
"objectSend": "Send a message for each key/value pair", "objectSend": "Send a message for each key/value pair",
"strBuff": "<b>String</b> / <b>Buffer</b>", "strBuff": "<b>String</b> / <b>Buffer</b>",
"array": "<b>Array</b>", "array": "<b>Array</b>",
"splitThe": "Split the", "splitThe": "Split property",
"splitUsing": "Split using", "splitUsing": "Split using",
"splitLength": "Fixed length of", "splitLength": "Fixed length of",
"stream": "Handle as a stream of messages", "stream": "Handle as a stream of messages",

View File

@ -406,6 +406,7 @@ async function loadPlugin(plugin) {
} }
try { try {
var r = require(plugin.file); var r = require(plugin.file);
r = r.__esModule ? r.default : r
if (typeof r === "function") { if (typeof r === "function") {
var red = registryUtil.createNodeApi(plugin); var red = registryUtil.createNodeApi(plugin);

View File

@ -51,6 +51,8 @@ function runGitCommand(args,cwd,env,emit) {
err.code = "git_auth_failed"; err.code = "git_auth_failed";
} else if(/Authentication failed/i.test(stderr)) { } else if(/Authentication failed/i.test(stderr)) {
err.code = "git_auth_failed"; err.code = "git_auth_failed";
} else if (/The requested URL returned error: 403/i.test(stderr)) {
err.code = "git_auth_failed";
} else if (/commit your changes or stash/i.test(stderr)) { } else if (/commit your changes or stash/i.test(stderr)) {
err.code = "git_local_overwrite"; err.code = "git_local_overwrite";
} else if (/CONFLICT/.test(err.stdout)) { } else if (/CONFLICT/.test(err.stdout)) {