[MERGE]merge with trunk

bzr revid: sgo@tinyerp.com-20120727050154-148msw0jzppgc66w

1 files changed, 7 insertions, 5 deletions

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 1ed4c4788e3..a092b670ef1 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -378,7 +378,8 @@ instance.web.PropertiesMixin = _.extend({}, instance.web.EventDispatcherMixin, {
         instance.web.EventDispatcherMixin.init.call(this);
         this.__getterSetterInternalMap = {};
     },
-    set: function(map) {
+    set: function(map, options) {
+        options = options || {};
         var self = this;
         var changed = false;
         _.each(map, function(val, key) {
@@ -387,10 +388,11 @@ instance.web.PropertiesMixin = _.extend({}, instance.web.EventDispatcherMixin, {
                 return;
             changed = true;
             self.__getterSetterInternalMap[key] = val;
-            self.trigger("change:" + key, self, {
-                oldValue: tmp,
-                newValue: val
-            });
+            if (! options.silent)
+                self.trigger("change:" + key, self, {
+                    oldValue: tmp,
+                    newValue: val
+                });
         });
         if (changed)
             self.trigger("change", self);