Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index f10cbcc9..31657d3a 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -391,7 +391,7 @@ function organize_dialog_init() {
   $(".gBranchText").droppable(treeDroppable);
   $(".gBranchText").click(organizeOpenFolder);
   retrieveMicroThumbs(item_id);
-  //showLoading("#gDialog");
+  //$.gallery_show_loading("#gDialog");
 
   $("#gMicroThumbPanel").droppable(thumbDroppable);
   $("#gMicroThumbPanel").selectable(selectable);
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);