Fix uglifyjs conflict

environments/ppa-mbqj77/deployments/794^2
Xavier Guimard 6 years ago
parent 238e6092bc
commit 1652603d39
  1. 11
      Makefile
  2. 2
      lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js
  3. 3
      lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js
  4. 2
      lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js.map
  5. 2
      lemonldap-ng-manager/site/htdocs/static/js/manager.js
  6. 2
      lemonldap-ng-manager/site/htdocs/static/js/manager.min.js
  7. 2
      lemonldap-ng-manager/site/htdocs/static/js/sessions.js
  8. 3
      lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js
  9. 2
      lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js.map
  10. 2
      lemonldap-ng-manager/site/htdocs/static/js/viewer.js
  11. 3
      lemonldap-ng-manager/site/htdocs/static/js/viewer.min.js
  12. 2
      lemonldap-ng-manager/site/htdocs/static/js/viewer.min.js.map
  13. 2
      lemonldap-ng-portal/site/htdocs/static/common/js/redirect.js

@ -34,6 +34,7 @@ UNCOMPRESS=tar xzf
LISTCOMPRESSED=tar tzf
COMPRESSSUFFIX=tar.gz
NGINX=/usr/sbin/nginx
UGLIFYJSVERSION:=$(shell uglifyjs --version|perl -pe 's/^[^\d]*(\d).*$$/$$1/')
# Default directories install
# ---------------------------
@ -308,9 +309,17 @@ $(SRCMANAGERDIR)/site/htdocs/static/js/%.js: $(SRCMANAGERDIR)/site/coffee/%.coff
@echo "Compressing $*.css"
@yui-compressor $*.css > $*.min.css
xx:
echo $(UGLIFYJSVERSION)
echo $(UGLIFYJSVERSION)
%.min.js: %.js
@echo "Compressing $*.js"
@uglifyjs $*.js --compress --mangle --comments='/Copyr/i' --source-map $*.min.js.map -o $*.min.js
if test "$(UGLIFYJSVERSION)" = 2; then \
uglifyjs $*.js --compress --mangle --comments='/Copyr/i' --source-map $*.min.js.map -o $*.min.js; \
else \
uglifyjs $*.js --compress --mangle --comments='/Copyr/i' --source-map -o $*.min.js; \
fi
fastcgi-server/man/llng-fastcgi-server.1p: fastcgi-server/sbin/llng-fastcgi-server
@echo Update FastCGI server man page

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.12.8
/*
* 2ndFA Session explorer

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.12.8
/*
LemonLDAP::NG Manager client

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.12.8
/*
* Sessions explorer

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.12.8
/*
LemonLDAP::NG Viewer client

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.12.8
(function() {
document.onreadystatechange = function() {
var redirect;

Loading…
Cancel
Save