From b07b4759c4f48d24343a53e1b2ca85e2d39811d2 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 5 Nov 2011 12:50:19 +0100 Subject: added if (nh < 1) { var nh = 0; } to start album upper border not as nh = -n --- lib/gallery.common.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/gallery.common.js b/lib/gallery.common.js index 697a33cb..b499a2cd 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -33,6 +33,7 @@ var elh = $(el).height(); var ph = $(this).height(); var nh = (ph - elh) / 2; + if (nh < 1) { var nh = 0; } $(el).css('margin-top', nh); }); }; -- cgit v1.2.3 From 67f689646b9e12db300d34017f2dbf97676978f4 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 17 Dec 2011 19:17:00 -0800 Subject: Follow-on fix for #1790 - the last fix broke rearranging for everything *but* IE9. Oops! --- modules/organize/views/organize_frame.html.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/organize/views/organize_frame.html.php b/modules/organize/views/organize_frame.html.php index 47828944..20a1a6da 100644 --- a/modules/organize/views/organize_frame.html.php +++ b/modules/organize/views/organize_frame.html.php @@ -129,12 +129,14 @@ var get_id_from_node = function(node) { var id = node.getAttribute("rel"); - if (!id) { - // IE9 has a bug which causes it to be unable to read the "rel" attr - // so hack it by extracting the id the CSS class id. This is fragile. - // ref: https://sourceforge.net/apps/trac/gallery/ticket/1790 - return node.getAttribute("id").replace("thumb-", ""); + if (id) { + return id; } + + // IE9 has a bug which causes it to be unable to read the "rel" attr + // so hack it by extracting the id the CSS class id. This is fragile. + // ref: https://sourceforge.net/apps/trac/gallery/ticket/1790 + return node.getAttribute("id").replace("thumb-", ""); } /* -- cgit v1.2.3 From 25019ad8263708acf8ec888b2d351387cde5fb1f Mon Sep 17 00:00:00 2001 From: Automatic Build Number Updater Date: Sat, 17 Dec 2011 20:19:14 -0700 Subject: Automated update of .build_number to 184 for branch master Last update: 2d911974d751334f4c6ca1bc3b0f3f98e220436e (1 commits ago) --- .build_number | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_number b/.build_number index d41d4003..9e19b6ba 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=183 +build_number=184 -- cgit v1.2.3 From 2725d30c341c722e3ec52a2922a3c6cdcace2bf7 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 23 Dec 2011 11:22:43 -0800 Subject: Use Albums_Controller::get_display_context as the default display context. Fixes #1812. --- modules/gallery/helpers/item.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php index 0bb45e49..a0654a88 100644 --- a/modules/gallery/helpers/item.php +++ b/modules/gallery/helpers/item.php @@ -418,6 +418,9 @@ class item_Core { $args = Cache::instance()->get("display_context_" . $sid = Session::instance()->id()); $callback = $args[0]; $args[0] = $item; + if (!$callback) { + $callback = "Albums_Controller::get_display_context"; + } return call_user_func_array($callback, $args); } } \ No newline at end of file -- cgit v1.2.3 From 3a3b154b317814dcbd4ea0c1641b64e386cf85a9 Mon Sep 17 00:00:00 2001 From: Automatic Build Number Updater Date: Sun, 25 Dec 2011 17:50:43 -0700 Subject: Automated update of .build_number to 185 for branch master Last update: 2d911974d751334f4c6ca1bc3b0f3f98e220436e (4 commits ago) --- .build_number | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_number b/.build_number index 9e19b6ba..420d11e7 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=184 +build_number=185 -- cgit v1.2.3