packages: jquery-thickbox/jquery-thickbox.spec, jquery-thickbox/no-doctype....

[glen]

Author: glen                         Date: Wed Sep 30 13:08:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- skip doctype crashing je6 patch

---- Files affected:
packages/jquery-thickbox:
   jquery-thickbox.spec (1.3 -> 1.4) , no-doctype.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/jquery-thickbox/jquery-thickbox.spec
diff -u packages/jquery-thickbox/jquery-thickbox.spec:1.3 packages/jquery-thickbox/jquery-thickbox.spec:1.4
--- packages/jquery-thickbox/jquery-thickbox.spec:1.3	Thu Sep 24 17:51:41 2009
+++ packages/jquery-thickbox/jquery-thickbox.spec	Wed Sep 30 15:08:46 2009
@@ -2,17 +2,18 @@
 Summary:	ThickBox
 Name:		jquery-thickbox
 Version:	3.1
-Release:	1
+Release:	2
 License:	MIT / GPL
 Group:		Applications/WWW
-Source0:	http://jquery.com/demo/thickbox/thickbox-code/thickbox-compressed.js
-# Source0-md5:	62ecf3e9b248f69a043ca7653866b146
+Source0:	http://jquery.com/demo/thickbox/thickbox-code/thickbox.js
+# Source0-md5:	1ef1a46c2b1b984cdc3332eb74bad1d5
 Source1:	http://jquery.com/demo/thickbox/thickbox-code/thickbox.css
 # Source1-md5:	9b2903ebee6d54b3e63ba927ea5dd498
 Source2:	http://jquery.com/demo/thickbox/images/loadingAnimation.gif
 # Source2-md5:	c33734a1bf58bec328ffa27872e96ae1
 URL:		http://jquery.com/demo/thickbox/
 Patch0:		no-global-css.patch
+Patch1:		no-doctype.patch
 BuildRequires:	rpmbuild(macros) > 1.268
 BuildRequires:	yuicompressor
 Requires:	jquery
@@ -34,10 +35,11 @@
 
 %prep
 %setup -qcT
-cp -a %{SOURCE0} thickbox.js
+cp -a %{SOURCE0} .
 cp -a %{SOURCE1} .
 cp -a %{SOURCE2} .
 %patch0 -p1
+%patch1 -p0
 
 # apache1/apache2 conf
 cat > apache.conf <<'EOF'
@@ -108,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/09/30 13:08:46  glen
+- skip doctype crashing je6 patch
+
 Revision 1.3  2009/09/24 15:51:41  glen
 - release 1
 

================================================================
Index: packages/jquery-thickbox/no-doctype.patch
diff -u /dev/null packages/jquery-thickbox/no-doctype.patch:1.1
--- /dev/null	Wed Sep 30 15:08:51 2009
+++ packages/jquery-thickbox/no-doctype.patch	Wed Sep 30 15:08:46 2009
@@ -0,0 +1,29 @@
+--- thickbox.js.orig	2008-10-21 22:21:05.000000000 +0300
++++ thickbox.js	2009-09-29 14:20:41.592474178 +0300
+@@ -31,7 +31,7 @@
+ function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
+ 
+ 	try {
+-		if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
++		if (!document.body.style.maxHeight && document.documentElement.clientHeight) {//if IE 6 with doctype
+ 			$("body","html").css({height: "100%", width: "100%"});
+ 			$("html").css("overflow","hidden");
+ 			if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
+@@ -270,7 +270,7 @@
+ 	$("#TB_closeWindowButton").unbind("click");
+ 	$("#TB_window").fadeOut("fast",function(){$('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();});
+ 	$("#TB_load").remove();
+-	if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
++	if (!document.body.style.maxHeight && document.documentElement.clientHeight) {//if IE 6 with doctype
+ 		$("body","html").css({height: "auto", width: "auto"});
+ 		$("html").css("overflow","");
+ 	}
+@@ -281,7 +281,7 @@
+ 
+ function tb_position() {
+ $("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'});
+-	if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6
++	if (document.documentElement && document.documentElement.clientHeight && navigator.userAgent.indexOf("MSIE 6") === -1) { // take away IE6 && quirks mode
+ 		$("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'});
+ 	}
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery-thickbox/jquery-thickbox.spec?r1=1.3&r2=1.4&f=u