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

2 files changed, 16 insertions, 17 deletions

diff --git a/modules/gallery/js/fullsize.js b/modules/gallery/js/fullsize.js
index 7428adb5..f95dc428 100644
--- a/modules/gallery/js/fullsize.js
+++ b/modules/gallery/js/fullsize.js
@@ -7,9 +7,9 @@ $(document).ready(function() {
     var height = $(document).height();
 
     $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
-      'style="border: none; margin: 0; padding: 0; background: #000 ' +
-      'none repeat scroll 0% 0%; position: absolute; top: 0px; left: 0px; ' +
-      'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; '  +
+      'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
+      'position: absolute; top: 0px; left: 0px; ' +
+      'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; filter: alpha(opacity=70);' +
       '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
       '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
 
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index e7f35cea..8a87ed07 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -67,22 +67,22 @@ var quick_do = function(cont, pane, img) {
       url: pane.attr("href"),
       dataType: "json",
       success: function(data) {
-	img.css("opacity", "1");
-	cont.removeClass("gLoadingLarge");
-	if (data.src) {
-	  img.attr("width", data.width);
-	  img.attr("height", data.height);
-	  img.attr("src", data.src);
-	  if (data.height > data.width) {
-	    img.css("margin-top", -32);
-	  } else {
-	    img.css("margin-top", 0);
-	  }
+        img.css("opacity", "1");
+        cont.removeClass("gLoadingLarge");
+        if (data.src) {
+          img.attr("width", data.width);
+          img.attr("height", data.height);
+          img.attr("src", data.src);
+          if (data.height > data.width) {
+            img.css("margin-top", -32);
+          } else {
+            img.css("margin-top", 0);
+          }
         } else if (data.location) {
           window.location = data.location;
-	} else if (data.reload) {
+        } else if (data.reload) {
           window.location.reload();
-	}
+        }
       }
     });
   }
@@ -92,4 +92,3 @@ var quick_do = function(cont, pane, img) {
 var hide_quick = function() {
   $("#gQuickPane").remove();
 };
-