From 3c84c3684ad7b186bce556d8a15d357b1cc1f403 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 2 Sep 2015 23:22:12 +0000 Subject: [PATCH] Show loading spinner while preview is generated --- importexport/inc/class.importexport_export_ui.inc.php | 1 - importexport/js/app.js | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/importexport/inc/class.importexport_export_ui.inc.php b/importexport/inc/class.importexport_export_ui.inc.php index 021626d580..fc352474a5 100644 --- a/importexport/inc/class.importexport_export_ui.inc.php +++ b/importexport/inc/class.importexport_export_ui.inc.php @@ -311,7 +311,6 @@ class importexport_export_ui { } } } - error_log(array2string($filter)); unset($_content['filter']); $definition->filter = $filter; diff --git a/importexport/js/app.js b/importexport/js/app.js index 7ae68cd9e2..27e35b8fc2 100644 --- a/importexport/js/app.js +++ b/importexport/js/app.js @@ -61,16 +61,14 @@ app.classes.importexport = AppJS.extend( export_preview: function(event, widget) { var preview = $j(widget.getRoot().getWidgetById('preview_box').getDOMNode()); - $j('.content',preview).empty(); + $j('.content',preview).empty() + .append('
'); preview - .addClass('loading') .show(100, jQuery.proxy(function() { widget.clicked = true; widget.getInstanceManager().submit(false, true); widget.clicked = false; - $j(widget.getRoot().getWidgetById('preview_box').getDOMNode()) - .removeClass('loading'); },this)); return false; },