X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.js;h=41b3762a36feae20ef9630358e3a3e9dce94bca5;hb=6c4b42c0b8b0d89930cdd8abe13805afc7fc403f;hp=dbf5a0ed2809bfdd429131ebc94b969a3a7f0019;hpb=0cd51f70d2676569387f5f6a9047eb9553fea708;p=kivitendo-erp.git diff --git a/js/kivi.js b/js/kivi.js index dbf5a0ed2..41b3762a3 100644 --- a/js/kivi.js +++ b/js/kivi.js @@ -66,7 +66,11 @@ namespace("kivi", function(ns) { return 0; /* jshint -W061 */ - return eval(amount); + try { + return eval(amount); + } catch (err) { + return 0; + } }; ns.round_amount = function(amount, places) { @@ -239,10 +243,7 @@ namespace("kivi", function(ns) { $(elt).datepicker(); }); - if (ns.PartPicker) - ns.run_once_for('input.part_autocomplete', 'part_picker', function(elt) { - kivi.PartPicker($(elt)); - }); + if (ns.Part) ns.Part.reinit_widgets(); if (ns.ProjectPicker) ns.run_once_for('input.project_autocomplete', 'project_picker', function(elt) { @@ -356,13 +357,13 @@ namespace("kivi", function(ns) { params.dialog || { }, { // Options that must not be changed: close: function(event, ui) { + dialog.dialog('close'); + if (custom_close) custom_close(); if (params.url || params.html) dialog.remove(); - else - dialog.dialog('close'); } }); @@ -442,7 +443,7 @@ namespace("kivi", function(ns) { ns.run = function(function_name, args) { var fn = ns.get_function_by_name(function_name); if (fn) - return fn.apply({}, args); + return fn.apply({}, args || []); console.error('kivi.run("' + function_name + '"): No function by that name found'); return undefined;