X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fclient_js.js;h=031b5c8f4c4bec7f411a3bcf4d3fced3cd6d9c5b;hb=3a7d0b6be7c5b679e8b2a00d326998a39c6e0529;hp=08b9b724860105c119cd7f2db33266da89616ca6;hpb=128f310047ce6d3dc7a42fa2384a1fe9bf88a36d;p=kivitendo-erp.git

diff --git a/js/client_js.js b/js/client_js.js
index 08b9b7248..031b5c8f4 100644
--- a/js/client_js.js
+++ b/js/client_js.js
@@ -4,10 +4,21 @@
 // "scripts/generate_client_js_actions.pl". See the documentation for
 // SL/ClientJS.pm for instructions.
 
+function display_flash(type, message) {
+  $('#flash_' + type + '_content').text(message);
+  $('#flash_' + type).show();
+}
+
 function eval_json_result(data) {
   if (!data)
     return;
 
+  if (data.error)
+    return display_flash('error', data.error);
+
+  $('#flash_error').hide();
+  $('#flash_error_content').empty();
+
   if ((data.js || '') != '')
     eval(data.js);
 
@@ -15,9 +26,13 @@ function eval_json_result(data) {
     $(data.eval_actions).each(function(idx, action) {
       // console.log("ACTION " + action[0] + " ON " + action[1]);
 
+      // ## Non-jQuery methods ##
+           if (action[0] == 'flash')                display_flash(action[1], action[2]);
+
       // ## jQuery basics ##
+
       // Basic effects
-           if (action[0] == 'hide')                 $(action[1]).hide();
+      else if (action[0] == 'hide')                 $(action[1]).hide();
       else if (action[0] == 'show')                 $(action[1]).show();
       else if (action[0] == 'toggle')               $(action[1]).toggle();
 
@@ -79,6 +94,7 @@ function eval_json_result(data) {
       else if (action[0] == 'jstree:reopen')        $.jstree._reference($(action[1])).reopen();
 
       // Modifying nodes
+      else if (action[0] == 'jstree:create_node')   $.jstree._reference($(action[1])).create_node(action[2], action[3], action[4]);
       else if (action[0] == 'jstree:rename_node')   $.jstree._reference($(action[1])).rename_node(action[2], action[3]);
       else if (action[0] == 'jstree:delete_node')   $.jstree._reference($(action[1])).delete_node(action[2]);
       else if (action[0] == 'jstree:move_node')     $.jstree._reference($(action[1])).move_node(action[2], action[3], action[4], action[5]);
@@ -94,3 +110,7 @@ function eval_json_result(data) {
 
   // console.log("current_content_type " + $('#current_content_type').val() + ' ID ' + $('#current_content_id').val());
 }
+
+// Local Variables:
+// mode: js
+// End: