X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=js%2Fkivi.js;h=4448921178dd20dfc5a4961d3416854433e23cf5;hb=da2f5aa8cea79ff0a3e1e5e88e74cbf7e9e79794;hp=58a631a780fcaf607dc8a45b709c0f9047ab9c08;hpb=fc53682b03f43e2ab081867ee69e102747dfdf51;p=kivitendo-erp.git
diff --git a/js/kivi.js b/js/kivi.js
index 58a631a78..444892117 100644
--- a/js/kivi.js
+++ b/js/kivi.js
@@ -1,4 +1,6 @@
namespace("kivi", function(ns) {
+ "use strict";
+
ns._locale = {};
ns._date_format = {
sep: '.',
@@ -6,6 +8,11 @@ namespace("kivi", function(ns) {
m: 1,
d: 0
};
+ ns._time_format = {
+ sep: ':',
+ h: 0,
+ m: 1,
+ };
ns._number_format = {
decimalSep: ',',
thousandSep: '.'
@@ -20,6 +27,13 @@ namespace("kivi", function(ns) {
ns._date_format[res[4].substr(0, 1)] = 2;
}
+ res = (params.times || "").match(/^([hm]+)([^a-z])([hm]+)$/);
+ if (res) {
+ ns._time_format = { sep: res[2] };
+ ns._time_format[res[1].substr(0, 1)] = 0;
+ ns._time_format[res[3].substr(0, 1)] = 1;
+ }
+
res = (params.numbers || "").match(/^\d*([^\d]?)\d+([^\d])\d+$/);
if (res)
ns._number_format = {
@@ -29,12 +43,61 @@ namespace("kivi", function(ns) {
};
ns.parse_date = function(date) {
+ if (date === undefined)
+ return undefined;
+
+ if (date === '')
+ return null;
+
+ if (date === '0' || date === '00')
+ return new Date();
+
var parts = date.replace(/\s+/g, "").split(ns._date_format.sep);
- date = new Date(
- ((parts[ ns._date_format.y ] || 0) * 1) || (new Date).getFullYear(),
- (parts[ ns._date_format.m ] || 0) * 1 - 1, // Months are 0-based.
- (parts[ ns._date_format.d ] || 0) * 1
- );
+ var today = new Date();
+
+ // without separator?
+ // assume fixed pattern, and extract parts again
+ if (parts.length == 1) {
+ date = parts[0];
+ parts = date.match(/../g);
+ if (date.length == 8) {
+ parts[ns._date_format.y] += parts.splice(ns._date_format.y + 1, 1)
+ }
+ else
+ if (date.length == 6 || date.length == 4) {
+ }
+ else
+ if (date.length == 1 || date.length == 2) {
+ parts = []
+ parts[ ns._date_format.y ] = today.getFullYear();
+ parts[ ns._date_format.m ] = today.getMonth() + 1;
+ parts[ ns._date_format.d ] = date;
+ }
+ else {
+ return undefined;
+ }
+ }
+
+ if (parts.length == 3) {
+ var year = +parts[ ns._date_format.y ] || 0 * 1 || (new Date()).getFullYear();
+ if (year > 9999)
+ return undefined;
+ if (year < 100) {
+ year += year > 70 ? 1900 : 2000;
+ }
+ date = new Date(
+ year,
+ (parts[ ns._date_format.m ] || (today.getMonth() + 1)) * 1 - 1, // Months are 0-based.
+ (parts[ ns._date_format.d ] || today.getDate()) * 1
+ );
+ } else if (parts.length == 2) {
+ date = new Date(
+ (new Date()).getFullYear(),
+ (parts[ (ns._date_format.m > ns._date_format.d) * 1 ] || (today.getMonth() + 1)) * 1 - 1, // Months are 0-based.
+ (parts[ (ns._date_format.d > ns._date_format.m) * 1 ] || today.getDate()) * 1
+ );
+ } else
+ return undefined;
return isNaN(date.getTime()) ? undefined : date;
};
@@ -50,16 +113,75 @@ namespace("kivi", function(ns) {
return parts.join(ns._date_format.sep);
};
+ ns.parse_time = function(time) {
+ var now = new Date();
+
+ if (time === undefined)
+ return undefined;
+
+ if (time === '')
+ return null;
+
+ if (time === '0')
+ return now;
+
+ // special case 1: military time in fixed "hhmm" format
+ if (time.length == 4) {
+ var res = time.match(/(\d\d)(\d\d)/);
+ if (res) {
+ now.setHours(res[1], res[2]);
+ return now;
+ } else {
+ return undefined;
+ }
+ }
+
+ var parts = time.replace(/\s+/g, "").split(ns._time_format.sep);
+ if (parts.length == 2) {
+ for (var idx in parts) {
+ if (Number.isNaN(Number.parseInt(parts[idx])))
+ return undefined;
+ }
+ now.setHours(parts[ns._time_format.h], parts[ns._time_format.m]);
+ return now;
+ } else
+ return undefined;
+ }
+
+ ns.format_time = function(date) {
+ if (isNaN(date.getTime()))
+ return undefined;
+
+ var parts = [ "", "" ]
+ parts[ ns._time_format.h ] = date.getHours().toString().padStart(2, '0');
+ parts[ ns._time_format.m ] = date.getMinutes().toString().padStart(2, '0');
+ return parts.join(ns._time_format.sep);
+ };
+
ns.parse_amount = function(amount) {
- if ((amount == undefined) || (amount == ''))
- return 0;
+ if (amount === undefined)
+ return undefined;
+
+ if (amount === '')
+ return null;
if (ns._number_format.decimalSep == ',')
amount = amount.replace(/\./g, "").replace(/,/g, ".");
- amount = amount.replace(/[\',]/g, "")
+ amount = amount.replace(/[\',]/g, "");
- return eval(amount);
+ // Make sure no code wich is not a math expression ends up in eval().
+ if (!amount.match(/^[0-9 ()\-+*/.]*$/))
+ return undefined;
+
+ amount = amount.replace(/^0+(\d+)/, '$1');
+
+ /* jshint -W061 */
+ try {
+ return eval(amount);
+ } catch (err) {
+ return undefined;
+ }
};
ns.round_amount = function(amount, places) {
@@ -77,7 +199,7 @@ namespace("kivi", function(ns) {
ns.format_amount = function(amount, places) {
amount = amount || 0;
- if ((places != undefined) && (places >= 0))
+ if ((places !== undefined) && (places >= 0))
amount = ns.round_amount(amount, Math.abs(places));
var parts = ("" + Math.abs(amount)).split(/\./);
@@ -85,7 +207,7 @@ namespace("kivi", function(ns) {
var dec = parts.length > 1 ? parts[1] : "";
var sign = amount < 0 ? "-" : "";
- if (places != undefined) {
+ if (places !== undefined) {
while (dec.length < Math.abs(places))
dec += "0";
@@ -93,7 +215,7 @@ namespace("kivi", function(ns) {
dec = d.substr(0, places);
}
- if ((ns._number_format.thousandSep != "") && (intg.length > 3)) {
+ if ((ns._number_format.thousandSep !== "") && (intg.length > 3)) {
var len = ((intg.length + 2) % 3) + 1,
start = len,
res = intg.substr(0, len);
@@ -105,7 +227,7 @@ namespace("kivi", function(ns) {
intg = res;
}
- var sep = (places != 0) && (dec != "") ? ns._number_format.decimalSep : "";
+ var sep = (places !== 0) && (dec !== "") ? ns._number_format.decimalSep : "";
return sign + intg + sep + dec;
};
@@ -146,41 +268,39 @@ namespace("kivi", function(ns) {
};
ns.focus_ckeditor_when_ready = function(element) {
- $(element).ckeditor(function() { ns.focus_ckeditor(element); });
+ $(element).data('ckeditorInstance').on('instanceReady', function() { ns.focus_ckeditor(element); });
};
ns.focus_ckeditor = function(element) {
- var editor = $(element).ckeditorGet();
- var editable = editor.editable();
-
- if (editable.is('textarea')) {
- var textarea = editable.$;
-
- if (CKEDITOR.env.ie)
- textarea.createTextRange().execCommand('SelectAll');
- else {
- textarea.selectionStart = 0;
- textarea.selectionEnd = textarea.value.length;
- }
-
- textarea.focus();
-
- } else {
- if (editable.is('body'))
- editor.document.$.execCommand('SelectAll', false, null);
+ $(element).data('ckeditorInstance').focus();
+ };
- else {
- var range = editor.createRange();
- range.selectNodeContents(editable);
- range.select();
- }
+ ns.selectall_ckeditor = function(element) {
+ var editor = $(element).ckeditorGet();
+ var editable = editor.editable();
+ if (editable.is('textarea')) {
+ var textarea = editable.$;
+
+ if (CKEDITOR.env.ie)
+ textarea.createTextRange().execCommand('SelectAll');
+ else {
+ textarea.selectionStart = 0;
+ textarea.selectionEnd = textarea.value.length;
+ }
+ } else {
+ if (editable.is('body'))
+ editor.document.$.execCommand('SelectAll', false, null);
- editor.forceNextSelectionCheck();
- editor.selectionChange();
+ else {
+ var range = editor.createRange();
+ range.selectNodeContents(editable);
+ range.select();
+ }
- editor.focus();
- }
- };
+ editor.forceNextSelectionCheck();
+ editor.selectionChange();
+ }
+ }
ns.init_tabwidget = function(element) {
var $element = $(element);
@@ -189,7 +309,10 @@ namespace("kivi", function(ns) {
if (elementId) {
var cookieName = 'jquery_ui_tab_'+ elementId;
- tabsParams.active = $.cookie(cookieName);
+ if (!window.location.hash) {
+ // only activate if there's no hash to overwrite it
+ tabsParams.active = $.cookie(cookieName);
+ }
tabsParams.activate = function(event, ui) {
var i = ui.newTab.parent().children().index(ui.newTab);
$.cookie(cookieName, i);
@@ -211,20 +334,20 @@ namespace("kivi", function(ns) {
entities: false,
language: 'de',
removePlugins: 'resize',
- toolbar: buttons
- }
+ extraPlugins: 'inline_resize',
+ toolbar: buttons,
+ disableAutoInline: true,
+ title: false
+ };
- var style = $e.prop('style');
- $(['width', 'height']).each(function(idx, prop) {
- var matches = (style[prop] || '').match(/(\d+)px/);
- if (matches && (matches.length > 1))
- config[prop] = matches[1];
- });
+ config.height = $e.height();
+ config.width = $e.width();
- $e.ckeditor(config);
+ var editor = CKEDITOR.inline($e.get(0), config);
+ $e.data('ckeditorInstance', editor);
if ($e.hasClass('texteditor-autofocus'))
- $e.ckeditor(function() { ns.focus_ckeditor($e); });
+ editor.on('instanceReady', function() { ns.focus_ckeditor($e); });
};
ns.reinit_widgets = function() {
@@ -232,21 +355,15 @@ 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.CustomerVendor) ns.CustomerVendor.reinit_widgets();
+ if (ns.Validator) ns.Validator.reinit_widgets();
if (ns.ProjectPicker)
ns.run_once_for('input.project_autocomplete', 'project_picker', function(elt) {
kivi.ProjectPicker($(elt));
});
- if (ns.CustomerVendorPicker)
- ns.run_once_for('input.customer_vendor_autocomplete', 'customer_vendor_picker', function(elt) {
- kivi.CustomerVendorPicker($(elt));
- });
-
if (ns.ChartPicker)
ns.run_once_for('input.chart_autocomplete', 'chart_picker', function(elt) {
kivi.ChartPicker($(elt));
@@ -285,9 +402,34 @@ namespace("kivi", function(ns) {
return true;
};
+ // This function submits an existing form given by "form_selector"
+ // and sets the "action" input to "action_to_call" before submitting
+ // it. Any existing input named "action" will be removed prior to
+ // submitting.
+ ns.submit_form_with_action = function(form_selector, action_to_call) {
+ $('[name=action]').remove();
+
+ var $form = $(form_selector);
+ var $hidden = $('');
+
+ $hidden.attr('name', 'action');
+ $hidden.attr('value', action_to_call);
+ $form.append($hidden);
+
+ $form.submit();
+ };
+
+ // This function exists solely so that it can be found with
+ // kivi.get_functions_by_name() and called later on. Using something
+ // like "var func = history["back"]" works, but calling it later
+ // with "func.apply()" doesn't.
+ ns.history_back = function() {
+ history.back();
+ };
+
// Return a function object by its name (a string). Works both with
- // global functions (e.g. "check_right_date_format") and those in
- // namespaces (e.g. "kivi.t8").
+ // global functions (e.g. "focus_by_name") and those in namespaces (e.g.
+ // "kivi.t8").
// Returns null if the object is not found.
ns.get_function_by_name = function(name) {
var parts = name.match("(.+)\\.([^\\.]+)$");
@@ -307,11 +449,13 @@ namespace("kivi", function(ns) {
// - id: dialog DIV ID (optional; defaults to 'jqueryui_popup_dialog')
// - url, data, type: passed as the first three arguments to the $.ajax() call if an AJAX call is made, otherwise ignored.
// - dialog: an optional object of options passed to the $.dialog() call
+ // - load: an optional function that is called after the content has been loaded successfully (only if an AJAX call is made)
ns.popup_dialog = function(params) {
var dialog;
params = params || { };
var id = params.id || 'jqueryui_popup_dialog';
+ var custom_close = params.dialog ? params.dialog.close : undefined;
var dialog_params = $.extend(
{ // kivitendo default parameters:
width: 800
@@ -321,7 +465,15 @@ namespace("kivi", function(ns) {
// User supplied options:
params.dialog || { },
{ // Options that must not be changed:
- close: function(event, ui) { if (params.url || params.html) dialog.remove(); else dialog.dialog('close'); }
+ close: function(event, ui) {
+ dialog.dialog('close');
+
+ if (custom_close)
+ custom_close();
+
+ if (params.url || params.html)
+ dialog.remove();
+ }
});
if (!params.url && !params.html) {
@@ -351,6 +503,8 @@ namespace("kivi", function(ns) {
success: function(new_html) {
dialog.html(new_html);
dialog.removeClass('loading');
+ if (params.load)
+ params.load();
}
});
}
@@ -379,7 +533,7 @@ namespace("kivi", function(ns) {
return;
}
- $(selector).filter(function() { return $(this).data(attr_name) != true; }).each(function(idx, elt) {
+ $(selector).filter(function() { return $(this).data(attr_name) !== true; }).each(function(idx, elt) {
var $elt = $(elt);
$elt.data(attr_name, true);
fn($elt);
@@ -398,11 +552,67 @@ 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;
};
+
+ ns.detect_duplicate_ids_in_dom = function() {
+ var ids = {},
+ found = false;
+
+ $('[id]').each(function() {
+ if (this.id && ids[this.id]) {
+ found = true;
+ console.warn('Duplicate ID #' + this.id);
+ }
+ ids[this.id] = 1;
+ });
+
+ if (!found)
+ console.log('No duplicate IDs found :)');
+ };
+
+ ns.validate_form = function(selector) {
+ if (!kivi.Validator) {
+ console.log('kivi.Validator is not loaded');
+ } else {
+ return kivi.Validator.validate_all(selector);
+ }
+ };
+
+ // Verifies that at least one checkbox matching the
+ // "checkbox_selector" is actually checked. If not, an error message
+ // is shown, and false is returned. Otherwise (at least one of them
+ // is checked) nothing is shown and true returned.
+ //
+ // Can be used in checks when clicking buttons.
+ ns.check_if_entries_selected = function(checkbox_selector) {
+ if ($(checkbox_selector + ':checked').length > 0)
+ return true;
+
+ alert(kivi.t8('No entries have been selected.'));
+
+ return false;
+ };
+
+ ns.switch_areainput_to_textarea = function(id) {
+ var $input = $('#' + id);
+ if (!$input.length)
+ return;
+
+ var $area = $('');
+
+ $area.prop('rows', 3);
+ $area.prop('cols', $input.prop('size') || 40);
+ $area.prop('name', $input.prop('name'));
+ $area.prop('id', $input.prop('id'));
+ $area.val($input.val());
+
+ $input.parent().replaceWith($area);
+ $area.focus();
+ };
});
kivi = namespace('kivi');