Merge branch 'desktop_harry' into desktop_devin

app/assets/javascripts/rss.js

@@ -384,14 +384,12 @@ modalWindow : function(settings,callbackFn){
 		if(tempheight>maxheight)
 			tempheight=maxheight;	
 	}else{tempheight="auto";}
-
 	if(typeof tempwidth!="undefined"){
 		if(tempwidth.charAt(tempwidth.length-1)=='%')
 			tempwidth=(rgmaskWidth*parseInt(tempwidth.substr(0,tempwidth.length)))/100;
 		if(tempwidth>maxwidth)
 			tempwidth=maxwidth;
 	}else{tempwidth="auto";}
-	
 	$rss("body").append('<div class="rgmask" id="rgsheath" style="height:'+rgmaskHeight+'px"></div>');
 	$rss("#rgsheath").css({background: "#000", width: "100%", position: "fixed", top: 0, left: 0,opacity:0.5,'z-index':199});
 	$rss("body").append('<div id="rgWindow"></div>');
@@ -400,7 +398,7 @@ modalWindow : function(settings,callbackFn){
 		var rgWLeft = (rgmaskWidth-20)/2;
 		$rss("#rgWindow").css({top:rgWTop+"px", left:rgWLeft+"px"});
 	if(typeof settings.loadDiv!="undefined"){
-		dhtml = $rss("#"+settings.loadDiv).html();
+		dhtml = $rss(settings.loadDiv).html();
 		$rss("#rgWindow").html(dhtml).hide();
 		prepareWindow();
 	}
@@ -416,7 +414,7 @@ modalWindow : function(settings,callbackFn){
 		if(tempheight!="auto")
 			rgWTop = (rgmaskHeight-tempheight)/2;
 		else{
-			tempheight=$rss("#rgWindow").height();
+			tempheight=$rss("#rgWindow").height()+30;
 			if(tempheight>maxheight)
 				tempheight=maxheight;
 			rgWTop=(rgmaskHeight-tempheight)/2;
@@ -451,7 +449,7 @@ modalWindow : function(settings,callbackFn){
 					$rss("#rgWindow").animate({top:x+"px", left:y+"px","width":"50px","height":"50px"},300,function(){$rss(this).fadeOut(100).remove();$rss("#rgsheath").fadeOut(500).remove();});})
 					
 			if(typeof callbackFn=="function")
-				callbackFn.call(this,dhtml);
+				callbackFn.call(this,$rss("#rgWindow"));
 		});
 	}
 },