diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-08-07 13:52:30 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-08-07 13:52:30 -0700 |
| commit | 10c98a3944977c9b1ac83497056c93884bac4035 (patch) | |
| tree | 8293d7af42c3ae6f4099551b40c06a6643683f06 /themes/default/js | |
| parent | 49d46e4010e428b9df97a6e7c5e55708d1c674a8 (diff) | |
| parent | e4eec71efa5f7b1902155a34f8655cebe523c358 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Conflicts:
lib/gallery.common.js
lib/gallery.dialog.js
modules/organize/js/organize.js
modules/organize/js/organize_init.js
Diffstat (limited to 'themes/default/js')
| -rw-r--r-- | themes/default/js/ui.init.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js index 4b876c66..b8ad68db 100644 --- a/themes/default/js/ui.init.js +++ b/themes/default/js/ui.init.js @@ -29,7 +29,7 @@ $(document).ready(function() { $("#gSiteMenu").css("display", "block"); // Initialize status message effects - $("#gMessage li").showMessage(); + $("#gMessage li").gallery_show_message(); // Initialize dialogs $(".gMenuLink").addClass("gDialogLink"); @@ -53,9 +53,9 @@ $(document).ready(function() { // Album view only if ($("#gAlbumGrid").length) { // Vertical align thumbnails/metadata in album grid - $(".gItem").vAlign(); + $(".gItem").gallery_valign(); $(".gQuick").ajaxStop(function(){ - $(".gItem").vAlign(); + $(".gItem").gallery_valign(); }); } |