summaryrefslogtreecommitdiff
path: root/modules/organize/js/organize_init.js
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-08-07 12:37:25 -0700
committerBharat Mediratta <bharat@menalto.com>2009-08-07 12:37:25 -0700
commit63ddac5d018af3933ac820672de530c34074319e (patch)
tree6e1f0f5413290d26d1c4c3e6bb0504ff53803b6d /modules/organize/js/organize_init.js
parentc09e2ef7af5411f239ba7f1adb01be39b2950b84 (diff)
parente4eec71efa5f7b1902155a34f8655cebe523c358 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch
Conflicts: themes/default/js/ui.init.js
Diffstat (limited to 'modules/organize/js/organize_init.js')
-rw-r--r--modules/organize/js/organize_init.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
index ed036fdb..30bc78dd 100644
--- a/modules/organize/js/organize_init.js
+++ b/modules/organize/js/organize_init.js
@@ -17,7 +17,7 @@ $("document").ready(function() {
zIndex: 75
});
- //showLoading("#gDialog");
+ //$.gallery_show_loading("#gDialog");
$.get(href, function(data) {
$("#gDialog").html(data);