fix blockUI on IE issue - use global block instead

OSBI · Aug 13, 2013 · 64b6fc9 · 64b6fc9
1 parent bb23af9
commit 64b6fc9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/js/saiku/Saiku.js b/js/saiku/Saiku.js
@@ -48,7 +48,7 @@ var Saiku = {
      */
     ui: {
         block: function(message) {
-            $('.processing_message').text(message);
+            $('.processing_message').html(message);
             $('.processing_message').removeClass("i18n_translated").addClass("i18n");
             Saiku.i18n.translate();
 

diff --git a/js/saiku/views/Workspace.js b/js/saiku/views/Workspace.js
@@ -587,14 +587,24 @@ var Workspace = Backbone.View.extend({
     },
 
     block: function(message) {
-        $(this.el).block({ 
-            message: '<span class="saiku_logo" style="float:left">&nbsp;&nbsp;</span> ' + message
-        });
-        Saiku.i18n.translate();
+        if (isIE) {
+            var $msg = $("<span>" + message + "</span>");
+            $msg.find('.processing_image').removeClass('processing_image');
+            Saiku.ui.block($msg.html());
+        } else {
+            $(this.el).block({ 
+                message: '<span class="saiku_logo" style="float:left">&nbsp;&nbsp;</span> ' + message
+            });
+            Saiku.i18n.translate();
+        }
     },
 
     unblock: function() {
-        $(this.el).unblock();
+        if (isIE) {
+            Saiku.ui.unblock();
+        } else {
+            $(this.el).unblock();
+        }
     },
 
     cancel: function(event) {