mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Add more ui tooltips
This commit is contained in:
parent
e64f4e3f39
commit
70fb181b7b
@ -118,6 +118,7 @@ module.exports = function(grunt) {
|
|||||||
src: [
|
src: [
|
||||||
// Ensure editor source files are concatenated in
|
// Ensure editor source files are concatenated in
|
||||||
// the right order
|
// the right order
|
||||||
|
"packages/node_modules/@node-red/editor-client/src/js/jquery-addons.js",
|
||||||
"packages/node_modules/@node-red/editor-client/src/js/red.js",
|
"packages/node_modules/@node-red/editor-client/src/js/red.js",
|
||||||
"packages/node_modules/@node-red/editor-client/src/js/events.js",
|
"packages/node_modules/@node-red/editor-client/src/js/events.js",
|
||||||
"packages/node_modules/@node-red/editor-client/src/js/i18n.js",
|
"packages/node_modules/@node-red/editor-client/src/js/i18n.js",
|
||||||
|
@ -329,6 +329,7 @@
|
|||||||
"nudgeNode": "Move selected nodes (1px)",
|
"nudgeNode": "Move selected nodes (1px)",
|
||||||
"moveNode": "Move selected nodes (20px)",
|
"moveNode": "Move selected nodes (20px)",
|
||||||
"toggleSidebar": "Toggle sidebar",
|
"toggleSidebar": "Toggle sidebar",
|
||||||
|
"togglePalette": "Toggle palette",
|
||||||
"copyNode": "Copy selected nodes",
|
"copyNode": "Copy selected nodes",
|
||||||
"cutNode": "Cut selected nodes",
|
"cutNode": "Cut selected nodes",
|
||||||
"pasteNode": "Paste nodes",
|
"pasteNode": "Paste nodes",
|
||||||
@ -591,6 +592,11 @@
|
|||||||
"versionControl": {
|
"versionControl": {
|
||||||
"unstagedChanges": "Unstaged changes",
|
"unstagedChanges": "Unstaged changes",
|
||||||
"stagedChanges": "Staged changes",
|
"stagedChanges": "Staged changes",
|
||||||
|
"unstageChange": "Unstage change",
|
||||||
|
"stageChange": "Stage change",
|
||||||
|
"unstageAllChange": "Unstage all changes",
|
||||||
|
"stageAllChange": "Stage all changes",
|
||||||
|
"commitChanges": "Commit changes",
|
||||||
"resolveConflicts": "Resolve conflicts",
|
"resolveConflicts": "Resolve conflicts",
|
||||||
"head": "HEAD",
|
"head": "HEAD",
|
||||||
"staged": "Staged",
|
"staged": "Staged",
|
||||||
@ -654,7 +660,9 @@
|
|||||||
"commitsAheadAndBehind2": "__count__ commit ahead of the remote. ",
|
"commitsAheadAndBehind2": "__count__ commit ahead of the remote. ",
|
||||||
"commitsAheadAndBehind2_plural": "__count__ commits ahead of the remote. ",
|
"commitsAheadAndBehind2_plural": "__count__ commits ahead of the remote. ",
|
||||||
"commitsAheadAndBehind3": "You must pull the remote commit down before pushing.",
|
"commitsAheadAndBehind3": "You must pull the remote commit down before pushing.",
|
||||||
"commitsAheadAndBehind3_plural": "You must pull the remote commits down before pushing."
|
"commitsAheadAndBehind3_plural": "You must pull the remote commits down before pushing.",
|
||||||
|
"refreshCommitHistory": "Refresh commit history",
|
||||||
|
"refreshChanges": "Refresh changes"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
35
packages/node_modules/@node-red/editor-client/src/js/jquery-addons.js
vendored
Normal file
35
packages/node_modules/@node-red/editor-client/src/js/jquery-addons.js
vendored
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/**
|
||||||
|
* Copyright JS Foundation and other contributors, http://js.foundation
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
**/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trigger enabled/disabled events when element.prop("disabled",false/true) is
|
||||||
|
* called.
|
||||||
|
* Used by RED.popover to hide a popover when the trigger element is disabled
|
||||||
|
* as a disabled element doesn't emit mouseleave
|
||||||
|
*/
|
||||||
|
jQuery.propHooks.disabled = {
|
||||||
|
set: function (element, value) {
|
||||||
|
if (element.disabled !== value) {
|
||||||
|
element.disabled = value;
|
||||||
|
if (value) {
|
||||||
|
$(element).trigger('disabled');
|
||||||
|
} else {
|
||||||
|
$(element).trigger('enabled');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
@ -96,7 +96,11 @@ RED.popover = (function() {
|
|||||||
} else if (d === 'bottom') {
|
} else if (d === 'bottom') {
|
||||||
top = targetPos.top+targetHeight+deltaSizes[size].top;
|
top = targetPos.top+targetHeight+deltaSizes[size].top;
|
||||||
left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom;
|
left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom;
|
||||||
if (left+divWidth > viewportRight) {
|
if (left < 0) {
|
||||||
|
d = "right";
|
||||||
|
top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
|
||||||
|
left = targetPos.left+targetWidth+deltaSizes[size].leftRight;
|
||||||
|
} else if (left+divWidth > viewportRight) {
|
||||||
d = "left";
|
d = "left";
|
||||||
top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
|
top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
|
||||||
left = targetPos.left-deltaSizes[size].leftLeft-divWidth;
|
left = targetPos.left-deltaSizes[size].leftLeft-divWidth;
|
||||||
@ -147,12 +151,14 @@ RED.popover = (function() {
|
|||||||
active = true;
|
active = true;
|
||||||
timer = setTimeout(openPopup,delay.show);
|
timer = setTimeout(openPopup,delay.show);
|
||||||
});
|
});
|
||||||
target.on('mouseleave', function(e) {
|
target.on('mouseleave disabled', function(e) {
|
||||||
if (timer) {
|
if (timer) {
|
||||||
clearTimeout(timer);
|
clearTimeout(timer);
|
||||||
}
|
}
|
||||||
|
if (active) {
|
||||||
active = false;
|
active = false;
|
||||||
setTimeout(closePopup,delay.hide);
|
setTimeout(closePopup,delay.hide);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
} else if (trigger === 'click') {
|
} else if (trigger === 'click') {
|
||||||
target.click(function(e) {
|
target.click(function(e) {
|
||||||
@ -205,13 +211,13 @@ RED.popover = (function() {
|
|||||||
return label;
|
return label;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RED.popover.create({
|
return RED.popover.create({
|
||||||
target:target,
|
target:target,
|
||||||
trigger: "hover",
|
trigger: "hover",
|
||||||
size: "small",
|
size: "small",
|
||||||
direction: "bottom",
|
direction: "bottom",
|
||||||
content: label,
|
content: label,
|
||||||
delay: { show: 350, hide: 10 }
|
delay: { show: 750, hide: 50 }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -503,6 +503,8 @@ RED.palette = (function() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
sidebarControls = $('<div class="sidebar-control-left"><i class="fa fa-chevron-left"</div>').appendTo($("#palette"));
|
sidebarControls = $('<div class="sidebar-control-left"><i class="fa fa-chevron-left"</div>').appendTo($("#palette"));
|
||||||
|
RED.popover.tooltip(sidebarControls,RED._("keyboard.togglePalette"),"core:toggle-palette");
|
||||||
|
|
||||||
sidebarControls.click(function() {
|
sidebarControls.click(function() {
|
||||||
RED.menu.toggleSelected("menu-item-palette");
|
RED.menu.toggleSelected("menu-item-palette");
|
||||||
})
|
})
|
||||||
|
@ -200,12 +200,12 @@ RED.sidebar.versionControl = (function() {
|
|||||||
|
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
});
|
});
|
||||||
|
RED.popover.tooltip(revertButton,RED._("sidebar.project.versionControl.revertChanges"));
|
||||||
}
|
}
|
||||||
bg = $('<span class="button-group"></span>').appendTo(entryTools);
|
bg = $('<span class="button-group"></span>').appendTo(entryTools);
|
||||||
if (state !== 'unmerged') {
|
if (state !== 'unmerged') {
|
||||||
$('<button class="editor-button editor-button-small"><i class="fa fa-'+((state==='unstaged')?"plus":"minus")+'"></i></button>')
|
var stageButton = $('<button class="editor-button editor-button-small"><i class="fa fa-'+((state==='unstaged')?"plus":"minus")+'"></i></button>')
|
||||||
.appendTo(bg)
|
.appendTo(bg)
|
||||||
.click(function(evt) {
|
.click(function(evt) {
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
@ -231,6 +231,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
}
|
}
|
||||||
},{});
|
},{});
|
||||||
});
|
});
|
||||||
|
RED.popover.tooltip(stageButton,RED._("sidebar.project.versionControl."+((state==='unstaged')?"stage":"unstage")+"Change"));
|
||||||
}
|
}
|
||||||
entry["update"+((state==='unstaged')?"Unstaged":"Staged")] = function(entry,status) {
|
entry["update"+((state==='unstaged')?"Unstaged":"Staged")] = function(entry,status) {
|
||||||
container.removeClass();
|
container.removeClass();
|
||||||
@ -321,12 +322,13 @@ RED.sidebar.versionControl = (function() {
|
|||||||
localChanges.content.css({height:"100%"});
|
localChanges.content.css({height:"100%"});
|
||||||
|
|
||||||
var bg = $('<div style="float: right"></div>').appendTo(localChanges.header);
|
var bg = $('<div style="float: right"></div>').appendTo(localChanges.header);
|
||||||
$('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
|
var refreshButton = $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
|
||||||
.appendTo(bg)
|
.appendTo(bg)
|
||||||
.click(function(evt) {
|
.click(function(evt) {
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
refresh(true);
|
refresh(true);
|
||||||
})
|
});
|
||||||
|
RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshChanges"));
|
||||||
|
|
||||||
emptyStagedItem = { label: RED._("sidebar.project.versionControl.none") };
|
emptyStagedItem = { label: RED._("sidebar.project.versionControl.none") };
|
||||||
emptyMergedItem = { label: RED._("sidebar.project.versionControl.conflictResolve") };
|
emptyMergedItem = { label: RED._("sidebar.project.versionControl.conflictResolve") };
|
||||||
@ -343,6 +345,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
});
|
});
|
||||||
updateBulk(toStage,true);
|
updateBulk(toStage,true);
|
||||||
});
|
});
|
||||||
|
RED.popover.tooltip(stageAllButton,RED._("sidebar.project.versionControl.stageAllChange"));
|
||||||
unstagedChangesList = $("<ol>",{style:"position: absolute; top: 30px; bottom: 0; right:0; left:0;"}).appendTo(unstagedContent);
|
unstagedChangesList = $("<ol>",{style:"position: absolute; top: 30px; bottom: 0; right:0; left:0;"}).appendTo(unstagedContent);
|
||||||
unstagedChangesList.editableList({
|
unstagedChangesList.editableList({
|
||||||
addButton: false,
|
addButton: false,
|
||||||
@ -432,7 +435,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
bg = $('<div style="float: right"></div>').appendTo(header);
|
bg = $('<div style="float: right"></div>').appendTo(header);
|
||||||
var showCommitBox = function() {
|
var showCommitBox = function() {
|
||||||
commitMessage.val("");
|
commitMessage.val("");
|
||||||
submitCommitButton.attr("disabled",true);
|
submitCommitButton.prop("disabled",true);
|
||||||
unstagedContent.css("height","30px");
|
unstagedContent.css("height","30px");
|
||||||
if (unmergedContent.is(":visible")) {
|
if (unmergedContent.is(":visible")) {
|
||||||
unmergedContent.css("height","30px");
|
unmergedContent.css("height","30px");
|
||||||
@ -444,10 +447,10 @@ RED.sidebar.versionControl = (function() {
|
|||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
commitBox.css("height","175px");
|
commitBox.css("height","175px");
|
||||||
},10);
|
},10);
|
||||||
stageAllButton.attr("disabled",true);
|
stageAllButton.prop("disabled",true);
|
||||||
unstageAllButton.attr("disabled",true);
|
unstageAllButton.prop("disabled",true);
|
||||||
commitButton.attr("disabled",true);
|
commitButton.prop("disabled",true);
|
||||||
abortMergeButton.attr("disabled",true);
|
abortMergeButton.prop("disabled",true);
|
||||||
commitMessage.focus();
|
commitMessage.focus();
|
||||||
}
|
}
|
||||||
commitButton = $('<button class="editor-button editor-button-small" style="margin-right: 5px;">'+RED._("sidebar.project.versionControl.commit")+'</button>')
|
commitButton = $('<button class="editor-button editor-button-small" style="margin-right: 5px;">'+RED._("sidebar.project.versionControl.commit")+'</button>')
|
||||||
@ -457,6 +460,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
evt.stopPropagation();
|
evt.stopPropagation();
|
||||||
showCommitBox();
|
showCommitBox();
|
||||||
});
|
});
|
||||||
|
RED.popover.tooltip(commitButton,RED._("sidebar.project.versionControl.commitChanges"));
|
||||||
unstageAllButton = $('<button class="editor-button editor-button-small"><i class="fa fa-minus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
|
unstageAllButton = $('<button class="editor-button editor-button-small"><i class="fa fa-minus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
|
||||||
.appendTo(bg)
|
.appendTo(bg)
|
||||||
.click(function(evt) {
|
.click(function(evt) {
|
||||||
@ -468,6 +472,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
updateBulk(toUnstage,false);
|
updateBulk(toUnstage,false);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
RED.popover.tooltip(unstageAllButton,RED._("sidebar.project.versionControl.unstageAllChange"));
|
||||||
|
|
||||||
|
|
||||||
stagedChangesList = $("<ol>",{style:"position: absolute; top: 30px; bottom: 0; right:0; left:0;"}).appendTo(stagedContent);
|
stagedChangesList = $("<ol>",{style:"position: absolute; top: 30px; bottom: 0; right:0; left:0;"}).appendTo(stagedContent);
|
||||||
@ -487,7 +492,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
var commitMessage = $('<textarea placeholder='+RED._("sidebar.project.versionControl.commitPlaceholder")+'></textarea>')
|
var commitMessage = $('<textarea placeholder='+RED._("sidebar.project.versionControl.commitPlaceholder")+'></textarea>')
|
||||||
.appendTo(commitBox)
|
.appendTo(commitBox)
|
||||||
.on("change keyup paste",function() {
|
.on("change keyup paste",function() {
|
||||||
submitCommitButton.attr('disabled',$(this).val().trim()==="");
|
submitCommitButton.prop('disabled',$(this).val().trim()==="");
|
||||||
});
|
});
|
||||||
var commitToolbar = $('<div class="sidebar-version-control-slide-box-toolbar button-group">').appendTo(commitBox);
|
var commitToolbar = $('<div class="sidebar-version-control-slide-box-toolbar button-group">').appendTo(commitBox);
|
||||||
|
|
||||||
@ -503,10 +508,10 @@ RED.sidebar.versionControl = (function() {
|
|||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
commitBox.hide();
|
commitBox.hide();
|
||||||
},200);
|
},200);
|
||||||
stageAllButton.attr("disabled",false);
|
stageAllButton.prop("disabled",false);
|
||||||
unstageAllButton.attr("disabled",false);
|
unstageAllButton.prop("disabled",false);
|
||||||
commitButton.attr("disabled",false);
|
commitButton.prop("disabled",false);
|
||||||
abortMergeButton.attr("disabled",false);
|
abortMergeButton.prop("disabled",false);
|
||||||
|
|
||||||
})
|
})
|
||||||
var submitCommitButton = $('<button class="editor-button">'+RED._("sidebar.project.versionControl.commitCapital")+'</button>')
|
var submitCommitButton = $('<button class="editor-button">'+RED._("sidebar.project.versionControl.commitCapital")+'</button>')
|
||||||
@ -549,13 +554,14 @@ RED.sidebar.versionControl = (function() {
|
|||||||
collapsible: true
|
collapsible: true
|
||||||
});
|
});
|
||||||
|
|
||||||
var bg = $('<div style="float: right"></div>').appendTo(localHistory.header);
|
bg = $('<div style="float: right"></div>').appendTo(localHistory.header);
|
||||||
$('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
|
refreshButton = $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>')
|
||||||
.appendTo(bg)
|
.appendTo(bg)
|
||||||
.click(function(evt) {
|
.click(function(evt) {
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
refresh(true,true);
|
refresh(true,true);
|
||||||
})
|
})
|
||||||
|
RED.popover.tooltip(refreshButton,RED._("sidebar.project.versionControl.refreshCommitHistory"))
|
||||||
|
|
||||||
var localBranchToolbar = $('<div class="sidebar-version-control-change-header" style="text-align: right;"></div>').appendTo(localHistory.content);
|
var localBranchToolbar = $('<div class="sidebar-version-control-change-header" style="text-align: right;"></div>').appendTo(localHistory.content);
|
||||||
|
|
||||||
@ -578,6 +584,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
},100);
|
},100);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
RED.popover.tooltip(localBranchButton,RED._("sidebar.project.versionControl.changeLocalBranch"))
|
||||||
var repoStatusButton = $('<button class="editor-button editor-button-small" style="margin-left: 10px;" id="sidebar-version-control-repo-status-button">'+
|
var repoStatusButton = $('<button class="editor-button editor-button-small" style="margin-left: 10px;" id="sidebar-version-control-repo-status-button">'+
|
||||||
'<span id="sidebar-version-control-repo-status-stats">'+
|
'<span id="sidebar-version-control-repo-status-stats">'+
|
||||||
'<i class="fa fa-long-arrow-up"></i> <span id="sidebar-version-control-commits-ahead"></span> '+
|
'<i class="fa fa-long-arrow-up"></i> <span id="sidebar-version-control-commits-ahead"></span> '+
|
||||||
@ -606,6 +613,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
RED.popover.tooltip(repoStatusButton,RED._("sidebar.project.versionControl.manageRemoteBranch"))
|
||||||
|
|
||||||
localCommitList = $("<ol>",{style:"position: absolute; top: 30px; bottom: 0px; right:0; left:0;"}).appendTo(localHistory.content);
|
localCommitList = $("<ol>",{style:"position: absolute; top: 30px; bottom: 0px; right:0; left:0;"}).appendTo(localHistory.content);
|
||||||
localCommitListShade = $('<div class="component-shade" style="z-Index: 3"></div>').css('top',"30px").hide().appendTo(localHistory.content);
|
localCommitListShade = $('<div class="component-shade" style="z-Index: 3"></div>').css('top',"30px").hide().appendTo(localHistory.content);
|
||||||
@ -855,8 +863,8 @@ RED.sidebar.versionControl = (function() {
|
|||||||
} else {
|
} else {
|
||||||
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.selectUpstreamBranch"));
|
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.selectUpstreamBranch"));
|
||||||
}
|
}
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',true);
|
$("#sidebar-version-control-repo-pull").prop('disabled',true);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',false);
|
$("#sidebar-version-control-repo-push").prop('disabled',false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -1247,9 +1255,9 @@ RED.sidebar.versionControl = (function() {
|
|||||||
var unstagedCount = unstagedChangesList.editableList('length');
|
var unstagedCount = unstagedChangesList.editableList('length');
|
||||||
var unmergedCount = unmergedChangesList.editableList('length');
|
var unmergedCount = unmergedChangesList.editableList('length');
|
||||||
|
|
||||||
commitButton.attr('disabled',(isMerging && unmergedCount > 0)||(!isMerging && stagedCount === 0));
|
commitButton.prop('disabled',(isMerging && unmergedCount > 0)||(!isMerging && stagedCount === 0));
|
||||||
stageAllButton.attr('disabled',unstagedCount === 0);
|
stageAllButton.prop('disabled',unstagedCount === 0);
|
||||||
unstageAllButton.attr('disabled',stagedCount === 0);
|
unstageAllButton.prop('disabled',stagedCount === 0);
|
||||||
|
|
||||||
if (stagedCount === 0) {
|
if (stagedCount === 0) {
|
||||||
stagedChangesList.editableList('addItem',emptyStagedItem);
|
stagedChangesList.editableList('addItem',emptyStagedItem);
|
||||||
@ -1299,9 +1307,9 @@ RED.sidebar.versionControl = (function() {
|
|||||||
if (result.branches.hasOwnProperty("remoteError") && result.branches.remoteError.code !== 'git_remote_gone') {
|
if (result.branches.hasOwnProperty("remoteError") && result.branches.remoteError.code !== 'git_remote_gone') {
|
||||||
$("#sidebar-version-control-repo-status-auth-issue").show();
|
$("#sidebar-version-control-repo-status-auth-issue").show();
|
||||||
$("#sidebar-version-control-repo-status-stats").hide();
|
$("#sidebar-version-control-repo-status-stats").hide();
|
||||||
$('#sidebar-version-control-repo-branch').attr('disabled',true);
|
$('#sidebar-version-control-repo-branch').prop('disabled',true);
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',true);
|
$("#sidebar-version-control-repo-pull").prop('disabled',true);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',true);
|
$("#sidebar-version-control-repo-push").prop('disabled',true);
|
||||||
$('#sidebar-version-control-repo-toolbar-message').hide();
|
$('#sidebar-version-control-repo-toolbar-message').hide();
|
||||||
$('#sidebar-version-control-repo-toolbar-error-message').show();
|
$('#sidebar-version-control-repo-toolbar-error-message').show();
|
||||||
} else {
|
} else {
|
||||||
@ -1311,7 +1319,7 @@ RED.sidebar.versionControl = (function() {
|
|||||||
$("#sidebar-version-control-repo-status-auth-issue").hide();
|
$("#sidebar-version-control-repo-status-auth-issue").hide();
|
||||||
$("#sidebar-version-control-repo-status-stats").show();
|
$("#sidebar-version-control-repo-status-stats").show();
|
||||||
|
|
||||||
$('#sidebar-version-control-repo-branch').attr('disabled',false);
|
$('#sidebar-version-control-repo-branch').prop('disabled',false);
|
||||||
|
|
||||||
$("#sidebar-version-control-repo-status-button").show();
|
$("#sidebar-version-control-repo-status-button").show();
|
||||||
if (result.branches.hasOwnProperty('remote')) {
|
if (result.branches.hasOwnProperty('remote')) {
|
||||||
@ -1321,8 +1329,8 @@ RED.sidebar.versionControl = (function() {
|
|||||||
$('#sidebar-version-control-commits-behind').text("");
|
$('#sidebar-version-control-commits-behind').text("");
|
||||||
|
|
||||||
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.notTracking"));
|
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.notTracking"));
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',true);
|
$("#sidebar-version-control-repo-pull").prop('disabled',true);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',true);
|
$("#sidebar-version-control-repo-push").prop('disabled',true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -1347,27 +1355,27 @@ RED.sidebar.versionControl = (function() {
|
|||||||
$('#sidebar-version-control-commits-behind').text(commitsBehind);
|
$('#sidebar-version-control-commits-behind').text(commitsBehind);
|
||||||
if (isMerging) {
|
if (isMerging) {
|
||||||
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.statusUnmergedChanged"));
|
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.statusUnmergedChanged"));
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',true);
|
$("#sidebar-version-control-repo-pull").prop('disabled',true);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',true);
|
$("#sidebar-version-control-repo-push").prop('disabled',true);
|
||||||
} else if (commitsAhead > 0 && commitsBehind === 0) {
|
} else if (commitsAhead > 0 && commitsBehind === 0) {
|
||||||
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsAhead", {count:commitsAhead}));
|
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsAhead", {count:commitsAhead}));
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',true);
|
$("#sidebar-version-control-repo-pull").prop('disabled',true);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',false);
|
$("#sidebar-version-control-repo-push").prop('disabled',false);
|
||||||
} else if (commitsAhead === 0 && commitsBehind > 0) {
|
} else if (commitsAhead === 0 && commitsBehind > 0) {
|
||||||
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsBehind",{ count: commitsBehind }));
|
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsBehind",{ count: commitsBehind }));
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',false);
|
$("#sidebar-version-control-repo-pull").prop('disabled',false);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',true);
|
$("#sidebar-version-control-repo-push").prop('disabled',true);
|
||||||
} else if (commitsAhead > 0 && commitsBehind > 0) {
|
} else if (commitsAhead > 0 && commitsBehind > 0) {
|
||||||
$('#sidebar-version-control-repo-toolbar-message').text(
|
$('#sidebar-version-control-repo-toolbar-message').text(
|
||||||
RED._("sidebar.project.versionControl.commitsAheadAndBehind1",{ count:commitsBehind })+
|
RED._("sidebar.project.versionControl.commitsAheadAndBehind1",{ count:commitsBehind })+
|
||||||
RED._("sidebar.project.versionControl.commitsAheadAndBehind2",{ count:commitsAhead })+
|
RED._("sidebar.project.versionControl.commitsAheadAndBehind2",{ count:commitsAhead })+
|
||||||
RED._("sidebar.project.versionControl.commitsAheadAndBehind3",{ count:commitsBehind }));
|
RED._("sidebar.project.versionControl.commitsAheadAndBehind3",{ count:commitsBehind }));
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',false);
|
$("#sidebar-version-control-repo-pull").prop('disabled',false);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',true);
|
$("#sidebar-version-control-repo-push").prop('disabled',true);
|
||||||
} else if (commitsAhead === 0 && commitsBehind === 0) {
|
} else if (commitsAhead === 0 && commitsBehind === 0) {
|
||||||
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.repositoryUpToDate"));
|
$('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.repositoryUpToDate"));
|
||||||
$("#sidebar-version-control-repo-pull").attr('disabled',true);
|
$("#sidebar-version-control-repo-pull").prop('disabled',true);
|
||||||
$("#sidebar-version-control-repo-push").attr('disabled',true);
|
$("#sidebar-version-control-repo-push").prop('disabled',true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function show() {
|
function show() {
|
||||||
|
@ -204,7 +204,7 @@ RED.sidebar = (function() {
|
|||||||
if (!sidebarSeparator.dragging) {
|
if (!sidebarSeparator.dragging) {
|
||||||
sidebarControls.hide();
|
sidebarControls.hide();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
function toggleSidebar(state) {
|
function toggleSidebar(state) {
|
||||||
if (!state) {
|
if (!state) {
|
||||||
@ -240,6 +240,7 @@ RED.sidebar = (function() {
|
|||||||
toggleSidebar(state);
|
toggleSidebar(state);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
RED.popover.tooltip($("#sidebar-separator").find(".sidebar-control-right"),RED._("keyboard.toggleSidebar"),"core:toggle-sidebar");
|
||||||
showSidebar();
|
showSidebar();
|
||||||
RED.sidebar.info.init();
|
RED.sidebar.info.init();
|
||||||
RED.sidebar.config.init();
|
RED.sidebar.config.init();
|
||||||
|
@ -215,7 +215,8 @@ RED.debug = (function() {
|
|||||||
refreshDebugNodeList();
|
refreshDebugNodeList();
|
||||||
filterDialog.slideDown(200);
|
filterDialog.slideDown(200);
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
RED.popover.tooltip(toolbar.find('#debug-tab-filter'),RED._('node-red:debug.sidebar.filterLog'));
|
||||||
|
|
||||||
toolbar.find("#debug-tab-clear").click(function(e) {
|
toolbar.find("#debug-tab-clear").click(function(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
@ -123,8 +123,9 @@
|
|||||||
"filterSelected": "selected nodes",
|
"filterSelected": "selected nodes",
|
||||||
"filterCurrent": "current flow",
|
"filterCurrent": "current flow",
|
||||||
"debugNodes": "Debug nodes",
|
"debugNodes": "Debug nodes",
|
||||||
"clearLog": "clear log",
|
"clearLog": "Clear log",
|
||||||
"openWindow": "open in new window"
|
"filterLog": "Filter log",
|
||||||
|
"openWindow": "Open in new window"
|
||||||
},
|
},
|
||||||
"messageMenu": {
|
"messageMenu": {
|
||||||
"collapseAll": "Collapse all paths",
|
"collapseAll": "Collapse all paths",
|
||||||
|
Loading…
Reference in New Issue
Block a user