[imp] changed children

bzr revid: nicolas.vanhoren@openerp.com-20120221155134-lej2ren1troagr72

3 files changed, 17 insertions, 14 deletions

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bbaad17c60c..9c145c95d05 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1152,7 +1152,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
         this.loading.appendTo(this.$element);
     },
     destroy_content: function() {
-        _.each(_.clone(this.widget_children), function(el) {
+        _.each(_.clone(this.getChildren()), function(el) {
             el.stop();
         });
         this.$element.children().remove();
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index ca4d5f00781..d31d27b8fa4 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1012,15 +1012,15 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     setParent: function(parent) {
         if(this.getParent()) {
             if (this.getParent().__parented_mixin) {
-                this.getParent().widget_children = _.without(this.getParent().widget_children, this);
+                this.getParent().__parented_children = _.without(this.getParent().getChildren(), this);
             }
             this.__parented_parent = undefined;
         }
         this.__parented_parent = parent;
         if(parent && parent.__parented_mixin) {
-            if (!parent.widget_children)
-                parent.widget_children = [];
-            parent.widget_children.push(this);
+            if (!parent.getChildren())
+                parent.__parented_children = [];
+            parent.getChildren().push(this);
         }
         // useful to know if the widget was destroyed and should not be used anymore
         this.widget_is_stopped = false;
@@ -1028,6 +1028,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     getParent: function() {
         return this.__parented_parent;
     },
+    getChildren: function() {
+        return this.__parented_children || [];
+    },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
      *
@@ -1122,7 +1125,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
      * Destroys the current widget, also destroys all its children before destroying itself.
      */
     stop: function() {
-        _.each(_.clone(this.widget_children), function(el) {
+        _.each(_.clone(this.getChildren()), function(el) {
             el.stop();
         });
         if(this.$element != null) {
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 3645f761e33..424d21f1d90 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1114,7 +1114,7 @@ openerp.web.search.ExtendedSearch = openerp.web.search.Input.extend({
         if(this.$element.closest("table.oe-searchview-render-line").css("display") == "none") {
             return null;
         }
-        return _.reduce(this.widget_children,
+        return _.reduce(this.getChildren(),
             function(mem, x) { return mem.concat(x.get_domain());}, []);
     },
     on_activate: function() {
@@ -1133,9 +1133,9 @@ openerp.web.search.ExtendedSearch = openerp.web.search.Input.extend({
         }
     },
     check_last_element: function() {
-        _.each(this.widget_children, function(x) {x.set_last_group(false);});
-        if (this.widget_children.length >= 1) {
-            this.widget_children[this.widget_children.length - 1].set_last_group(true);
+        _.each(this.getChildren(), function(x) {x.set_last_group(false);});
+        if (this.getChildren().length >= 1) {
+            this.getChildren()[this.getChildren().length - 1].set_last_group(true);
         }
     }
 });
@@ -1148,7 +1148,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
     },
     add_prop: function() {
         var prop = new openerp.web.search.ExtendedSearchProposition(this, this.fields);
-        var render = prop.render({'index': this.widget_children.length - 1});
+        var render = prop.render({'index': this.getChildren().length - 1});
         this.$element.find('.searchview_extended_propositions_list').append(render);
         prop.start();
     },
@@ -1163,7 +1163,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
         });
     },
     get_domain: function() {
-        var props = _(this.widget_children).chain().map(function(x) {
+        var props = _(this.getChildren()).chain().map(function(x) {
             return x.get_proposition();
         }).compact().value();
         var choice = this.$element.find(".searchview_extended_group_choice").val();
@@ -1174,7 +1174,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
     },
     stop: function() {
         var parent = this.getParent();
-        if (this.getParent().widget_children.length == 1)
+        if (this.getParent().getChildren().length == 1)
             this.getParent().hide();
         this._super();
         parent.check_last_element();
@@ -1215,7 +1215,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
     },
     stop: function() {
         var parent;
-        if (this.getParent().widget_children.length == 1)
+        if (this.getParent().getChildren().length == 1)
             parent = this.getParent();
         this._super();
         if (parent)