',{class:"red-ui-tabs-select"}).appendTo(wrapper);
+ // ul.hide();
+ wrapper.addClass("red-ui-tabs-collapsible");
+
+ var collapsedButtonsRow = $('').appendTo(wrapper);
+
+ var selectButton = $('').appendTo(collapsedButtonsRow);
+ selectButton.addClass("red-ui-tab-link-button-menu")
+ selectButton.click(function(evt) {
+ evt.preventDefault();
+ if (!collapsibleMenu) {
+ var pinnedOptions = [];
+ var options = [];
+ ul.children().each(function(i,el) {
+ var id = $(el).data('tabId');
+ var opt = {
+ id:"red-ui-tabs-menu-option-"+id,
+ label: tabs[id].name,
+ onselect: function() {
+ activateTab(id);
+ }
+ };
+ if (tabs[id].pinned) {
+ pinnedOptions.push(opt);
+ } else {
+ options.push(opt);
+ }
+ });
+ options = pinnedOptions.concat(options);
+ collapsibleMenu = RED.menu.init({id:"debug-message-option-menu",options: options});
+ collapsibleMenu.css({
+ position: "absolute"
+ })
+ collapsibleMenu.on('mouseleave', function(){ $(this).hide() });
+ collapsibleMenu.on('mouseup', function() { $(this).hide() });
+ collapsibleMenu.appendTo("body");
+ }
+ var elementPos = selectButton.offset();
+ collapsibleMenu.css({
+ top: (elementPos.top+selectButton.height()-20)+"px",
+ left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
+ })
+ collapsibleMenu.toggle();
+ })
+
+ }
+
function scrollEventHandler(evt,dir) {
evt.preventDefault();
if ($(this).hasClass('disabled')) {
@@ -118,6 +169,9 @@ RED.tabs = (function() {
ul.children().removeClass("active");
ul.children().css({"transition": "width 100ms"});
link.parent().addClass("active");
+ var parentId = link.parent().attr('id');
+ wrapper.find(".red-ui-tab-link-button").removeClass("active selected");
+ $("#"+parentId+"-link-button").addClass("active selected");
if (options.scrollable) {
var pos = link.parent().position().left;
if (pos-21 < 0) {
@@ -155,41 +209,70 @@ RED.tabs = (function() {
var tabs = ul.find("li.red-ui-tab");
var width = wrapper.width();
var tabCount = tabs.size();
- var tabWidth = (width-12-(tabCount*6))/tabCount;
- currentTabWidth = (100*tabWidth/width)+"%";
- currentActiveTabWidth = currentTabWidth+"%";
- if (options.scrollable) {
- tabWidth = Math.max(tabWidth,140);
- currentTabWidth = tabWidth+"px";
- currentActiveTabWidth = 0;
- var listWidth = Math.max(wrapper.width(),12+(tabWidth+6)*tabCount);
- ul.width(listWidth);
- updateScroll();
- } else if (options.hasOwnProperty("minimumActiveTabWidth")) {
- if (tabWidth < options.minimumActiveTabWidth) {
- tabCount -= 1;
- tabWidth = (width-12-options.minimumActiveTabWidth-(tabCount*6))/tabCount;
- currentTabWidth = (100*tabWidth/width)+"%";
- currentActiveTabWidth = options.minimumActiveTabWidth+"px";
+ var tabWidth;
+
+ if (options.collapsible) {
+ tabWidth = width - collapsedButtonsRow.width()-10;
+ if (tabWidth < 198) {
+ var delta = 198 - tabWidth;
+ var b = collapsedButtonsRow.find("a:last").prev();
+ while (b.is(":not(:visible)")) {
+ b = b.prev();
+ }
+ if (!b.hasClass("red-ui-tab-link-button-pinned")) {
+ b.hide();
+ }
+ tabWidth = width - collapsedButtonsRow.width()-10;
} else {
- currentActiveTabWidth = 0;
+ var space = width - 198 - collapsedButtonsRow.width();
+ if (space > 40) {
+ collapsedButtonsRow.find("a:not(:visible):first").show();
+ tabWidth = width - collapsedButtonsRow.width()-10;
+ }
}
- }
- tabs.css({width:currentTabWidth});
- if (tabWidth < 50) {
- ul.find(".red-ui-tab-close").hide();
- ul.find(".red-ui-tab-icon").hide();
- ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
+ tabs.css({width:tabWidth});
+
} else {
- ul.find(".red-ui-tab-close").show();
- ul.find(".red-ui-tab-icon").show();
- ul.find(".red-ui-tab-label").css({paddingLeft:""})
- }
- if (currentActiveTabWidth !== 0) {
- ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
- ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
- ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
- ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
+ var tabWidth = (width-12-(tabCount*6))/tabCount;
+ currentTabWidth = (100*tabWidth/width)+"%";
+ currentActiveTabWidth = currentTabWidth+"%";
+ if (options.scrollable) {
+ tabWidth = Math.max(tabWidth,140);
+ currentTabWidth = tabWidth+"px";
+ currentActiveTabWidth = 0;
+ var listWidth = Math.max(wrapper.width(),12+(tabWidth+6)*tabCount);
+ ul.width(listWidth);
+ updateScroll();
+ } else if (options.hasOwnProperty("minimumActiveTabWidth")) {
+ if (tabWidth < options.minimumActiveTabWidth) {
+ tabCount -= 1;
+ tabWidth = (width-12-options.minimumActiveTabWidth-(tabCount*6))/tabCount;
+ currentTabWidth = (100*tabWidth/width)+"%";
+ currentActiveTabWidth = options.minimumActiveTabWidth+"px";
+ } else {
+ currentActiveTabWidth = 0;
+ }
+ }
+ if (options.collapsible) {
+ console.log(currentTabWidth);
+ }
+
+ tabs.css({width:currentTabWidth});
+ if (tabWidth < 50) {
+ ul.find(".red-ui-tab-close").hide();
+ ul.find(".red-ui-tab-icon").hide();
+ ul.find(".red-ui-tab-label").css({paddingLeft:Math.min(12,Math.max(0,tabWidth-38))+"px"})
+ } else {
+ ul.find(".red-ui-tab-close").show();
+ ul.find(".red-ui-tab-icon").show();
+ ul.find(".red-ui-tab-label").css({paddingLeft:""})
+ }
+ if (currentActiveTabWidth !== 0) {
+ ul.find("li.red-ui-tab.active").css({"width":options.minimumActiveTabWidth});
+ ul.find("li.red-ui-tab.active .red-ui-tab-close").show();
+ ul.find("li.red-ui-tab.active .red-ui-tab-icon").show();
+ ul.find("li.red-ui-tab.active .red-ui-tab-label").css({paddingLeft:""})
+ }
}
}
@@ -210,11 +293,15 @@ RED.tabs = (function() {
activateTab(tab.find("a"));
}
li.remove();
+ if (tabs[id].pinned) {
+ pinnedTabsCount--;
+ }
if (options.onremove) {
options.onremove(tabs[id]);
}
delete tabs[id];
updateTabWidths();
+ collapsibleMenu = null;
}
return {
@@ -223,13 +310,48 @@ RED.tabs = (function() {
var li = $("",{class:"red-ui-tab"}).appendTo(ul);
li.attr('id',"red-ui-tab-"+(tab.id.replace(".","-")));
li.data("tabId",tab.id);
+
+ if (options.maximumTabWidth) {
+ li.css("maxWidth",options.maximumTabWidth+"px");
+ }
var link = $("",{href:"#"+tab.id, class:"red-ui-tab-label"}).appendTo(li);
if (tab.icon) {
$('
').appendTo(link);
+ } else if (tab.iconClass) {
+ $('',{class:"red-ui-tab-icon "+tab.iconClass}).appendTo(link);
}
var span = $('',{class:"bidiAware"}).text(tab.label).appendTo(link);
span.attr('dir', RED.text.bidi.resolveBaseTextDir(tab.label));
+ if (options.collapsible) {
+ li.addClass("red-ui-tab-pinned");
+ var pinnedLink = $('');
+ if (tab.pinned) {
+ if (pinnedTabsCount === 0) {
+ pinnedLink.prependTo(collapsedButtonsRow)
+ } else {
+ pinnedLink.insertAfter(collapsedButtonsRow.find("a.red-ui-tab-link-button-pinned:last"));
+ }
+ } else {
+ pinnedLink.insertBefore(collapsedButtonsRow.find("a:last"));
+ }
+ pinnedLink.attr('id',li.attr('id')+"-link-button");
+ if (tab.iconClass) {
+ $('',{class:tab.iconClass}).appendTo(pinnedLink);
+ } else {
+ $('',{class:"fa fa-lemon-o"}).appendTo(pinnedLink);
+ }
+ pinnedLink.click(function(evt) {
+ evt.preventDefault();
+ activateTab(tab.id);
+ });
+ if (tab.pinned) {
+ pinnedLink.addClass("red-ui-tab-link-button-pinned");
+ pinnedTabsCount++;
+ }
+ RED.popover.tooltip($(pinnedLink), tab.name);
+
+ }
link.on("click",onTabClick);
link.on("dblclick",onTabDblClick);
if (tab.closeable) {
@@ -326,6 +448,7 @@ RED.tabs = (function() {
}
})
}
+ collapsibleMenu = null;
},
removeTab: removeTab,
activateTab: activateTab,
diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 3b5a0d62c..0f9e2a0d9 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -76,6 +76,11 @@
}
})
}
+ },
+ env: {
+ value: "env",
+ label: "env variable",
+ icon: "red/images/typedInput/env.png"
}
};
var nlsd = false;
@@ -93,14 +98,17 @@
var that = this;
this.disarmClick = false;
+ this.input = $('');
+ this.input.insertAfter(this.element);
+ this.input.val(this.element.val());
this.element.addClass('red-ui-typedInput');
this.uiWidth = this.element.outerWidth();
- this.elementDiv = this.element.wrap("
").parent().addClass('red-ui-typedInput-input');
+ this.elementDiv = this.input.wrap("
").parent().addClass('red-ui-typedInput-input');
this.uiSelect = this.elementDiv.wrap( "
" ).parent();
var attrStyle = this.element.attr('style');
var m;
if ((m = /width\s*:\s*(calc\s*\(.*\)|\d+(%|px))/i.exec(attrStyle)) !== null) {
- this.element.css('width','100%');
+ this.input.css('width','100%');
this.uiSelect.width(m[1]);
this.uiWidth = null;
} else {
@@ -109,17 +117,19 @@
["Right","Left"].forEach(function(d) {
var m = that.element.css("margin"+d);
that.uiSelect.css("margin"+d,m);
- that.element.css("margin"+d,0);
+ that.input.css("margin"+d,0);
});
+
this.uiSelect.addClass("red-ui-typedInput-container");
+ this.element.attr('type','hidden');
+
this.options.types = this.options.types||Object.keys(allOptions);
this.selectTrigger = $('').prependTo(this.uiSelect);
- if (this.options.types.length > 1) {
- $('').appendTo(this.selectTrigger);
- }
- this.selectLabel = $('').appendTo(this.selectTrigger);
+ $('').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
+
+ this.selectLabel = $('').appendTo(this.selectTrigger);
this.types(this.options.types);
@@ -133,14 +143,16 @@
this.typeField = $("",{type:'hidden'}).appendTo(this.uiSelect);
}
- this.element.on('focus', function() {
+ this.input.on('focus', function() {
that.uiSelect.addClass('red-ui-typedInput-focus');
});
- this.element.on('blur', function() {
+ this.input.on('blur', function() {
that.uiSelect.removeClass('red-ui-typedInput-focus');
});
- this.element.on('change', function() {
+ this.input.on('change', function() {
that.validate();
+ that.element.val(that.value());
+ that.element.trigger('change',that.propertyType,that.value());
})
this.selectTrigger.click(function(event) {
event.preventDefault();
@@ -156,7 +168,7 @@
})
// explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
- this.optionSelectTrigger = $('').appendTo(this.uiSelect);
+ this.optionSelectTrigger = $('').appendTo(this.uiSelect);
this.optionSelectLabel = $('').prependTo(this.optionSelectTrigger);
this.optionSelectTrigger.click(function(event) {
event.preventDefault();
@@ -172,9 +184,7 @@
that.uiSelect.addClass('red-ui-typedInput-focus');
});
- this.optionExpandButton = $('').appendTo(this.uiSelect);
-
-
+ this.optionExpandButton = $('').appendTo(this.uiSelect);
this.type(this.options.default||this.typeList[0].value);
},
_showTypeMenu: function() {
@@ -182,7 +192,7 @@
this._showMenu(this.menu,this.selectTrigger);
this.menu.find("[value='"+this.propertyType+"']").focus();
} else {
- this.element.focus();
+ this.input.focus();
}
},
_showOptionSelectMenu: function() {
@@ -191,8 +201,8 @@
minWidth:this.optionSelectLabel.width()
});
- this._showMenu(this.optionMenu,this.optionSelectLabel);
- var selectedOption = this.optionMenu.find("[value='"+this.value()+"']");
+ this._showMenu(this.optionMenu,this.optionSelectTrigger);
+ var selectedOption = this.optionMenu.find("[value='"+this.optionValue+"']");
if (selectedOption.length === 0) {
selectedOption = this.optionMenu.children(":first");
}
@@ -204,7 +214,7 @@
$(document).off("mousedown.close-property-select");
menu.hide();
if (this.elementDiv.is(":visible")) {
- this.element.focus();
+ this.input.focus();
} else if (this.optionSelectTrigger.is(":visible")){
this.optionSelectTrigger.focus();
} else {
@@ -223,10 +233,19 @@
op.text(opt.label);
}
if (opt.icon) {
- $('![]()
',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+ if (opt.icon.indexOf("<") === 0) {
+ $(opt.icon).prependTo(op);
+ } else if (opt.icon.indexOf("/") !== -1) {
+ $('![]()
',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+ } else {
+ $('',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
+ }
} else {
op.css({paddingLeft: "18px"});
}
+ if (!opt.icon && !opt.label) {
+ op.text(opt.value);
+ }
op.click(function(event) {
event.preventDefault();
@@ -305,7 +324,8 @@
if (this.uiWidth !== null) {
this.uiSelect.width(this.uiWidth);
}
- if (this.typeMap[this.propertyType] && this.typeMap[this.propertyType].hasValue === false) {
+ var type = this.typeMap[this.propertyType];
+ if (type && type.hasValue === false) {
this.selectTrigger.addClass("red-ui-typedInput-full-width");
} else {
this.selectTrigger.removeClass("red-ui-typedInput-full-width");
@@ -315,12 +335,64 @@
this.elementDiv.css('right',"22px");
} else {
this.elementDiv.css('right','0');
+ this.input.css({
+ 'border-top-right-radius': '4px',
+ 'border-bottom-right-radius': '4px'
+ });
}
+
+ // if (this.optionSelectTrigger) {
+ // this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
+ // }
+
if (this.optionSelectTrigger) {
- this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
+ if (type && type.options && type.hasValue === true) {
+ this.optionSelectLabel.css({'left':'auto'})
+ var lw = this._getLabelWidth(this.optionSelectLabel);
+ this.optionSelectTrigger.css({'width':(23+lw)+"px"});
+ this.elementDiv.css('right',(23+lw)+"px");
+ this.input.css({
+ 'border-top-right-radius': 0,
+ 'border-bottom-right-radius': 0
+ });
+ } else {
+ this.optionSelectLabel.css({'left':'0'})
+ this.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
+ if (!this.optionExpandButton.is(":visible")) {
+ this.elementDiv.css({'right':0});
+ this.input.css({
+ 'border-top-right-radius': '4px',
+ 'border-bottom-right-radius': '4px'
+ });
+ }
+ }
}
}
},
+ _updateOptionSelectLabel: function(o) {
+ var opt = this.typeMap[this.propertyType];
+ this.optionSelectLabel.empty();
+ if (o.icon) {
+ if (o.icon.indexOf("<") === 0) {
+ $(o.icon).prependTo(this.optionSelectLabel);
+ } else if (o.icon.indexOf("/") !== -1) {
+ // url
+ $('![]()
',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+ } else {
+ // icon class
+ $('',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+ }
+ } else if (o.label) {
+ this.optionSelectLabel.text(o.label);
+ } else {
+ this.optionSelectLabel.text(o.value);
+ }
+ if (opt.hasValue) {
+ this.optionValue = o.value;
+ this._resize();
+ this.input.trigger('change',this.propertyType,this.value());
+ }
+ },
_destroy: function() {
this.menu.remove();
},
@@ -339,13 +411,18 @@
return result;
});
this.selectTrigger.toggleClass("disabled", this.typeList.length === 1);
+ this.selectTrigger.find(".fa-sort-desc").toggle(this.typeList.length > 1)
if (this.menu) {
this.menu.remove();
}
this.menu = this._createMenu(this.typeList, function(v) { that.type(v) });
if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
this.type(this.typeList[0].value);
+ } else {
+ this.propertyType = null;
+ this.type(currentType);
}
+ setTimeout(function() {that._resize();},0);
},
width: function(desiredWidth) {
this.uiWidth = desiredWidth;
@@ -353,33 +430,33 @@
},
value: function(value) {
if (!arguments.length) {
- return this.element.val();
+ var v = this.input.val();
+ if (this.typeMap[this.propertyType].export) {
+ v = this.typeMap[this.propertyType].export(v,this.optionValue)
+ }
+ return v;
} else {
+ var selectedOption;
if (this.typeMap[this.propertyType].options) {
- var validValue = false;
- var label;
for (var i=0;i').appendTo(codeBody);
var binaryContent = $('').appendTo(codeBody);
@@ -1914,7 +1914,7 @@ RED.diff = (function() {
diffRow.remove();
addedRows.find(".linetext").addClass('added');
conflictHeader.empty();
- $(''+resolvedConflicts+' of '+unresolvedConflicts+' conflicts resolved').appendTo(conflictHeader);
+ $(''+RED._("diff.conflictHeader",{resolved:resolvedConflicts, unresolved:unresolvedConflicts})+'').appendTo(conflictHeader);
conflictResolutions[file.file] = conflictResolutions[file.file] || {};
conflictResolutions[file.file][hunk.localChangeStart] = {
@@ -1946,7 +1946,7 @@ RED.diff = (function() {
function showCommitDiff(options) {
var commit = parseCommitDiff(options.commit);
var trayOptions = {
- title: "View Commit Changes", //TODO: nls
+ title: RED._("diff.viewCommitDiff"),
width: Infinity,
overlay: true,
buttons: [
@@ -2008,7 +2008,7 @@ RED.diff = (function() {
}
var trayOptions = {
- title: title||"Compare Changes", //TODO: nls
+ title: title|| RED._("diff.compareChanges"),
width: Infinity,
overlay: true,
buttons: [
@@ -2041,7 +2041,7 @@ RED.diff = (function() {
trayOptions.buttons.push(
{
id: "node-diff-view-resolve-diff",
- text: "Save conflict resolution",
+ text: RED._("diff.saveConflict"),
class: "primary disabled",
click: function() {
if (!$("#node-diff-view-resolve-diff").hasClass('disabled')) {
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index df50db725..0f6050b8a 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -108,17 +108,6 @@ RED.editor = (function() {
}
}
}
- if (node.icon) {
- var iconPath = RED.utils.separateIconPath(node.icon);
- if (!iconPath.module) {
- return isValid;
- }
- var iconSets = RED.nodes.getIconSets();
- var iconFileList = iconSets[iconPath.module];
- if (!iconFileList || iconFileList.indexOf(iconPath.file) === -1) {
- isValid = false;
- }
- }
return isValid;
}
@@ -170,27 +159,6 @@ RED.editor = (function() {
}
}
}
- validateIcon(node);
- }
-
- function validateIcon(node) {
- if (node._def.hasOwnProperty("defaults") && !node._def.defaults.hasOwnProperty("icon") && node.icon) {
- var iconPath = RED.utils.separateIconPath(node.icon);
- var iconSets = RED.nodes.getIconSets();
- var iconFileList = iconSets[iconPath.module];
- var iconModule = $("#node-settings-icon-module");
- var iconFile = $("#node-settings-icon-file");
- if (!iconFileList) {
- iconModule.addClass("input-error");
- iconFile.removeClass("input-error");
- } else if (iconFileList.indexOf(iconPath.file) === -1) {
- iconModule.removeClass("input-error");
- iconFile.addClass("input-error");
- } else {
- iconModule.removeClass("input-error");
- iconFile.removeClass("input-error");
- }
- }
}
function validateNodeEditorProperty(node,defaults,property,prefix) {
@@ -711,6 +679,97 @@ RED.editor = (function() {
}
return result;
}
+ function showIconPicker(container, node, iconPath, done) {
+ var containerPos = container.offset();
+ var pickerBackground = $('
').css({
+ position: "absolute",top:0,bottom:0,left:0,right:0,zIndex:20
+ }).appendTo("body");
+
+ var top = containerPos.top - 30;
+
+ if (top+280 > $( window ).height()) {
+ top = $( window ).height() - 280;
+ }
+ var picker = $('