Skip to content

Commit

Permalink
Fix bug where nested item is not removed.
Browse files Browse the repository at this point in the history
  • Loading branch information
dpmcmlxxvi committed Apr 15, 2018
1 parent 71634af commit 379f177
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion dist/olexp.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions dist/olexp.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* olexp 0.3.0 (c) Daniel Pulido <dpmcmlxxvi@gmail.com> */
/* olexp 0.3.1 (c) Daniel Pulido <dpmcmlxxvi@gmail.com> */

/*globals $, ol, olexp, w2ui, window */
/*jslint vars: true */
Expand Down Expand Up @@ -4472,12 +4472,12 @@ window.olexp.manager = window.olexp.manager || {};
// --------------------------------------------------
var me = this;
var itemRemoved = false;
this.items.forEach(function (item) {
this.items.forEach(function (itemChild) {
if (itemRemoved) {
return;
}
if (item.type === olexp.item.Type.GROUP) {
if (me.managers[item.id].remove(item)) {
if (itemChild.type === olexp.item.Type.GROUP) {
if (me.managers[itemChild.id].remove(item)) {
itemRemoved = true;
return;
}
Expand All @@ -4504,12 +4504,12 @@ window.olexp.manager = window.olexp.manager || {};
// --------------------------------------------------
var me = this;
var itemRemoved = null;
this.items.forEach(function (item) {
this.items.forEach(function (itemChild) {
if (itemRemoved !== null) {
return;
}
if (item.type === olexp.item.Type.GROUP) {
var layerChild = me.managers[item.id].removeFromMap(item);
if (itemChild.type === olexp.item.Type.GROUP) {
var layerChild = me.managers[itemChild.id].removeFromMap(item);
if (layerChild !== null) {
itemRemoved = layerChild;
return;
Expand Down
4 changes: 2 additions & 2 deletions dist/olexp.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/olexp.sa.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/olexp.sa.min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/js/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -1042,12 +1042,12 @@ window.olexp.manager = window.olexp.manager || {};
// --------------------------------------------------
var me = this;
var itemRemoved = false;
this.items.forEach(function (item) {
this.items.forEach(function (itemChild) {
if (itemRemoved) {
return;
}
if (item.type === olexp.item.Type.GROUP) {
if (me.managers[item.id].remove(item)) {
if (itemChild.type === olexp.item.Type.GROUP) {
if (me.managers[itemChild.id].remove(item)) {
itemRemoved = true;
return;
}
Expand All @@ -1074,12 +1074,12 @@ window.olexp.manager = window.olexp.manager || {};
// --------------------------------------------------
var me = this;
var itemRemoved = null;
this.items.forEach(function (item) {
this.items.forEach(function (itemChild) {
if (itemRemoved !== null) {
return;
}
if (item.type === olexp.item.Type.GROUP) {
var layerChild = me.managers[item.id].removeFromMap(item);
if (itemChild.type === olexp.item.Type.GROUP) {
var layerChild = me.managers[itemChild.id].removeFromMap(item);
if (layerChild !== null) {
itemRemoved = layerChild;
return;
Expand Down

0 comments on commit 379f177

Please sign in to comment.