From: <jon...@us...> - 2009-10-11 16:03:08
|
Revision: 22213 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22213&view=rev Author: jonnybradley Date: 2009-10-11 16:02:56 +0000 (Sun, 11 Oct 2009) Log Message: ----------- [FIX] No need for rel to have type=img for colorbox (type= only needed if not an image) Modified Paths: -------------- trunk/lib/jquery_tiki/tiki-jquery.js trunk/lib/wiki-plugins/wikiplugin_img.php Modified: trunk/lib/jquery_tiki/tiki-jquery.js =================================================================== --- trunk/lib/jquery_tiki/tiki-jquery.js 2009-10-11 15:46:15 UTC (rev 22212) +++ trunk/lib/jquery_tiki/tiki-jquery.js 2009-10-11 16:02:56 UTC (rev 22213) @@ -239,8 +239,8 @@ return $(this).attr('href'); } }); - // rel containg type=img - $jq("a[rel*='box'][rel*='type=img']").colorbox({ + // rel containg type=img or no type= + $jq("a[rel*='box'][rel*='type=img'],a[rel*='box'][rel!='type=']").colorbox({ photo: true }); // rel containg type=flash @@ -302,7 +302,7 @@ re = /(box\[([^\]]*)\])/i; ret = $jq(this).attr("rel").match(re); return ret[2]; - } + }; $jq("a[rel*='box\[']").attr("rev",colorboxgroups); Modified: trunk/lib/wiki-plugins/wikiplugin_img.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_img.php 2009-10-11 15:46:15 UTC (rev 22212) +++ trunk/lib/wiki-plugins/wikiplugin_img.php 2009-10-11 16:02:56 UTC (rev 22213) @@ -685,7 +685,7 @@ // rel if (!empty($imgdata['rel'])) { if ($imgdata['rel'] == 'box') { - $linkrel = " rel=\"box[gallery];type=img;width=$fwidth;height=$fheight;"; + $linkrel = " rel=\"box;width=$fwidth;height=$fheight;"; if (!empty($desconly)) { $linkrel .= "title=$desconly\""; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |