Merge branch 'master' of git@stigma:platforma

[redakcja.git] / project / static / js / jquery.logging.js

diff --git a/project/static/js/jquery.logging.js b/project/static/js/jquery.logging.js
index 0f0df51..d6cee14 100644 (file)
--- a/project/static/js/jquery.logging.js
+++ b/project/static/js/jquery.logging.js
@@ -1,38 +1,41 @@
 (function($) {
 (function($) {

-       const LEVEL_DEBUG = 1;
-       const LEVEL_INFO = 2;
-       const LEVEL_WARN = 3;
-
-       const LOG_LEVEL = LEVEL_DEBUG;
-
-       var mozillaLog = function() {
-               if (window.console)
-                   console.log.apply(this, arguments);
-       };
-
-    var safariLog = function() {
-        if (window.console)
-            console.log.apply(console, arguments);
-    };
+       var LEVEL_DEBUG = 1;
+       var LEVEL_INFO = 2;
+       var LEVEL_WARN = 3;
+       var LOG_LEVEL = LEVEL_DEBUG;
+       
+        var standardLog = function() {
+            if (window.console)
+                console.log.apply(console, arguments);
+        };

     
        var operaLog = function() {
                opera.postError(arguments.join(' '));
        };
 
     
        var operaLog = function() {
                opera.postError(arguments.join(' '));
        };
 

-       var defaultLog = function() { return false; };
-
-       $.log = function( ) {
+        var msieLog = function() {
+            var args = $.makeArray(arguments);
+            var vals = $.map(args, function(n) {
+                try {
+                    return JSON.stringify(n);
+                } catch(e) {
+                    return ('' + n);
+                }
+            });
+
+            if (window.console)
+                console.log(vals.join(" "));
+        };
+
+       $.log = function() {

                return $.log.browserLog.apply(this, arguments);
        };
 
                return $.log.browserLog.apply(this, arguments);
        };
 

-       if ($.browser.mozilla)
-               $.log.browserLog = mozillaLog;
-       else if ($.browser.safari)
-           $.log.browserLog = safariLog;
-       else if($.browser.opera)
-               $.log.browserLog = operaLog;
-       else 
-               $.log.browserLog = defaultLog;
-
+        if($.browser.opera)
+            $.log.browserLog = operaLog;
+        else if($.browser.msie)
+            $.log.browserLog = msieLog;
+        else
+            $.log.browserLog = standardLog;

 
 })(jQuery);
 
 })(jQuery);