X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fclient_js.js;h=bd70c892f0e1867b6ab4206c25d46ab87f3fbc24;hb=4eea286e58d6646d95fa7392f9bdd7611eafa07f;hp=51e3638cdf4cc2d6fd27d03b78f6fc9c3dda02bf;hpb=88abef92ceaa2f2f297eb0b2a9a64418bed97ba7;p=kivitendo-erp.git

diff --git a/js/client_js.js b/js/client_js.js
index 51e3638cd..bd70c892f 100644
--- a/js/client_js.js
+++ b/js/client_js.js
@@ -29,13 +29,9 @@ ns.eval_json_result = function(data) {
     $(data.eval_actions).each(function(idx, action) {
       // console.log("ACTION " + action[0] + " ON " + action[1]);
 
-      // ## Non-jQuery methods ##
-           if (action[0] == 'flash')                kivi.display_flash(action[1], action[2]);
-
       // ## jQuery basics ##
-
       // Basic effects
-      else if (action[0] == 'hide')                 $(action[1]).hide();
+           if (action[0] == 'hide')                 $(action[1]).hide();
       else if (action[0] == 'show')                 $(action[1]).show();
       else if (action[0] == 'toggle')               $(action[1]).toggle();
 
@@ -84,12 +80,20 @@ ns.eval_json_result = function(data) {
       else if (action[0] == 'removeData')           $(action[1]).removeData(action[2]);
 
       // Form Events
-      else if (action[0] == 'focus')                $(action[1]).focus();
+      else if (action[0] == 'focus')                kivi.set_focus(action[1]);
+
+      // Generic Event Handling ##
+      else if (action[0] == 'on')                   $(action[1]).on(action[2], kivi.get_function_by_name(action[3]));
+      else if (action[0] == 'off')                  $(action[1]).off(action[2], kivi.get_function_by_name(action[3]));
+      else if (action[0] == 'one')                  $(action[1]).one(action[2], kivi.get_function_by_name(action[3]));
 
-      // ## jqModal plugin ##
+      // ## jQuery UI dialog plugin ##
 
       // Closing and removing the popup
-      else if (action[0] == 'jqmClose')             $(action[1]).jqmClose();
+      else if (action[0] == 'dialog:close')         $(action[1]).dialog('close');
+
+      // ## jQuery Form plugin ##
+      else if (action[0] == 'ajaxForm')             pattern: $(action[1]).ajaxForm({ success: eval_json_result });
 
       // ## jstree plugin ##
 
@@ -117,9 +121,15 @@ ns.eval_json_result = function(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();
 
+      // ## ckeditor stuff ##
+      else if (action[0] == 'focus_ckeditor')       kivi.focus_ckeditor_when_ready(action[1]);
+
       // ## other stuff ##
       else if (action[0] == 'redirect_to')          window.location.href = action[1];
+      else if (action[0] == 'flash')                kivi.display_flash(action[1], action[2]);
       else if (action[0] == 'reinit_widgets')       kivi.reinit_widgets();
+      else if (action[0] == 'run')                  kivi.run(action[1], action.slice(2, action.length));
+      else if (action[0] == 'run_once_for')         kivi.run_once_for(action[1], action[2], action[3]);
 
       else                                          console.log('Unknown action: ' + action[0]);
 
@@ -128,19 +138,6 @@ ns.eval_json_result = function(data) {
   // console.log("current_content_type " + $('#current_content_type').val() + ' ID ' + $('#current_content_id').val());
 };
 
-ns.submit_ajax_form = function(url, form_selector, additional_data) {
-  var data = $(form_selector).serialize();
-  if (additional_data) {
-    if (data)
-      data += '&';
-    data += typeof additional_data == "string" ? additional_data : $(additional_data).serialize();
-  }
-
-  $.post(url, data, ns.eval_json_result);
-
-  return true;
-};
-
 });
 
 // Local Variables: