Attachment #7647 for bug #41224

View | Details | Raw Unified | Return to bug 41224
Collapse All | Expand All

Lines 69-72 libs/%: %-*.tar.gz Link Here

(-)a/management/univention-dojo/Makefile (+3 lines)
69	mkdir -p libs	69	mkdir -p libs
70	tar -C libs --no-same-owner -xzf $<	70	tar -C libs --no-same-owner -xzf $<
71	if [ ! -d $@ ]; then mv $@*/ $@; fi	71	if [ ! -d $@ ]; then mv $@*/ $@; fi
		72	if echo "$<" \| grep -q xstyle; then \
		73	patch -p0 < fix_xstyle.patch; \
		74	fi
72		75




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{

Return to bug 41224

Line 0 Link Here

(-)a/management/univention-dojo/fix_xstyle.patch (+13 lines)
	1	diff --git libs/xstyle/css.js libs/xstyle/css.js
	2	index 19df55c..8e354e8 100644
	3	--- libs/xstyle/css.js
	4	+++ libs/xstyle/css.js
	5	@@ -37,7 +37,7 @@ define(["require"], function(moduleRequire){
	6	}
	7	function checkForParser(){
	8	var parser = testElementStyle('x-parse', null, 'content');
	9	- if(parser && parser != 'none'){
	10	+ if(parser && parser != 'none' && parser != 'normal'){
	11	// TODO: wait for parser to load
	12	require([eval(parser)], callback);
	13	}else{