From: Darren <darren@darrenwhitlen.com>
Date: Sat, 17 Aug 2013 17:57:31 +0000 (+0100)
Subject: manageDebug() replaced to html5boilerplate console management
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=64bdb2ffc78e38b471fcc119bb1dc49de30d95d5;p=KiwiIRC.git

manageDebug() replaced to html5boilerplate console management
---

diff --git a/client/assets/src/helpers/utils.js b/client/assets/src/helpers/utils.js
index 5944db7..6837a50 100644
--- a/client/assets/src/helpers/utils.js
+++ b/client/assets/src/helpers/utils.js
@@ -3,30 +3,6 @@
 
 
 
-/**
-*   Suppresses console.log
-*   @param  {Boolean}   debug   Whether to re-enable console.log or not
-*/
-function manageDebug(debug) {
-    var log, consoleBackUp;
-    if (window.console) {
-        consoleBackUp = window.console.log;
-        window.console.log = function () {
-            if (debug) {
-                consoleBackUp.apply(console, arguments);
-            }
-        };
-    } else {
-        log = window.opera ? window.opera.postError : alert;
-        window.console = {};
-        window.console.log = function (str) {
-            if (debug) {
-                log(str);
-            }
-        };
-    }
-}
-
 /**
 *   Generate a random string of given length
 *   @param      {Number}    string_length   The length of the random string
@@ -138,7 +114,7 @@ function InputPreProcessor () {
 
                 // Did we find anything or does the word it refers to non-existant?
                 if (!num || !words[num[1]]) continue;
-                
+
                 if (num[2] === '+' && num[3]) {
                     // Add X number of words
                     compiled = compiled.concat(words.slice(parseInt(num[1], 10), parseInt(num[1], 10) + parseInt(num[3], 10)));
@@ -182,7 +158,7 @@ function InputPreProcessor () {
 
         if (this.aliases[words[0]]) {
             words = this.processInput(words);
-            
+
             if (this.aliases[words[0]]) {
                 words = this.process(words.join(' ')).split(' ');
             }
diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index d42aae5..80baa7d 100644
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -55,7 +55,7 @@
 
 
 
-    
+
     <script type="text/html" id="tmpl_userbox">
         <div class="userbox">
             <a class="if_op op"><i class="icon-star"></i><%= op %></a>
@@ -70,7 +70,7 @@
             <a class="slap"><i class="icon-user-md"></i><%= slap %></a>
         </div>
     </script>
-    
+
     <script type="text/html" id="tmpl_nickchange">
         <form class="nickchange">
             <label for="nickchange"><%= new_nick %>:</label> <input type="text" mozactionhint="done" autocomplete="off" spellcheck="false"/> <button><%= change %></button> <a class="cancel"><%= cancel %></a>
@@ -309,6 +309,29 @@
 (function(a,b,c){typeof c["module"]!="undefined"&&c.module.exports?c.module.exports=b():typeof c["define"]!="undefined"&&c["define"]=="function"&&c.define.amd?define(a,b):c[a]=b()})("$script",function(){function p(a,b){for(var c=0,d=a.length;c<d;++c)if(!b(a[c]))return j;return 1}function q(a,b){p(a,function(a){return!b(a)})}function r(a,b,i){function o(a){return a.call?a():d[a]}function t(){if(!--n){d[m]=1,l&&l();for(var a in f)p(a.split("|"),o)&&!q(f[a],o)&&(f[a]=[])}}a=a[k]?a:[a];var j=b&&b.call,l=j?b:i,m=j?a.join(""):b,n=a.length;return setTimeout(function(){q(a,function(a){if(h[a])return m&&(e[m]=1),h[a]==2&&t();h[a]=1,m&&(e[m]=1),s(!c.test(a)&&g?g+a+".js":a,t)})},0),r}function s(c,d){var e=a.createElement("script"),f=j;e.onload=e.onerror=e[o]=function(){if(e[m]&&!/^c|loade/.test(e[m])||f)return;e.onload=e[o]=null,f=1,h[c]=2,d()},e.async=1,e.src=c,b.insertBefore(e,b.firstChild)}var a=document,b=a.getElementsByTagName("head")[0],c=/^https?:\/\//,d={},e={},f={},g,h={},i="string",j=!1,k="push",l="DOMContentLoaded",m="readyState",n="addEventListener",o="onreadystatechange";return!a[m]&&a[n]&&(a[n](l,function t(){a.removeEventListener(l,t,j),a[m]="complete"},j),a[m]="loading"),r.get=s,r.order=function(a,b,c){(function d(e){e=a.shift(),a.length?r(e,d):r(e,b,c)})()},r.path=function(a){g=a},r.ready=function(a,b,c){a=a[k]?a:[a];var e=[];return!q(a,function(a){d[a]||e[k](a)})&&p(a,function(a){return d[a]})?b():!function(a){f[a]=f[a]||[],f[a][k](b),c&&c(e)}(a.join("|")),r},r},this)
 
 
+    // Avoid `console` errors in browsers that lack a console. (https://github.com/h5bp/html5-boilerplate)
+    function normalizeConsole() {
+        var method;
+        var noop = function () {};
+        var methods = [
+            'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
+            'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
+            'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
+            'timeStamp', 'trace', 'warn'
+        ];
+        var length = methods.length;
+        var console = (window.console = window.console || {});
+
+        while (length--) {
+            method = methods[length];
+
+            // Only stub undefined methods.
+            if (!console[method]) {
+                console[method] = noop;
+            }
+        }
+    };
+
     function getQueryVariable(variable) {
         var query = window.location.search.substring(1);
         var vars = query.split('&');
@@ -328,6 +351,8 @@
                 base_path: base_path
             };
 
+        normalizeConsole();
+
         // Run after all dependancies have been loaded
         function startApp () {
             // Start the app
@@ -362,7 +387,7 @@
                     to_load.push(base + scripts[cur_script][idx]);
                 }
             }
-            
+
             $script(to_load, loadNextScript);
 
             cur_script++;
diff --git a/client/assets/src/models/application.js b/client/assets/src/models/application.js
index aea2fa6..363f040 100644
--- a/client/assets/src/models/application.js
+++ b/client/assets/src/models/application.js
@@ -41,13 +41,6 @@ _kiwi.model.Application = function () {
 
 
         this.start = function () {
-            // Only debug if set in the querystring
-            if (!getQueryVariable('debug')) {
-                manageDebug(false);
-            } else {
-                //manageDebug(true);
-            }
-
             // Set the gateway up
             _kiwi.gateway = new _kiwi.model.Gateway();
             this.bindGatewayCommands(_kiwi.gateway);