frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Format Buffer numbers as hex by default

Browse Source
This commit is contained in:
Nick O'Leary 2017-05-11 21:15:16 +01:00
parent c80fa9914b
commit 5388002f54
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/js/ui/utils.js
View File

@ -134,8 +134,8 @@ RED.utils = (function() {
return false; return false;
} }
function formatNumber(element,obj,sourceId,path,cycle) { function formatNumber(element,obj,sourceId,path,cycle,initialFormat) {
var format = (formattedPaths[sourceId] && formattedPaths[sourceId][path]) || "dec"; var format = (formattedPaths[sourceId] && formattedPaths[sourceId][path]) || initialFormat || "dec";
if (cycle) { if (cycle) {
if (format === 'dec') { if (format === 'dec') {
if ((obj.toString().length===13) && (obj<=2147483647000)) { if ((obj.toString().length===13) && (obj<=2147483647000)) {
@ -152,6 +152,9 @@ RED.utils = (function() {
} }
formattedPaths[sourceId] = formattedPaths[sourceId]||{}; formattedPaths[sourceId] = formattedPaths[sourceId]||{};
formattedPaths[sourceId][path] = format; formattedPaths[sourceId][path] = format;
} else if (initialFormat !== undefined){
formattedPaths[sourceId] = formattedPaths[sourceId]||{};
formattedPaths[sourceId][path] = format;
} }
if (format === 'dec') { if (format === 'dec') {
element.text(""+obj); element.text(""+obj);
@ -262,7 +265,7 @@ RED.utils = (function() {
formatNumber($(this), obj, sourceId, path, true); formatNumber($(this), obj, sourceId, path, true);
}); });
} }
formatNumber(e,obj,sourceId,path,false); formatNumber(e,obj,sourceId,path,false,typeHint==='hex'?'hex':undefined);
} else if (isArray) { } else if (isArray) {
element.addClass('collapsed'); element.addClass('collapsed');
@ -343,7 +346,7 @@ RED.utils = (function() {
if (fullLength <= 10) { if (fullLength <= 10) {
for (i=0;i<fullLength;i++) { for (i=0;i<fullLength;i++) {
row = $('<div class="debug-message-object-entry collapsed"></div>').appendTo(arrayRows); row = $('<div class="debug-message-object-entry collapsed"></div>').appendTo(arrayRows);
buildMessageElement(data[i],""+i,false,false,path+"["+i+"]",sourceId,rootPath,expandPaths).appendTo(row); buildMessageElement(data[i],""+i,type==='buffer'?'hex':false,false,path+"["+i+"]",sourceId,rootPath,expandPaths).appendTo(row);
} }
} else { } else {
for (i=0;i<fullLength;i+=10) { for (i=0;i<fullLength;i+=10) {
@ -358,7 +361,7 @@ RED.utils = (function() {
return function() { return function() {
for (var i=min;i<=max;i++) { for (var i=min;i<=max;i++) {
var row = $('<div class="debug-message-object-entry collapsed"></div>').appendTo(parent); var row = $('<div class="debug-message-object-entry collapsed"></div>').appendTo(parent);
buildMessageElement(data[i],""+i,false,false,path+"["+i+"]",sourceId,rootPath,expandPaths).appendTo(row); buildMessageElement(data[i],""+i,type==='buffer'?'hex':false,false,path+"["+i+"]",sourceId,rootPath,expandPaths).appendTo(row);
} }
} }
})(),checkExpanded(strippedKey,expandPaths,minRange,Math.min(fullLength-1,(minRange+9)))); })(),checkExpanded(strippedKey,expandPaths,minRange,Math.min(fullLength-1,(minRange+9))));