Exclude conftree.js from beautification

This commit is contained in:
Xavier Guimard 2016-01-21 12:15:38 +00:00
parent 598b9ac8d8
commit 2849b4b610
3 changed files with 25 additions and 17 deletions

View File

@ -817,7 +817,15 @@ tidy: clean
find lemon*/ -name '*.bak' -delete
tidy-js: clean
find $(SRCMANAGERDIR)/site/static/js/ e2e-tests/ $(SRCPORTALDIR)/example -type f -name '*.js' ! -name 'jq*' ! -name 'bootstrap*' ! -name '*.min.js' -print -exec js_beautify -o -s=2 {} \;
find $(SRCMANAGERDIR)/site/static/js/ e2e-tests/ $(SRCPORTALDIR)/example \
-type f \
-name '*.js' \
! -name 'jq*' \
! -name 'bootstrap*' \
! -name '*.min.js' \
! -name conftree.js \
-print \
-exec js_beautify -o -s=2 {} \;
# TRANSLATION TARGETS #

View File

@ -67,15 +67,15 @@ sub run {
$mainTree = Lemonldap::NG::Manager::Build::CTrees::cTrees();
my $script = 'function templates(tpl,key) {
var ind;
var scalarTemplate = function(r) {
return {
"id": tpl+"s/"+(ind++),
"title": r,
"get": tpl+"s/"+key+"/"+r
var ind;
var scalarTemplate = function(r) {
return {
"id": tpl+"s/"+(ind++),
"title": r,
"get": tpl+"s/"+key+"/"+r
};
};
};
switch(tpl){
switch(tpl){
';
# To build confTree.js, each special node is scanned from

View File

@ -1,13 +1,13 @@
function templates(tpl,key) {
var ind;
var scalarTemplate = function(r) {
return {
"id": tpl+"s/"+(ind++),
"title": r,
"get": tpl+"s/"+key+"/"+r
var ind;
var scalarTemplate = function(r) {
return {
"id": tpl+"s/"+(ind++),
"title": r,
"get": tpl+"s/"+key+"/"+r
};
};
};
switch(tpl){
switch(tpl){
case 'oidcOPMetaDataNode':
return [
{