From 90a3fcacaf5acf79c7e345e9dc4a22fadf9a8152 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 11 Sep 2015 10:56:57 -0400
Subject: [PATCH] (js) Disable debug data if UIxDebug not enabled

Disable some Angular debugging information if SOGoUIxDebugEnabled is not
set.
---
 UI/Templates/UIxPageFrame.wox                 | 34 ++++++++-----------
 UI/WebServerResources/js/Common/Common.app.js | 10 ++++--
 .../js/Common/mdColors.app.js                 | 20 +++--------
 3 files changed, 26 insertions(+), 38 deletions(-)
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 392eed245..fc3e9475d 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -30,10 +30,6 @@
         <var:foreach list="additionalCSSFiles" item="item">
           <link type="text/css" rel="stylesheet" var:href="item"/>
         </var:foreach>
-        <var:if-ie const:lte="9">
-          <link type="text/css" rel="stylesheet" rsrc:href="iefixes.css" />
-          <script type="text/javascript" rsrc:src="XMLHttpRequest.js"><!-- space --></script>
-        </var:if-ie>
       </head>
 
       <body var:ng-app="angularModule" var:class="bodyClasses">
@@ -43,33 +39,31 @@
               <iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe>
             </div>
           </var:if>
-          <var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
-            <var:if condition="hasUserSettingsKeys">
-              <script type="text/javascript">
+          <script type="text/javascript">
+            <var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
+              <var:if condition="hasUserSettingsKeys">
                 var UserSettings =<var:string value="userSettings" const:escapeHTML="NO" />;
-              </script>
+              </var:if>
+              <var:if condition="hasUserDefaultsKeys">
+                var UserDefaults = <var:string value="userDefaults" const:escapeHTML="NO" />;
+              </var:if>
             </var:if>
-            <var:if condition="hasUserDefaultsKeys">
-              <script type="text/javascript">
-                var UserDefaults =<var:string value="userDefaults" const:escapeHTML="NO" />;
-              </script>
-            </var:if>
-          </var:if>
-          <var:if condition="isPopup" const:negate="YES">
-            <var:if condition="isUIxDebugEnabled"><!-- space --></var:if>
-          </var:if>
+          </script>
 
           <!-- MAIN CONTENT ROW -->
           <var:component-content />
-
-          <var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
-          </var:if>
           
           <!-- JAVASCRIPT IMPORTS -->
           <script type="text/javascript">
             var ApplicationBaseURL = '<var:string value="modulePath" />';
             var ResourcesURL = '<var:string value="applicationPath" />.woa/WebServerResources';
             var minimumSearchLength = <var:string value="minimumSearchLength" />;
+            <var:if condition="isUIxDebugEnabled">
+              var DebugEnabled = true;
+            </var:if>
+            <var:if condition="isUIxDebugEnabled" const:negate="YES">
+              var DebugEnabled = false;
+            </var:if>
             <var:if condition="isSuperUser">
               var IsSuperUser = true;
             </var:if>
diff --git a/UI/WebServerResources/js/Common/Common.app.js b/UI/WebServerResources/js/Common/Common.app.js
index 17d0be7e9..b9bef78b1 100644
--- a/UI/WebServerResources/js/Common/Common.app.js
+++ b/UI/WebServerResources/js/Common/Common.app.js
@@ -126,8 +126,8 @@
   /**
    * @ngInject
    */
-  configure.$inject = ['$mdThemingProvider'];
-  function configure($mdThemingProvider) {
+  configure.$inject = ['$logProvider', '$compileProvider', '$mdThemingProvider'];
+  function configure($logProvider, $compileProvider, $mdThemingProvider) {
     $mdThemingProvider.definePalette('sogo-green', {
       '50': 'eaf5e9',
       '100': 'cbe5c8',
@@ -205,6 +205,12 @@
         'hue-2': '300',
         'hue-3': '500'
       });
+
+    if (!DebugEnabled) {
+      // Disable debug data
+      $logProvider.debugEnabled(false);
+      $compileProvider.debugInfoEnabled(false);
+    }
   }
 
 })();
diff --git a/UI/WebServerResources/js/Common/mdColors.app.js b/UI/WebServerResources/js/Common/mdColors.app.js
index 422658d9c..b1f473b2f 100644
--- a/UI/WebServerResources/js/Common/mdColors.app.js
+++ b/UI/WebServerResources/js/Common/mdColors.app.js
@@ -26,8 +26,8 @@
   /**
    * @ngInject
    */
-  runBlock.$inject = ['$interpolate', '$document'];
-  function runBlock($interpolate, $document) {
+  runBlock.$inject = ['$interpolate', '$document', '$log'];
+  function runBlock($interpolate, $document, $log) {
 
     function buildCssSelectors(selectors) {
       var result = selectors.join('');
@@ -72,6 +72,8 @@
         addRule(fgHue, bgHue, themeName, paletteName, _$mdThemingProvider._PALETTES[color.name][color.hues['hue-3'] ], 'hue-3');
         addRule(fgHue, bgHue, themeName, paletteName, _$mdThemingProvider._PALETTES[color.name][color.hues['hue-1'] ], 'hue-1');
       });
+
+      //$log.debug(_.pluck(customSheet.cssRules, 'cssText').join("\n"));
     });
 
     function addRule(fgInterpolate, bgInterpolate, themeName, paletteName, colorArray, hueName){
@@ -88,13 +90,6 @@
       }), index);
       index += 1;
 
-      console.debug(fgInterpolate({
-        theme: themeName,
-        palette: paletteName,
-        value: colorValue,
-        hue: hueName
-      }));
-
       // Insert background color rule
       customSheet.insertRule(bgInterpolate({
         theme: themeName,
@@ -103,13 +98,6 @@
         hue: hueName
       }), index);
       index += 1;
-
-      console.debug(bgInterpolate({
-        theme: themeName,
-        palette: paletteName,
-        value: colorValue,
-        hue: hueName
-      }));
     }
 
     function addBorderRule(bdrInterpolate, themeName, paletteName, colorArray, hueName){
