Author: glen Date: Mon Jun 7 10:55:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- move loadingAnimation.gif definition to .css, so it be relative to css file;
rel 10
---- Files affected:
packages/jquery-thickbox:
animation-url.patch (1.2 -> 1.3) , jquery-thickbox.spec (1.17 -> 1.18) ,
translation.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/jquery-thickbox/animation-url.patch
diff -u packages/jquery-thickbox/animation-url.patch:1.2
packages/jquery-thickbox/animation-url.patch:1.3
--- packages/jquery-thickbox/animation-url.patch:1.2 Fri Jun 4 16:29:39 2010
+++ packages/jquery-thickbox/animation-url.patch Mon Jun 7 12:55:02 2010
@@ -1,11 +1,39 @@
---- jquery-thickbox/thickbox.js~ 2008-10-21 22:21:05.000000000 +0300
-+++ jquery-thickbox/thickbox.js 2009-09-30 16:09:40.886477061 +0300
-@@ -5,7 +5,7 @@
+--- jquery-thickbox-3.1/thickbox.css 2010-06-07 13:47:37.540648952 +0300
++++ thickbox/thickbox.css 2010-06-07 13:46:40.297138036 +0300
+@@ -36,6 +36,7 @@
+ height:100%;
+ width:100%;
+ }
++#TB_LoadingAnimation {background: url(loadingAnimation.gif); width: 208px;
height: 13px;}
+
+ .TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
+ .TB_overlayBG {
+--- jquery-thickbox-3.1/thickbox.js~ 2010-06-07 13:52:32.533999937 +0300
++++ jquery-thickbox-3.1/thickbox.js 2010-06-07 13:52:41.353764470 +0300
+@@ -4,8 +4,6 @@
+ * Copyright (c) 2007 cody lindley
* Licensed under the MIT License:
http://www.opensource.org/licenses/mit-license.php
*/
-
+-
-var tb_pathToImage = "images/loadingAnimation.gif";
-+var tb_pathToImage = "loadingAnimation.gif";
/*!!!!!!!!!!!!!!!!! edit below this line at your own risk
!!!!!!!!!!!!!!!!!!!!!!!*/
+@@ -13,8 +12,6 @@
+ //on page load call tb_init
+ $(document).ready(function(){
+ tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to
apply thickbox
+- imgLoader = new Image();// preload image
+- imgLoader.src = tb_pathToImage;
+ });
+
+ //add thickbox to href & area elements that have a class of .thickbox
+@@ -74,7 +71,7 @@
+ }
+
+ if(caption===null){caption="";}
+- $("body").append("<div id='TB_load'><img
src='"+imgLoader.src+"' /></div>");//add loader to the page
++ $("body").append("<div id='TB_load'><div
id='TB_LoadingAnimation'> </div></div>");//add loader to the page
+ $('#TB_load').show();//show loader
+
+ var baseURL;
================================================================
Index: packages/jquery-thickbox/jquery-thickbox.spec
diff -u packages/jquery-thickbox/jquery-thickbox.spec:1.17
packages/jquery-thickbox/jquery-thickbox.spec:1.18
--- packages/jquery-thickbox/jquery-thickbox.spec:1.17 Fri Jun 4 16:46:08 2010
+++ packages/jquery-thickbox/jquery-thickbox.spec Mon Jun 7 12:55:02 2010
@@ -6,7 +6,7 @@
Summary: ThickBox
Name: jquery-thickbox
Version: 3.1
-Release: 9
+Release: 10
License: MIT / GPL
Group: Applications/WWW
Source0: http://jquery.com/demo/thickbox/thickbox-code/thickbox.js
@@ -54,7 +54,7 @@
%patch1 -p0
%patch2 -p1
%patch3 -p0
-%patch4 -p0
+%patch4 -p1
# Apache 1.3 / Apache 2.x config
cat > apache.conf <<'EOF'
@@ -73,6 +73,7 @@
%build
install -d build
+%if 0%{!?debug:1}
for js in *.js; do
yuicompressor --charset UTF-8 --type js $js -o build/$js
js -C -f build/$a
@@ -80,6 +81,9 @@
for css in *.css; do
yuicompressor --charset UTF-8 --type css $css -o build/$css
done
+%else
+cp -a *.js *.css build
+%endif
cp -a *.gif *.png build
%install
@@ -138,6 +142,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2010/06/07 10:55:02 glen
+- move loadingAnimation.gif definition to .css, so it be relative to css file;
rel 10
+
Revision 1.17 2010/06/04 14:46:08 glen
- move to jquery dir, keep backward compat; rel 9
================================================================
Index: packages/jquery-thickbox/translation.patch
diff -u packages/jquery-thickbox/translation.patch:1.3
packages/jquery-thickbox/translation.patch:1.4
--- packages/jquery-thickbox/translation.patch:1.3 Fri Jun 4 16:30:20 2010
+++ packages/jquery-thickbox/translation.patch Mon Jun 7 12:55:02 2010
@@ -1,12 +1,12 @@
---- thickbox.js~ 2010-05-05 15:24:43.823429470 +0300
-+++ thickbox.js 2010-05-05 15:27:38.426379283 +0300
-@@ -6,7 +6,8 @@
+--- jquery-thickbox-3.1/thickbox.js~ 2010-06-07 13:53:01.554992587 +0300
++++ jquery-thickbox-3.1/thickbox.js 2010-06-07 13:53:17.823953739 +0300
+@@ -5,6 +5,9 @@
+ * Licensed under the MIT License:
http://www.opensource.org/licenses/mit-license.php
*/
-
- var tb_pathToImage = "loadingAnimation.gif";
--
+
+var tb_closeButton = 'Close';
+var tb_closeMsg = 'Close';
++
/*!!!!!!!!!!!!!!!!! edit below this line at your own risk
!!!!!!!!!!!!!!!!!!!!!!!*/
//on page load call tb_init
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery-thickbox/animation-url.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery-thickbox/jquery-thickbox.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jquery-thickbox/translation.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
