summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/exif/helpers/exif_event.php8
-rw-r--r--themes/default/js/ui.init.js11
2 files changed, 17 insertions, 2 deletions
diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index 826ec959..81ac5f44 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -18,6 +18,14 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class exif_event_Core {
+ static function gallery_ready() {
+ if (!function_exists("gettext")) {
+ function gettext($message) {
+ return (string) t($message);
+ }
+ }
+ }
+
static function item_created($item) {
if (!$item->is_album()) {
exif::extract($item);
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 93dfb275..e645eb71 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -91,12 +91,19 @@ $(document).ready(function() {
},
function() {
// Reset item height, position, and z-index
- var sib_height = $(this).next().height();
+ if ($(this).next().height()) {
+ var sib_height = $(this).next().height();
+ } else {
+ var sib_height = $(this).prev().height();
+ }
+ if ($.browser.msie && $.browser.version >= 8) {
+ sib_height = sib_height + 1;
+ }
$(this).css("height", sib_height);
$(this).css("position", "relative");
$(this).css("top", null);
$(this).css("left", null);
- $(this).css("z-index", null);
+ $(this).css("z-index", 1);
// Remove the placeholder and hover class from the item
$("#gPlaceHolder").remove();
$(this).removeClass("gHoverItem");