X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fapply%2Fstatic%2Fjs%2Fapply.js;h=236deaf19a0528879aa0b422718f14f8620c6777;hb=c8d5c8180ee140b573188ca78b0df1995f20e908;hp=197302810dc1a0364a73c1cc59d123a8aa1d6136;hpb=91bc3561ea98eff799c3055fa6258f910ff97a51;p=unfold.git

diff --git a/plugins/apply/static/js/apply.js b/plugins/apply/static/js/apply.js
index 19730281..236deaf1 100644
--- a/plugins/apply/static/js/apply.js
+++ b/plugins/apply/static/js/apply.js
@@ -46,10 +46,10 @@
 		        bAutoWidth: true,
             });
             
-            //this.elmt('update').click(this, this.do_ok);
-            //this.elmt('refresh').click(this, this.do_cancel);
+            this.elmt('close').click(this, this.do_close);
+            //this.elmt('apply_cancel').click(this, this.do_cancel);
 
-            this.elmt('apply').on('shown.bs.modal', function() {
+            this.elmt('apply__window').on('shown.bs.modal', function() {
                 self.do_update();
             })
 
@@ -80,7 +80,6 @@
 
         clear: function()
         {
-
         },
 
         find_row: function(value)
@@ -121,7 +120,6 @@
 
             var username = this.options.username;
 
-            this.spin();
             console.log("do_update in progress");
 
             manifold.raise_event(this.options.query_uuid, RUN_UPDATE);
@@ -131,11 +129,13 @@
 
         },
 
-        do_ok: function(e)
+        do_close: function(e)
         {
-            throw 'queryupdater.do_reset Not implemented';
+            var self = e.data;
+            self.table.fnClearTable();
         },
 
+        // Not used today
         do_cancel: function(e)
         {
             throw 'queryupdater.do_clear_annotations Not implemented';
@@ -214,13 +214,11 @@
 
         on_query_in_progress: function()
         {
-            this.spin();
         },
 
         on_query_done: function()
         {
             this.populate_table();
-            this.unspin();
         },
 
         // D : Data present
@@ -232,12 +230,13 @@
 
         on_clear_records: function()
         {
+        	 $('#applyloading').hide();
             this.clear();
         },
 
         on_query_done: function()
         {
-            this.unspin();
+            $('#applyloading').hide();
         },
 
         // PC : Pending changes