From 8c820330a5e4985b622fcfaf10af45d1c6ef2379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 14 Nov 2012 18:00:06 +0100
Subject: [PATCH] [FIX] point_of_sale: removed the gif loader, replaced it by
 niv's js one

bzr revid: fva@openerp.com-20121114170006-gkx6ezikiw86po7u
---
 addons/point_of_sale/static/src/css/pos.css    |   5 -----
 addons/point_of_sale/static/src/img/loader.gif | Bin 3208 -> 0 bytes
 addons/point_of_sale/static/src/js/widgets.js  |   8 +++++---
 addons/point_of_sale/static/src/xml/pos.xml    |   1 -
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 addons/point_of_sale/static/src/img/loader.gif

diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 675b77345e7..9b286be250e 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -62,11 +62,6 @@
     z-index: 999;
     text-align: center;
 }
-.point-of-sale .loader img{
-    position:absolute;
-    top:50%;
-    left:50%;
-}
 
 /*  ********* Generic element styling  ********* */
 
diff --git a/addons/point_of_sale/static/src/img/loader.gif b/addons/point_of_sale/static/src/img/loader.gif
deleted file mode 100644
index 967288f55af9a3c9f27985da9559516e2d343aba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3208
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

diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 94d6a5dc57e..4ab6ee4f5ee 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -791,7 +791,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         template: 'PosWidget',
         init: function() { 
             this._super(arguments[0],{});
-            
+
+            instance.web.blockUI(); 
+
             this.pos = new module.PosModel(this.session);
             this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically
 
@@ -841,11 +843,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     self.screen_selector.show_popup('error', 'Sorry, we could not find any PoS Configuration for this session');
                 }
             
+                instance.web.unblockUI();
                 self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();});
-                self.$('.loader img').hide();
 
             }).fail(function(){   // error when loading models data from the backend
-                self.$('.loader img').hide();
+                instance.web.unblockUI();
                 return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
                     .pipe( _.bind(function(res){
                         return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']})
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 986921af1c5..cb4d90f1671 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -31,7 +31,6 @@
                 </div>
             </div>
             <div class="loader">
-                <img src="/point_of_sale/static/src/img/loader.gif" />
             </div>
         </div>
     </t>