Merge branch 'master' into 2.5.x

OSBI · Aug 13, 2013 · 43f2154 · 43f2154
2 parents 0e9d60d + 3ad051c
commit 43f2154
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 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/plugins/CCC_Chart/plugin.js b/js/saiku/plugins/CCC_Chart/plugin.js
@@ -443,7 +443,7 @@ var Chart = Backbone.View.extend({
                        return scene.isSelected() ? '10%' : 0;
                 }
             },
-            clickable: true,
+            clickable: true
             //valuesLabelStyle: 'inside'
         },
 

diff --git a/js/saiku/views/Workspace.js b/js/saiku/views/Workspace.js
@@ -286,7 +286,7 @@ var Workspace = Backbone.View.extend({
 
         } else {
             $(this.el).find('.workspace_editor').removeClass('hide').show();
-            $(this.el).find('.workspace_fields').removeClass('disabled');
+            $(this.el).find('.workspace_fields').removeClass('disabled').removeClass('hide');
             $(this.el).find('.workspace_editor .mdx_input').addClass('hide');
             $(this.el).find('.workspace_editor .editor_info').addClass('hide');
             $(this.toolbar.el).find('.auto, ,.toggle_fields, .query_scenario, .buckets, .non_empty, .swap_axis, .mdx, .switch_to_mdx').parent().show();
@@ -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) {