From 1d5d01429d71b6257fe3f30f7e3cce5bbf028c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 25 Mar 2021 18:41:51 +0100 Subject: [PATCH] Fixed: #1665 Export selection not working for AS1/2 scripts other than frame scripts --- CHANGELOG.md | 5 ++++- .../decompiler/flash/gui/tagtree/TagTree.java | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e509a685..fae1219b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. ### Fixed - "protected", "const", "namespace", "package" are not reserved keywords in AS1/2 - Not counting newlines in comments +- [#1665] Export selection not working for AS1/2 scripts other than frame scripts ## [14.3.0] - 2021-03-24 ### Added @@ -2034,7 +2035,8 @@ All notable changes to this project will be documented in this file. ### Added - Initial public release -[Unreleased]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.2.1...Unreleased +[Unreleased]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.3.0...Unreleased +[14.3.0]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.2.1...version14.3.0 [14.2.1]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.2.0...version14.2.1 [14.2.0]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.1.0...version14.2.0 [14.1.0]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.0.1...version14.1.0 @@ -2145,6 +2147,7 @@ All notable changes to this project will be documented in this file. [alpha 9]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha8...alpha9 [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 +[#1665]: https://www.free-decompiler.com/flash/issues/1665 [#1660]: https://www.free-decompiler.com/flash/issues/1660 [#1661]: https://www.free-decompiler.com/flash/issues/1661 [#1435]: https://www.free-decompiler.com/flash/issues/1435 diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java index bfb89473d..616169dad 100644 --- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java +++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java @@ -639,10 +639,16 @@ public class TagTree extends JTree { if (nodeType == TreeNodeType.BUTTON) { ret.add(d); } - if (nodeType == TreeNodeType.AS) { - ret.add(d); - } - if (nodeType == TreeNodeType.AS_FRAME) { + if (nodeType == TreeNodeType.AS + || nodeType == TreeNodeType.AS_BUTTON + || nodeType == TreeNodeType.AS_CLASS + || nodeType == TreeNodeType.AS_CLIP + || nodeType == TreeNodeType.AS_CONST + || nodeType == TreeNodeType.AS_FRAME + || nodeType == TreeNodeType.AS_FUNCTION + || nodeType == TreeNodeType.AS_INIT + || nodeType == TreeNodeType.AS_INTERFACE + || nodeType == TreeNodeType.AS_VAR) { ret.add(d); } if (nodeType == TreeNodeType.MOVIE) {