From 8c3fb43bf5b032a341d6fde29d283e5f8941d07b Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 19 Jul 2013 16:22:33 +0800
Subject: [PATCH] theater view fixed in IE

---
 .../app/assets/images/gallery/ajax-loader.gif | Bin 0 -> 2115 bytes
 .../javascripts/galleryAPI_frontend.js.erb    |  37 +++++++++++++-----
 .../gallery/front_end/albums/theater.html.erb |   3 +-
 3 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 vendor/built_in_modules/gallery/app/assets/images/gallery/ajax-loader.gif

diff --git a/vendor/built_in_modules/gallery/app/assets/images/gallery/ajax-loader.gif b/vendor/built_in_modules/gallery/app/assets/images/gallery/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..de2e8b6cddd2c0f7bd20469f671acd57b882c651
GIT binary patch
literal 2115
zcmdUwYfMvT7{}ioYbg~9q83z~1rbmRq5>-7J#Ne_gt>h%W-}qv1vi6)5V!bgJG~uR
z+H>eRr#-!2>Ai(sDQ&q`aDc<0E(H8Qh%<{z+!ter`!WU^FUiif&wD?-pWgTXd;ah9
zywCIDM;{zM(!v9|U>Sgwl@;)E`Fy_9r%yk5@&txqKA)dXr(0WFi;Iiv>gpapeymg~
z&z(D0P*5;AIeGs4`BW;^+1XiNU!Rwk_vq218#iunIGjtDF3ru&5d?AZ;>FU^(x#@S
z=g*%<B9WUnZ<dslWMyTkRH_RXE)*6P&d<;5_4>Pa@A7!Oj*gB*BJuR;(}sqIP$<;c
z*oa}+^z`(zXU`N0#q#p9!{Ml^s%md<_jo*ui;J;XEH^i|xw%;?l`btUy?F7Wt*z~q
zh5zGTw6dY;>}Q{zIn{jjKvng+_f|a={kiQ-$CZ}OE0=lSUhQn<wS3+3-L>m2m#eO}
zeRUla{lUm&ub$$sxm`;l$oTks2o?xMVu=VyW!-WGDupqekSR$@q1Nbu&On*)bqvNj
zjTK|S3>T#FLVimhWp@P3dUpa%4arAFRnc1*GC3vwfe!G=e*p0H%!~}?ddh?`g-j<z
zWe79;eZes45%@?KYO(dk44PCL8=ueyCX>j_T@fwii+`aItV}jLlSSz;)&}7QD`7`7
z#hIi}!4|WF5E&80ym2BR>K`H<E)O137)%!1ux1ua-NPRItVI?c(i5-I5M^1}oSYm^
zb{5_P8FDv@H|83YSe8|?QI9#%Yy{56`xKlI#EF`)oWYzFJ`x%W459H*@<%)vip;n?
zHa{9uta?rxNVP_10Q0~6Y8?D+kk)ehy8+0!`32&Fd~P=hlk%+yyp^DU+LW&o<eSWp
zDG#$l1$ib5xydis6m(OYqwwaqX-f*)GD3}|#;H(uGBrFs7)}q&dVKc23CiYoJS4eV
zoxyo$3GKn1uJrFPZ4lqQ6NHreK7zc@l}TY7Fj17LB4yilXpkM-aD#Na1>N2Y;e~Fb
z(1&OAOESW;f|$5qP?}5$hh+{BO$*`^ep%lX9Qp}&%|hM>M)Q<yL`qHR7J)q7qo3=i
z<$wN`4@wZZq(lmXoeYIaz}N|tJhc(x=^#*KQWseP$D!i5i+ze>_pYFPS0skSmHi2E
zSm_-R1(dzxLYIC@Xi*X~kj5>$k6G_aXo1DAfk@Y@|AO@>ae`E-DUDXAHyBMA?X_yU
zYuIiUYd3+g0AOh)dZSsaqU<iW$LsUEXhn|Gh`^=HvNC2VE@1*AVCuwWCQxP-*-cKD
zV6~9_go@IJ2I7N>q?}f=@o$nMMmd*T&gelHdw>D#p){g$qp{p7;`SQ2E}_Tk55RV>
zGYsi^&2bnf)kEo9;}bGk@i)m?dn@VQ3VvlJzhZB<tZE<7>h@Kski8n6Z69e8RoFbB
z!YSf=ZTx_+GN`MJ2x0?ZFah-sg-6{({!z<7?<h=p4Ko4-rX=pqFGy*DU%qi8X4ljL
z1zKCf?jqQAD23MHgrr7e1~mq8wcJA0R@;U9UFQ8h!GS)_fe?H!N*#<tiKJpE9vK4z
z@xbk1+%e`EhD=G@Jyle950*LI%7;tzz2L1;n0*wiHc<>5Wp@dfJru?yp+ohn-1<Z0
zVT<K3dBkZxLYDb7Wn^uTs*S{Y;$8g-G~DGKQ3Sdi<8pVGamuDwkL&cZ5nMmNK>zLD
z041lu%dXvhO4Pu@RBBd(@R-_w9TOfm+PaSm`F1;Bc*1QvAv_r{o(zT!QGtIz)h}?R
zFt5NmhB^fL+X}OQxYMl>NoRo)nO~qU`xCEU_MgXunXuZhUWXQPlP;gi+vg01JW(_d
QLXxS~$#8US<h)#e0b1ZA(EtDd

literal 0
HcmV?d00001

diff --git a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
index 782a0c757..440ca6f90 100644
--- a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
+++ b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
@@ -12,11 +12,21 @@ var galleryAPI = function(){
 	this.tagList = $(".taglist ul");
 	// this.authenticated = false;
 	this.initialize = function(callbackFn){
-		$(document).ready(function(){
-			//bindHandlers();
-		})
-		var bindHandlers = function(){
-			
+		if(g.loadArea == "theater"){
+			if(rcom.getInternetExplorerVersion()!=-1){
+				var photo_id = window.location.hash.replace("#","");
+				var params = rcom.getUrlVars();
+				var url = window.location.href.split("?")[0];
+				params["id"] = photo_id;
+				for(i=0;i<params.length;i++){
+    				if(i == 0)
+    					url+="?"+params[i]+"="+params[params[i]];
+    				else
+    					url+="&"+params[i]+"="+params[params[i]];
+
+				}
+				window.location.href = url;
+			}
 		}
 	}
 	
@@ -198,9 +208,13 @@ var galleryAPI = function(){
 
 				$img.fadeOut(200,function(){
 					if($rslide.hasClass("fullscreen"))
-						$img.attr({"src":dom.attr("data-content")}).css("height","100%");
+						$img.attr({"src":dom.attr("data-content")}).css("height","100%").load(function(){
+
+						});
 					else
-						$img.attr({"src":dom.attr("data-content")}).css("height","auto");
+						$img.attr({"src":dom.attr("data-content")}).css("height","auto").load(function(){
+
+						});
 					$img.fadeIn(200);
 	 				if($rslide.hasClass("fullscreen")){
 	 					$img.css({"padding":($rslide.height()-$img.height())/2})
@@ -254,7 +268,8 @@ var galleryAPI = function(){
 				bindHandlers();
 			})
 		}
-		if(rcom.getInternetExplorerVersion()!=-1){
+		var url_constructor = function(){
+			if(rcom.getInternetExplorerVersion()!=-1){
 		 	var url_constructor = window.location.href.split("/");
 			var url = "";
 			for(x=0;x<=url_constructor.length-1;x++){
@@ -264,10 +279,12 @@ var galleryAPI = function(){
 			   		url+=url_constructor[x]+"/";
 			   	}
 			 }
-			 
-			 window.location.href = url;
+			 return url;
+			 // window.location.href = url;
+			}
 		}
 		
+		
 		var albumid = $("#main_pic").attr("data-content");
 		g.albumArea.css("margin-bottom","0");
 		// picHeight = $(window).height() - ($("#orbit-bar").outerHeight() + $("#orbit_gallery .form-actions").outerHeight());
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb
index dc1a38f6e..e1f64b6a8 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb
@@ -56,8 +56,9 @@
 <script type="text/javascript">
   galleryAPI.prototype.locale = "<%= I18n.locale %>";
     	var gallery = new galleryAPI();
+      gallery.loadArea = "theater";
     	gallery.initialize();
-    	gallery.loadArea = "theater";
+    	
     	gallery.loadTheater("<%= params[:id] %>");
 </script>