diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-07 12:20:43 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-07 12:20:43 -0700 |
| commit | 34d4675baf5d76ee3e3e915248ce902cc3d201b1 (patch) | |
| tree | 8293d7af42c3ae6f4099551b40c06a6643683f06 /themes/admin_default/js | |
| parent | 49d46e4010e428b9df97a6e7c5e55708d1c674a8 (diff) | |
| parent | e4eec71efa5f7b1902155a34f8655cebe523c358 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_branch
Conflicts:
lib/gallery.common.js
lib/gallery.dialog.js
modules/organize/js/organize.js
modules/organize/js/organize_init.js
Diffstat (limited to 'themes/admin_default/js')
| -rw-r--r-- | themes/admin_default/js/ui.init.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js index 89dd5b47..e52f0c4c 100644 --- a/themes/admin_default/js/ui.init.js +++ b/themes/admin_default/js/ui.init.js @@ -14,7 +14,7 @@ $(document).ready(function(){ $("#gSiteAdminMenu").css("display", "block"); // Initialize status message effects - $("#gMessage li").showMessage(); + $("#gMessage li").gallery_show_message(); // Initialize modal dialogs $(".gDialogLink").gallery_dialog(); @@ -24,7 +24,7 @@ $(document).ready(function(){ if ($("#gPhotoStream").length) { // Vertically align thumbs in photostream - $(".gItem").vAlign(); + $(".gItem").gallery_valign(); } // Apply jQuery UI button css to submit inputs |