Merge pull request #418 from enonic/issue-417

Opening multiple contents for editing will make the last one freeze #417
enonic · Mar 30, 2018 · 586ab35 · 586ab35
2 parents 5fa1235 + 71bb433
commit 586ab35
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/resources/assets/admin/common/js/ui/toolbar/Toolbar.ts b/src/main/resources/assets/admin/common/js/ui/toolbar/Toolbar.ts
@@ -130,7 +130,8 @@ module api.ui.toolbar {
                 if (button.isVisible()) {
                     return this.getChildren().filter((child) => child.getId() == button.getId())[0];
                 }
-                if (button.getParentElement() != button.getPreviousElement().getParentElement()) {
+                const prevEl = button.getPreviousElement();
+                if (prevEl && button.getParentElement() != prevEl.getParentElement()) {
                     return null;
                 }
                 button = button.getPreviousElement();