Merge branch 'master' into currency

[mfinanz.git] / js / client_js.js

diff --git a/js/client_js.js b/js/client_js.js
index b961f6591a4492cc1235a20c7cabb83b6e9efdb3..abeac1b39090d13ea0b8f03db5065608b6ed66ec 100644 (file)
--- a/js/client_js.js
+++ b/js/client_js.js
@@ -16,8 +16,10 @@ function eval_json_result(data) {
   if (data.error)
     return display_flash('error', data.error);
 
-  $('#flash_error').hide();
-  $('#flash_error_content').empty();
+  $(['info', 'warning', 'error']).each(function(idx, category) {
+    $('#flash_' + category).hide();
+    $('#flash_' + category + '_content').empty();
+  });
 
   if ((data.js || '') != '')
     eval(data.js);
@@ -83,6 +85,11 @@ function eval_json_result(data) {
       // Form Events
       else if (action[0] == 'focus')                $(action[1]).focus();
 
+      // ## jqModal plugin ##
+
+      // Closing and removing the popup
+      else if (action[0] == 'jqmClose')             $(action[1]).jqmClose();
+
       // ## jstree plugin ##
 
       // Operations on the whole tree
@@ -109,6 +116,9 @@ function eval_json_result(data) {
       else if (action[0] == 'jstree:deselect_node') $.jstree._reference($(action[1])).deselect_node(action[2]);
       else if (action[0] == 'jstree:deselect_all')  $.jstree._reference($(action[1])).deselect_all();
 
+      // ## other stuff ##
+      else if (action[0] == 'redirect_to')          window.location.href = action[1];
+
       else                                          console.log('Unknown action: ' + action[0]);
 
     });
@@ -116,6 +126,12 @@ function eval_json_result(data) {
   // console.log("current_content_type " + $('#current_content_type').val() + ' ID ' + $('#current_content_id').val());
 }
 
+function submit_ajax_form(url, form_selector, additional_data) {
+  var separator = /\?/.test(url) ? '&' : '?';
+  $.post(url + separator + $(form_selector).serialize(), additional_data, eval_json_result);
+  return true;
+}
+
 // Local Variables:
 // mode: js
 // End: