diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-07 12:37:25 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-07 12:37:25 -0700 |
| commit | 63ddac5d018af3933ac820672de530c34074319e (patch) | |
| tree | 6e1f0f5413290d26d1c4c3e6bb0504ff53803b6d /themes/default/js/ui.init.js | |
| parent | c09e2ef7af5411f239ba7f1adb01be39b2950b84 (diff) | |
| parent | e4eec71efa5f7b1902155a34f8655cebe523c358 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch
Conflicts:
themes/default/js/ui.init.js
Diffstat (limited to 'themes/default/js/ui.init.js')
| -rw-r--r-- | themes/default/js/ui.init.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js index 8fee6634..f86c8df4 100644 --- a/themes/default/js/ui.init.js +++ b/themes/default/js/ui.init.js @@ -1,3 +1,4 @@ +# /** * Initialize jQuery UI and Plugin elements * @@ -29,11 +30,11 @@ $(document).ready(function() { $("#gSiteMenu").css("display", "block"); // Initialize status message effects - $("#gMessage li").showMessage(); + $("#gMessage li").gallery_show_message(); // Initialize dialogs $("#gLoginLink").addClass("gDialogLink"); - $(".gDialogLink").bind("click", handleDialogEvent); + $(".gDialogLink").gallery_dialog(); // Initialize view menu if ($("#gViewMenu").length) { @@ -52,7 +53,10 @@ $(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").gallery_valign(); + }); } // Photo/Item item view only |