diff --git a/management/univention-dojo/Makefile b/management/univention-dojo/Makefile index de7e8e2..4dd2e07 100644 --- a/management/univention-dojo/Makefile +++ b/management/univention-dojo/Makefile @@ -69,4 +69,7 @@ libs/%: %-*.tar.gz mkdir -p libs tar -C libs --no-same-owner -xzf $< if [ ! -d $@ ]; then mv $@*/ $@; fi + if echo "$<" | grep -q xstyle; then \ + patch -p0 < fix_xstyle.patch; \ + fi diff --git a/management/univention-dojo/fix_xstyle.patch b/management/univention-dojo/fix_xstyle.patch new file mode 100644 index 0000000..6c07a5a --- /dev/null +++ b/management/univention-dojo/fix_xstyle.patch @@ -0,0 +1,13 @@ +diff --git libs/xstyle/css.js libs/xstyle/css.js +index 19df55c..8e354e8 100644 +--- libs/xstyle/css.js ++++ libs/xstyle/css.js +@@ -37,7 +37,7 @@ define(["require"], function(moduleRequire){ + } + function checkForParser(){ + var parser = testElementStyle('x-parse', null, 'content'); +- if(parser && parser != 'none'){ ++ if(parser && parser != 'none' && parser != 'normal'){ + // TODO: wait for parser to load + require([eval(parser)], callback); + }else{