Partial fix for #1225. Change the dialog and panel handling to look a…

…t the mime type returned to determine the content type.
gallery · Jul 24, 2010 · b1cd0b7 · b1cd0b7
1 parent 9534a1c
commit b1cd0b7
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 19 deletions.
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
@@ -27,19 +27,42 @@
 
        $("#g-dialog").gallery_show_loading();
 
-       $.getJSON(sHref, function(data) {
-         $("#g-dialog").html(unescape(data.form)).gallery_show_loading();
+       $.ajax({
+         url: sHref,
+         type: "GET",
+         beforeSend: function(xhr) {
+           // Until we convert to jquery 1.4, we need to save the
+           // XMLHttpRequest object
+           this.xhrData = xhr;
+         },
+         success: function(data, textStatus, xhr) {
+           // Pre jquery 1.4, get the saved XMLHttpRequest object
+           if (xhr == undefined) {
+             xhr = this.xhrData;
+           }
+           var mimeType = /^(\w+\/\w+)\;?/.exec(xhr.getResponseHeader("Content-Type"));
+
+           var content = "";
+           if (mimeType[1] == "application/json") {
+             data = JSON.parse(data);
+             content = unescape(data.form);
+           } else {
+             content = data;
+           }
 
-         if ($("#g-dialog form").length) {
-           self.form_loaded(null, $("#g-dialog form"));
-         }
-         self._layout();
+           $("#g-dialog").html(content).gallery_show_loading();
 
-         $("#g-dialog").dialog("open");
-         self._set_title();
+           if ($("#g-dialog form").length) {
+             self.form_loaded(null, $("#g-dialog form"));
+           }
+           self._layout();
+
+           $("#g-dialog").dialog("open");
+           self._set_title();
 
-         if ($("#g-dialog form").length) {
-           self._ajaxify_dialog();
+           if ($("#g-dialog form").length) {
+             self._ajaxify_dialog();
+           }
          }
        });
        $("#g-dialog").dialog("option", "self", self);
@@ -108,7 +131,7 @@
          },
          success: function(data) {
            if (data.form) {
-             var formData = unescape(data.form);
+             var formData = unescape(data.content);
              $("#g-dialog form").replaceWith(formData);
              $("#g-dialog").dialog("option", "position", "center");
              $("#g-dialog form :submit").removeClass("ui-state-disabled")

diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
@@ -31,15 +31,37 @@
 	 if (should_open) {
 	   $(parent).after(ePanel);
 	   $("#g-panel td").html(sHref);
-	   $.getJSON(sHref, function(data) {
-	     $("#g-panel td").html(unescape(data.form));
-	     self._ajaxify_panel();
-	     if ($(element).attr("open_text")) {
-	       $(element).attr("orig_text", $(element).children(".g-button-text").text());
-	       $(element).children(".g-button-text").text($(element).attr("open_text"));
+	   $.ajax({
+             url: sHref,
+             type: "GET",
+             beforeSend: function(xhr) {
+               // Until we convert to jquery 1.4, we need to save the
+               // XMLHttpRequest object
+               this.xhrData = xhr;
+             },
+             success: function(data, textStatus, xhr) {
+	       // Pre jquery 1.4, get the saved XMLHttpRequest object
+               if (xhr == undefined) {
+                 xhr = this.xhrData;
+               }
+               var mimeType = /^(\w+\/\w+)\;?/.exec(xhr.getResponseHeader("Content-Type"));
+               var content = "";
+               if (mimeType[1] == "application/json") {
+                 data = JSON.parse(data);
+                 content = unescape(data.form);
+               } else {
+                 content = data;
+               }
+
+	       $("#g-panel td").html(content);
+	       self._ajaxify_panel();
+	       if ($(element).attr("open_text")) {
+	         $(element).attr("orig_text", $(element).children(".g-button-text").text());
+	         $(element).children(".g-button-text").text($(element).attr("open_text"));
+	       }
+	       $("#g-panel").addClass(parentClass).show().slideDown("slow");
 	     }
-	     $("#g-panel").addClass(parentClass).show().slideDown("slow");
-	   });
+           });
 	 }
 
          return false;