fix(form): fix correct disposal

Hochfrequenz · Oct 27, 2017 · 0543c85 · 0543c85
1 parent 0d0c39c
commit 0543c85
Show file tree

Hide file tree

Showing 36 changed files with 24,348 additions and 39,954 deletions.
diff --git a/dist/amd/aurelia-openui5-bridge.d.ts b/dist/amd/aurelia-openui5-bridge.d.ts
diff --git a/dist/amd/dynamic-page/dynamic-page.js b/dist/amd/dynamic-page/dynamic-page.js
@@ -123,16 +123,15 @@ define(['exports', 'aurelia-templating', 'aurelia-dependency-injection', '../com
           _self._taskQueue.queueTask(function () {
             _self._page.setHeaderExpanded((0, _attributes.getBooleanFromAttributeValue)(_self.headerExpanded));
           });
-          break;
+          return elem.localName;
         }
         if (elem.localName == 'content') {
           this._page.setContent(child);
-
-          break;
+          return elem.localName;
         }
         if (elem.localName == 'footer') {
           this._page.setFooter(child);
-          break;
+          return elem.localName;
         }
       }
     };
@@ -149,7 +148,7 @@ define(['exports', 'aurelia-templating', 'aurelia-dependency-injection', '../com
           elem = _i2.value;
         }
 
-        if (elem.localName == 'header') {
+        if (elem.localName == 'heading') {
           break;
         }
 
@@ -162,6 +161,14 @@ define(['exports', 'aurelia-templating', 'aurelia-dependency-injection', '../com
       }
     };
 
+    Ui5DynamicPage.prototype.removeChildByRelation = function removeChildByRelation(child, relation) {
+      if (relation == 'heading') {
+        this._page.setHeader(null);
+      } else if (relation == 'content') {
+        this._page.setContent(null);
+      }
+    };
+
     Ui5DynamicPage.prototype.attached = function attached() {
       var attributeManager = new _attributeManager.AttributeManager(this.element);
       var page = new sap.f.DynamicPage({

diff --git a/dist/amd/form/form.js b/dist/amd/form/form.js
@@ -156,6 +156,7 @@ define(['exports', 'aurelia-templating', 'aurelia-dependency-injection', '../com
       if (this._parent && this._parent.removeChildByRelation) this._parent.removeChildByRelation(this._form, this._relation);
       var attributeManager = new _attributeManager.AttributeManager(this.element);
       attributeManager.removeAttributes(["ui5-container"]);
+      this._form.destroy();
     };
 
     Ui5Form.prototype.editableChanged = function editableChanged(newValue) {