frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary 2021-07-16 08:53:35 +01:00
parent 66a704af55 d4a199f0e1
commit 5ba0588c7b
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-api/lib/editor/theme.js vendored
View File

@ -244,7 +244,7 @@ module.exports = {
)
themeContext.page.scripts = scriptFiles.concat(themeContext.page.scripts || [])
theme.page = theme.page || {_:{}}
theme.page._.scripts = cssFiles.concat(theme.page._.scripts || [])
theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
}
}
activeThemeInitialised = true;

BIN
packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 B

9
packages/node_modules/@node-red/editor-client/src/js/ui/view.js vendored
View File

@ -2369,6 +2369,7 @@ RED.view = (function() {
var textDimensionPlaceholder = {};
var textDimensionCache = {};
function calculateTextDimensions(str,className) {
var cacheKey = "!"+str;
if (!textDimensionPlaceholder[className]) {
textDimensionPlaceholder[className] = document.createElement("span");
textDimensionPlaceholder[className].className = className;
@ -2377,15 +2378,15 @@ RED.view = (function() {
document.getElementById("red-ui-editor").appendChild(textDimensionPlaceholder[className]);
textDimensionCache[className] = {};
} else {
if (textDimensionCache[className][str]) {
return textDimensionCache[className][str]
if (textDimensionCache[className][cacheKey]) {
return textDimensionCache[className][cacheKey]
}
}
textDimensionPlaceholder[className].textContent = (str||"");
var w = textDimensionPlaceholder[className].offsetWidth;
var h = textDimensionPlaceholder[className].offsetHeight;
textDimensionCache[className][str] = [w,h];
return textDimensionCache[className][str];
textDimensionCache[className][cacheKey] = [w,h];
return textDimensionCache[className][cacheKey];
}
function convertLineBreakCharacter(str) {

3
packages/node_modules/@node-red/editor-client/src/sass/panels.scss vendored
View File

@ -40,7 +40,7 @@
height: 7px;
box-sizing: border-box;
cursor: ns-resize;
background: $primary-background url(images/grip.png) no-repeat 50% 50%;
background: $primary-background url(images/grip-horizontal.png) no-repeat 50% 50%;
}
@ -70,5 +70,6 @@
width: 7px;
display: inline-block;
cursor: ew-resize;
background: $primary-background url(images/grip.png) no-repeat 50% 50%;
}
}