LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Disable debug data if UIxDebug not enabled 

Disable some Angular debugging information if SOGoUIxDebugEnabled is not
set.
pull/105/head
Francis Lachapelle 2015-09-11 10:56:57 -04:00
parent 45ac6845a5
commit 90a3fcacaf
3 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
UI/Templates/UIxPageFrame.wox
View File

@ -30,10 +30,6 @@
<var:foreach list="additionalCSSFiles" item="item"> <var:foreach list="additionalCSSFiles" item="item">
<link type="text/css" rel="stylesheet" var:href="item"/> <link type="text/css" rel="stylesheet" var:href="item"/>
</var:foreach> </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> </head>
<body var:ng-app="angularModule" var:class="bodyClasses"> <body var:ng-app="angularModule" var:class="bodyClasses">
@ -43,33 +39,31 @@
<iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe> <iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe>
</div> </div>
</var:if> </var:if>
<var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES"> <script type="text/javascript">
<var:if condition="hasUserSettingsKeys"> <var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
<script type="text/javascript"> <var:if condition="hasUserSettingsKeys">
var UserSettings =<var:string value="userSettings" const:escapeHTML="NO" />; 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>
<var:if condition="hasUserDefaultsKeys"> </script>
<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>
<!-- MAIN CONTENT ROW --> <!-- MAIN CONTENT ROW -->
<var:component-content /> <var:component-content />
<var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
</var:if>
<!-- JAVASCRIPT IMPORTS --> <!-- JAVASCRIPT IMPORTS -->
<script type="text/javascript"> <script type="text/javascript">
var ApplicationBaseURL = '<var:string value="modulePath" />'; var ApplicationBaseURL = '<var:string value="modulePath" />';
var ResourcesURL = '<var:string value="applicationPath" />.woa/WebServerResources'; var ResourcesURL = '<var:string value="applicationPath" />.woa/WebServerResources';
var minimumSearchLength = <var:string value="minimumSearchLength" />; 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:if condition="isSuperUser">
var IsSuperUser = true; var IsSuperUser = true;
</var:if> </var:if>

10
UI/WebServerResources/js/Common/Common.app.js
View File

@ -126,8 +126,8 @@
/** /**
* @ngInject * @ngInject
*/ */
configure.$inject = ['$mdThemingProvider']; configure.$inject = ['$logProvider', '$compileProvider', '$mdThemingProvider'];
function configure($mdThemingProvider) { function configure($logProvider, $compileProvider, $mdThemingProvider) {
$mdThemingProvider.definePalette('sogo-green', { $mdThemingProvider.definePalette('sogo-green', {
'50': 'eaf5e9', '50': 'eaf5e9',
'100': 'cbe5c8', '100': 'cbe5c8',
@ -205,6 +205,12 @@
'hue-2': '300', 'hue-2': '300',
'hue-3': '500' 'hue-3': '500'
}); });
if (!DebugEnabled) {
// Disable debug data
$logProvider.debugEnabled(false);
$compileProvider.debugInfoEnabled(false);
}
} }
})(); })();

20
UI/WebServerResources/js/Common/mdColors.app.js
View File

@ -26,8 +26,8 @@
/** /**
* @ngInject * @ngInject
*/ */
runBlock.$inject = ['$interpolate', '$document']; runBlock.$inject = ['$interpolate', '$document', '$log'];
function runBlock($interpolate, $document) { function runBlock($interpolate, $document, $log) {
function buildCssSelectors(selectors) { function buildCssSelectors(selectors) {
var result = selectors.join(''); 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-3'] ], 'hue-3');
addRule(fgHue, bgHue, themeName, paletteName, _$mdThemingProvider._PALETTES[color.name][color.hues['hue-1'] ], 'hue-1'); 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){ function addRule(fgInterpolate, bgInterpolate, themeName, paletteName, colorArray, hueName){
@ -88,13 +90,6 @@
}), index); }), index);
index += 1; index += 1;
console.debug(fgInterpolate({
theme: themeName,
palette: paletteName,
value: colorValue,
hue: hueName
}));
// Insert background color rule // Insert background color rule
customSheet.insertRule(bgInterpolate({ customSheet.insertRule(bgInterpolate({
theme: themeName, theme: themeName,
@ -103,13 +98,6 @@
hue: hueName hue: hueName
}), index); }), index);
index += 1; index += 1;
console.debug(bgInterpolate({
theme: themeName,
palette: paletteName,
value: colorValue,
hue: hueName
}));
} }
function addBorderRule(bdrInterpolate, themeName, paletteName, colorArray, hueName){ function addBorderRule(bdrInterpolate, themeName, paletteName, colorArray, hueName){