Merge branch 'master' into lqc-trunk

[redakcja.git] / platforma / static / js / views / flash.js

diff --git a/platforma/static/js/views/flash.js b/platforma/static/js/views/flash.js
index b2240e4..e67b046 100644 (file)
--- a/platforma/static/js/views/flash.js
+++ b/platforma/static/js/views/flash.js
@@ -23,18 +23,20 @@ var FlashView = View.extend({
   
   render: function() {
     this.element.html(render_template(this.template, this));
+    setTimeout(function() {}, 0);
   },
   
-  modelFirstFlashMessageChanged: function(property, value) {
-    this.element.fadeOut('slow', function() {
-      this.element.css({'z-index': 0});
-      this.shownMessage = value;
-      this.render();
+  modelFirstFlashMessageChanged: function(property, value) {    
+    this.element.fadeOut(200, (function() {
+    
+    this.element.css({'z-index': 0});
+    this.shownMessage = value;
+    this.render();
 
-      if(this.shownMessage) {
+    if(this.shownMessage) {
         this.element.css({'z-index': 1000});
-        this.element.fadeIn('slow');
-      }
-    }.bind(this));
+        this.element.fadeIn();
+    };
+    }).bind(this));
   }
 });