Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features #271

Draft
wants to merge 73 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
dc0c9d9
Fixes and improvements
atlasan Dec 16, 2020
cffcb96
Fix boolConst, Add If
atlasan Dec 16, 2020
fa94330
Logic nodes, AND, OR, NOT and Constant slots names
atlasan Dec 16, 2020
5ea3a7a
Array type icon
atlasan Dec 17, 2020
4f36710
Allow for multiline string in panel
atlasan Dec 17, 2020
959d96d
Fix showSearchBox auto focus on input
atlasan Dec 17, 2020
9364628
Cleaning debugs
atlasan Dec 17, 2020
b997fbb
Dialog auto close
atlasan Dec 17, 2020
2e067fe
WidgetPopup fixes
atlasan Dec 17, 2020
70adf9c
Clone node by ALT dragging
atlasan Dec 17, 2020
f0aeff8
Add new node with SEARCH while dragging link with SHIFT
atlasan Dec 17, 2020
6bb4207
Search filter by slot type
atlasan Dec 18, 2020
574c95e
Fix for touch events not working
atlasan Dec 18, 2020
b4fbf06
Removed references to tamat.com
atlasan Dec 18, 2020
2cf12a5
Cleaning empty string slot types
atlasan Dec 18, 2020
ea53f9b
Fixing node type
atlasan Dec 18, 2020
0194722
Removing bad slot type
atlasan Dec 18, 2020
b33de17
Better auto-link: check for first good type
atlasan Dec 20, 2020
2f9c02f
Connect input(dest) to output(source) first version!
atlasan Dec 20, 2020
f410409
Fixing doouble way-connection
atlasan Dec 20, 2020
1054bc8
Fixing and improving in-out [auto]connections
atlasan Dec 20, 2020
b255552
Fix sorting in menu
atlasan Dec 20, 2020
b7a8965
Search options and fix hiding with selectboxes to filter
atlasan Dec 20, 2020
8139698
Use first free slot of the right type when auto connect
atlasan Dec 20, 2020
709382b
Behaviour change while auto connect
atlasan Dec 20, 2020
ab1a6db
Fix and check console
atlasan Dec 20, 2020
5a44a05
Autohide and fix-for autohide for dialogs
atlasan Dec 21, 2020
2f8db4f
Couple implements
atlasan Dec 21, 2020
1662790
Node panel, Code widget, Node types
atlasan Dec 22, 2020
40e3752
Node Panel, Title, Mode, Color
atlasan Dec 22, 2020
3deff97
Default global lgraph config and modes fix
atlasan Dec 23, 2020
d98019f
boxcolor by Mode, basic/console fix
atlasan Dec 23, 2020
6c9a8a1
GraphOptions on contextMenu, Fix autoconnect from slots IN to OUT
atlasan Dec 24, 2020
627ac19
Better LGraphCanvas options, and SearchBox improvement
atlasan Dec 24, 2020
e5892ad
History! CtrlZ CtrlY, fix autoconnect for links
atlasan Dec 27, 2020
5159704
FindSlotByType cleaning and allow multiple types: autoconnect rocks
atlasan Dec 27, 2020
8ebf9fe
Merging with Javi
atlasan Dec 28, 2020
8faca6c
Better autoconnect on search
atlasan Dec 29, 2020
7a4ed83
Add a handy onExecuted outSlot
atlasan Dec 29, 2020
38beaa5
Cycles nodes: FOR and WHILE
atlasan Dec 29, 2020
08555cb
Ancestors & Descendats
atlasan Dec 29, 2020
f3eabec
Ancestors second version!
atlasan Dec 30, 2020
f29bda1
Improving ancestors autoExecution on triggers
atlasan Dec 30, 2020
e2e6cb2
Deleting and Renaming slots is conditioned
atlasan Dec 31, 2020
f19b67c
onExecuted slot is nameLocked and optionally removable
atlasan Dec 31, 2020
1e2f045
Ensure single execution: solve using triggered executions on ancestors
atlasan Dec 31, 2020
f6dcf72
Fix filtering on ensureSingleExecution
atlasan Dec 31, 2020
936d232
History fixes and improvements
atlasan Jan 2, 2021
2e34eb8
Prevent multi-event outputs
atlasan Jan 2, 2021
dbf887c
Disable Ancestors debug
atlasan Jan 2, 2021
cbd9813
Disconnect input link, not just output
atlasan Jan 2, 2021
a2de32f
Unofficial README
atlasan Jan 5, 2021
2075ae1
Unsupported README
atlasan Jan 5, 2021
8b548ac
Want some crazy stuff? Actions has IDs running down the chain
atlasan Jan 7, 2021
1fedb1f
Htmls nodes and If
atlasan Jan 9, 2021
b781064
Merge branch 'master' of https://github.com/atlasan/litegraph.js
atlasan Jan 9, 2021
c777f03
Merging and fixes
atlasan Jan 12, 2021
0297f62
Fix clip area for selected, build
atlasan Jan 12, 2021
d127631
Push README
atlasan Aug 1, 2021
ea07dd1
MERGE with JA
atlasan Aug 1, 2021
488a85d
Node minimum size
atlasan Nov 11, 2021
743ead6
Graph default config
atlasan Nov 11, 2021
6242697
History
atlasan Nov 12, 2021
b65ea19
Execute actions after updating values - Ancestors! - NodeTooltip -
atlasan Nov 16, 2021
7f486c3
NodeTooltip and Search close
atlasan Nov 16, 2021
51f2fff
Editor defaults
atlasan Nov 16, 2021
8d47180
HistoryDEBUG ON, NodeSerialize links fix
atlasan Nov 19, 2021
e388b3d
Fixes
atlasan Nov 20, 2021
db4a5b3
Merge with Pulls
atlasan Sep 29, 2022
4215ad2
Merge with pulls
atlasan Sep 29, 2022
ad816c8
Pulls Css
atlasan Sep 29, 2022
9bc25ad
Merge remote-tracking branch 'origin/master' into pulls
atlasan Sep 29, 2022
2ebb3fd
html and object WIP libs, restore option panel
atlasan Sep 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix sorting in menu
  • Loading branch information
atlasan committed Dec 20, 2020
commit b2555529f48de70b44ac7d86e46ea32b1977e022
29 changes: 16 additions & 13 deletions src/litegraph.js
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@
Globals: {}, //used to store vars between graphs

searchbox_extras: {}, //used to add extra features to the search box
auto_sort_node_types: false, // If set to true, will automatically sort node types / categories in the context menus
auto_sort_node_types: true, // If set to true, will automatically sort node types / categories in the context menus

shift_click_do_break_link_from: false, // atlasan :: I really don't like this.. too easy to break links.. maybe with Alt? Or aother less used modifiers? To me contextual menu with righet click - disconnect is more than enought
click_do_break_link_to: false, // neither, or worst
@@ -481,8 +481,12 @@
r.push(type);
}
}

return this.auto_sort_node_types ? r.sort() : r;
console.debug(r);
return this.auto_sort_node_types ? r.sort(function(a, b){
var aN = (a.title)?a.title:(a.name && a.name!=="anonymous")?a.name:(a.type.split("/").length ? a.type.split("/")[1] : a.type);
var bN = (b.title)?b.title:(b.name && b.name!=="anonymous")?b.name:(b.type.split("/").length ? b.type.split("/")[1] : b.type);
return aN > bN;
}) : r;
},

/**
@@ -9283,16 +9287,15 @@ LGraphNode.prototype.executeAction = function(action)
//inside widget
switch (w.type) {
case "button":
if (event.type === "mousemove") {
break;
}
if (w.callback) {
setTimeout(function() {
w.callback(w, that, node, pos, event);
}, 20);
}
w.clicked = true;
this.dirty_canvas = true;
if (event.type == "mousedown") {
if (w.callback) {
setTimeout(function() {
w.callback(w, that, node, pos, event);
}, 20);
}
w.clicked = true;
this.dirty_canvas = true;
}
break;
case "slider":
var range = w.options.max - w.options.min;