Merge pull request #169 from neurospeech/dev

Fixed partial removal in virtual list
neurospeech · Jan 7, 2017 · 3574c3e · 3574c3e
2 parents 86b0a36 + cb98c85
commit 3574c3e
Show file tree

Hide file tree

Showing 8 changed files with 931 additions and 916 deletions.
diff --git a/atoms-debug.js b/atoms-debug.js
diff --git a/atoms.js b/atoms.js
diff --git a/atoms.min.js b/atoms.min.js
diff --git a/atoms.min.js.map b/atoms.min.js.map
diff --git a/nuget/Atoms.js/NuGet.log b/nuget/Atoms.js/NuGet.log
diff --git a/nuget/Atoms.js/Package.nuspec b/nuget/Atoms.js/Package.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Web.Atoms.js</id>
-    <version>2.0.106</version>
+    <version>2.1.102</version>
     <title>Web.Atoms.js</title>
     <authors>Akash Kava</authors>
     <owners></owners>

diff --git a/src/Controls/AtomItemsControl.js b/src/Controls/AtomItemsControl.js
@@ -543,6 +543,15 @@
                 }, 1);
             },
 
+            resetVirtulContainer: function () {
+                this.disposeChildren(this._itemsPresenter);
+                this._firstChild = null;
+                this._lastChild = null;
+                this._scrollerSetup = false;
+                this._scopes = null;
+                this.unbindEvent(this._virtualContainer, "scroll");
+            },
+
             onVirtualCollectionChanged: function () {
 
 
@@ -551,12 +560,7 @@
 
                 var items = this.get_dataItems();
                 if (!items.length) {
-                    this.disposeChildren(ip);
-                    this._firstChild = null;
-                    this._lastChild = null;
-                    this._scrollerSetup = false;
-                    this._scopes = null;
-                    this.unbindEvent(vc, "scroll");
+                    this.resetVirtulContainer();
                     return;
                 }
 
@@ -715,7 +719,7 @@
                     var index2 = ae.currentIndex();
                     var data = ae.current();
                     var elementChild = cache[index2];
-                    if (elementChild) {
+                    if (elementChild && element.atomControl.get_data() == data) {
                         cache[index2] = null;
                     } else {
                         elementChild = this.createChildElement(parentScope, null, data, ae);
@@ -754,10 +758,6 @@
                     this._cachedItems = null;
                 }
 
-                if (this._uiVirtualize) {
-                    this.onVirtualCollectionChanged();
-                    return;
-                }
 
                 // just reset for now...
                 if (/remove/gi.test(mode)) {
@@ -775,6 +775,11 @@
                     return;
                 }
 
+                if (this._uiVirtualize) {
+                    this.onVirtualCollectionChanged();
+                    return;
+                }
+
                 var parentScope = this.get_scope();
 
                 var et = this.getTemplate("itemTemplate");

diff --git a/src/Core/Atom.js b/src/Core/Atom.js
@@ -38,10 +38,10 @@ window.AtomEnumerator = AtomEnumerator;
 var Atom = {
 
     version: {
-        text: "2.0.106",
+        text: "2.1.102",
         major: 2,
-        minor: 0,
-        build: 106
+        minor: 1,
+        build: 102
     },
 
     refreshWindowCommand: function () {