X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=285b02fef203f5dc165732c0b73a4d33580ade65;hb=a928895c831f0e7ea94676cac120341ab7a24e96;hp=182d47d9b6a6ed36e65d417de14d094d8cf19fe6;hpb=d6d93439fa04dfff452e621b7334fc5f9ff8be59;p=kivitendo-erp.git
diff --git a/js/common.js b/js/common.js
index 182d47d9b..285b02fef 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,6 +1,6 @@
function setupPoints(numberformat, wrongFormat) {
- decpoint = numberformat.substring((numberformat.substring(1, 2).match(/\.|\,/) ? 5 : 4), (numberformat.substring(1, 2).match(/\.|\,/) ? 6 : 5));
- if (numberformat.substring(1, 2).match(/\.|\,/)) {
+ decpoint = numberformat.substring((numberformat.substring(1, 2).match(/\.|\,|\'/) ? 5 : 4), (numberformat.substring(1, 2).match(/\.|\,|\'/) ? 6 : 5));
+ if (numberformat.substring(1, 2).match(/\.|\,|\'/)) {
thpoint = numberformat.substring(1, 2);
}
else {
@@ -33,17 +33,6 @@ function centerParms(width,height,extra) {
return string;
}
-function set_longdescription_window(input_name) {
- var parm = centerParms(600,500) + ",width=600,height=500,status=yes,scrollbars=yes";
- var name = document.getElementsByName(input_name)[0].value;
- url = "common.pl?" +
- "INPUT_ENCODING=UTF-8&" +
- "action=set_longdescription&" +
- "longdescription=" + encodeURIComponent(document.getElementsByName(input_name)[0].value) + "&" +
- "input_name=" + encodeURIComponent(input_name) + "&"
- window.open(url, "_new_generic", parm);
- }
-
function check_right_number_format(input_name) {
if(decpoint && thpoint && thpoint == decpoint) {
return show_alert_and_focus(input_name, wrongNumberFormat);
@@ -55,6 +44,9 @@ function check_right_number_format(input_name) {
if(thpoint && thpoint == '.'){
test_val = test_val.replace(/\./g, '');
}
+ if(thpoint && thpoint == "'"){
+ test_val = test_val.replace(/\'/g, '');
+ }
if(decpoint && decpoint == ','){
test_val = test_val.replace(/,/g, '.');
}
@@ -75,6 +67,46 @@ function check_right_date_format(input_name) {
if(input_name.value == "") {
return true;
}
+
+ if ( ( input_name.value.match(/^\d+$/ ) ) && !(dateFormat.lastIndexOf("y") == 3) ) {
+ // date shortcuts for entering date without separator for three date styles, e.g.
+ // 31122014 -> 12.04.2014
+ // 12312014 -> 12/31/2014
+ // 31122014 -> 31/12/2014
+
+ if (input_name.value.match(/^\d{8}$/)) {
+ input_name.value = input_name.value.replace(/^(\d\d)(\d\d)(\d\d\d\d)$/, "$1" + seperator + "$2" + seperator + "$3")
+ } else if (input_name.value.match(/^\d{6}$/)) {
+ // 120414 -> 12.04.2014
+ input_name.value = input_name.value.replace(/^(\d\d)(\d\d)(\d\d)$/, "$1" + seperator + "$2" + seperator + "$3")
+ } else if (input_name.value.match(/^\d{4}$/)) {
+ // 1204 -> 12.04.2014
+ var today = new Date();
+ var year = today.getYear();
+ if (year < 999) year += 1900;
+ input_name.value = input_name.value.replace(/^(\d\d)(\d\d)$/, "$1" + seperator + "$2");
+ input_name.value = input_name.value + seperator + year;
+ } else if ( input_name.value.match(/^\d{1,2}$/ ) ) {
+ // assume the entry is the day of the current month and current year
+ var today = new Date();
+ var day = input_name.value;
+ var month = today.getMonth() + 1;
+ var year = today.getYear();
+ if( day.length == 1 && day < 10) {
+ day='0'+day;
+ };
+ if(month<10) {
+ month='0'+month;
+ };
+ if (year < 999) year += 1900;
+ if ( dateFormat.lastIndexOf("d") == 1) {
+ input_name.value = day + seperator + month + seperator + year;
+ } else {
+ input_name.value = month + seperator + day + seperator + year;
+ }
+ };
+ }
+
var matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + "\$","ig");
if(!(dateFormat.lastIndexOf("y") == 3) && !matching.test(input_name.value)) {
matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + '\\d\\d\$', "ig");
@@ -160,57 +192,53 @@ function focus_by_name(name){
return false;
}
-function open_jqm_window(params) {
- params = params || { };
- var id = params.id ? params.id : 'jqm_popup_dialog';
-
- $('#' + id).remove();
- var div = $('').hide().appendTo('body');
- var close = $('').appendTo(div);
- var content = $('').appendTo(div);
-
- div.jqm({ modal: true });
- div.jqmShow();
- $(close).click(function() {
- div.jqmClose();
- });
-
- $.ajax({
- url: params.url,
- data: params.data,
- type: params.type,
- success: function(new_html) { $(content).html(new_html); }
- });
-
- return true;
-}
-
-$(document).ready(function () {
- // initialize all jQuery UI tab elements:
- $(".tabwidget").each(function(idx, element) {
- element = $(element);
- var cookieName = 'jquery_ui_tab_'+ element.attr('id');
- element.tabs({
- active: $.cookie(cookieName),
- activate: function(event, ui) {
- var i = ui.newTab.parent().children().index(ui.newTab);
- $.cookie(cookieName, i);
- },
- });
- });
-
+$(function () {
$('input').focus(function(){
if (focussable(this)) window.focused_element = this;
});
- var initial_focus = $(".initial_focus").filter(':visible')[0];
- if (initial_focus)
- $(initial_focus).focus();
+ // setting focus inside a tabbed area fails if this is encountered before the tabbing is complete
+ // in that case the elements count as hidden and jquery aborts .focus()
+ setTimeout(function(){
+ // Lowest priority: first focussable element in form.
+ set_cursor_to_first_element();
+
+ // Medium priority: class set in template
+ var initial_focus = $(".initial_focus").filter(':visible')[0];
+ if (initial_focus)
+ $(initial_focus).focus();
+
+ // special: honour focus_position
+ // if no higher priority applies set focus to the appropriate element
+ if ($("#display_row")[0] && kivi.myconfig.focus_position) {
+ switch(kivi.myconfig.focus_position) {
+ case 'last_partnumber' : $('#display_row tr.row:gt(-3):lt(-1) input[name*="partnumber"]').focus(); break;
+ case 'last_description' : $('#display_row tr.row:gt(-3):lt(-1) input[name*="description"]').focus(); break;
+ case 'last_qty' : $('#display_row tr.row:gt(-3):lt(-1) input[name*="qty"]').focus(); break;
+ case 'new_partnumber' : $('#display_row tr:gt(1) input[name*="partnumber"]').focus(); break;
+ case 'new_description' : $('#display_row tr:gt(1) input[name*="description"]').focus(); break;
+ case 'new_qty' : $('#display_row tr:gt(1) input[name*="qty"]').focus(); break;
+ }
+ }
+
+ // all of this screws with the native location.hash focus, so reimplement this as well
+ if (location.hash) {
+ var hash_name = location.hash.substr(1);
+ var $hash_by_id = $(location.hash + ':visible');
+ if ($hash_by_id.length > 0) {
+ $hash_by_id.get(0).focus();
+ } else {
+ var $by_name = $('[name=' + hash_name + ']:visible');
+ if ($by_name.length > 0) {
+ $by_name.get(0).focus();
+ }
+ }
+ }
- // legacy. sone forms install these
- if (typeof fokus == 'function') { fokus(); return; }
- if (focus_by_name('cursor_fokus')) return;
- set_cursor_to_first_element();
+ // legacy. some forms install these
+ if (typeof fokus == 'function') { fokus(); return; }
+ if (focus_by_name('cursor_fokus')) return;
+ }, 0);
});
$('form').submit(function(){