X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.js;h=27077575d70fd12e2140d5545a3196598992fd99;hb=177cb111a3514218b8bd7c9221f7b90ce2bdac7e;hp=58a631a780fcaf607dc8a45b709c0f9047ab9c08;hpb=fc53682b03f43e2ab081867ee69e102747dfdf51;p=kivitendo-erp.git

diff --git a/js/kivi.js b/js/kivi.js
index 58a631a78..27077575d 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: '.',
@@ -31,7 +33,7 @@ namespace("kivi", function(ns) {
   ns.parse_date = function(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.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
     );
@@ -51,7 +53,7 @@ namespace("kivi", function(ns) {
   };
 
   ns.parse_amount = function(amount) {
-    if ((amount == undefined) || (amount == ''))
+    if ((amount === undefined) || (amount === ''))
       return 0;
 
     if (ns._number_format.decimalSep == ',')
@@ -59,6 +61,7 @@ namespace("kivi", function(ns) {
 
     amount = amount.replace(/[\',]/g, "")
 
+    /* jshint -W061 */
     return eval(amount);
   };
 
@@ -77,7 +80,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 +88,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 +96,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 +108,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;
   };
@@ -285,6 +288,31 @@ 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 = $('<input type=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").
@@ -307,11 +335,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 +351,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) {
+          if (custom_close)
+            custom_close();
+
+          if (params.url || params.html)
+            dialog.remove();
+          else
+            dialog.dialog('close');
+        }
       });
 
     if (!params.url && !params.html) {
@@ -351,6 +389,8 @@ namespace("kivi", function(ns) {
         success: function(new_html) {
           dialog.html(new_html);
           dialog.removeClass('loading');
+          if (params.load)
+            params.load();
         }
       });
     }
@@ -379,7 +419,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);
@@ -403,6 +443,22 @@ namespace("kivi", function(ns) {
     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 :)');
+  };
 });
 
 kivi = namespace('kivi');