wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4

Browse source
This commit is contained in:
Thomas Tanghus 2012-06-14 18:00:45 +02:00
commit b6ee4c458b
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
View file

@ -84,7 +84,6 @@
}
title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || '';
title = title.replace(/</, "&lt;").replace(/>/, "&gt;");
if (obj.nodeName && !selectedOpts.orig) {
selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj);
@ -94,6 +93,8 @@
title = selectedOpts.orig.attr('alt');
}
title = title.replace(/</, "&lt;").replace(/>/, "&gt;");
href = selectedOpts.href || (obj.nodeName ? $(obj).attr('href') : obj.href) || null;
if ((/^(?:javascript)/i).test(href) || href == '#') {

2
apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
View file

File diff suppressed because one or more lines are too long

6
apps/gallery/templates/index.php
View file

@ -101,10 +101,8 @@ for($i = 0; $i < count($images); $i++) {
$dir_arr = explode('/', $previous_element);
if (count($images)>1) {
if (count($dir_arr)==0) {
$tl->addTile(new \OC\Pictures\TileSingle($previous_element));
} else if (count($dir_arr) && $ts->getCount() == 0){
if (count($images)>1 && count($dir_arr) > 1) {
if (count($dir_arr) && $ts->getCount() == 0){
$ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
} else {
$arr[] = $previous_element;