[MERGE] merge with trunk

bzr revid: nwi@openerp.com-20121220100314-98ka2wahul3lbu57

1 files changed, 11 insertions, 0 deletions

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index c88e0ca0512..a8b0510389b 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -30,6 +30,12 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
      * Setup a sessionm
      */
     session_bind: function(origin) {
+        if (!_.isUndefined(this.origin)) {
+            if (this.origin === origin) {
+                return $.when();
+            }
+            throw new Error('Session already bound to ' + this.origin);
+        }
         var self = this;
         this.setup(origin);
         instance.web.qweb.default_dict['_s'] = this.origin;
@@ -471,6 +477,11 @@ $.fn.openerpClass = function(additionalClass) {
         $(this).addClass('openerp ' + additionalClass);
     });
 };
+$.fn.openerpBounce = function() {
+    return this.each(function() {
+        $(this).css('box-sizing', 'content-box').effect('bounce', {distance: 18, times: 5}, 250);
+    });
+};
 
 /** Jquery extentions */
 $.Mutex = (function() {