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 /lib/gallery.dialog.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 'lib/gallery.dialog.js')
| -rw-r--r-- | lib/gallery.dialog.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index 04ab44de..51ebb21a 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -16,10 +16,10 @@ } $("#gDialog").dialog(self.options); - $("#gDialog").showLoading(); + $("#gDialog").gallery_show_loading(); $.get(sHref, function(data) { - $("#gDialog").html(data).showLoading(); + $("#gDialog").html(data).gallery_show_loading(); if ($("#gDialog form").length) { self._trigger("form_loaded", null, $("#gDialog form")); |