fixed saberma#398, homepage should not show secure warning(ie6).

tobi · Jan 31, 2012 · 37ae55f · 37ae55f
1 parent 1f143d3
commit 37ae55f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 48 deletions.
diff --git a/app/assets/javascripts/shopqi_application.js.coffee b/app/assets/javascripts/shopqi_application.js.coffee
@@ -2,7 +2,7 @@
 #=require jquery_ujs
 #=require backbone_js
 #=require plugins
-#=require jquery.fancybox-1.3.4.pack
+#=require jquery.fancybox-1.3.4
 #=require jquery.quicksand
 #=require backbone/shopqi
 #=require utils/utils

diff --git a/...sets/javascripts/jquery.fancybox-1.3.4.js → .../javascripts/jquery.fancybox-1.3.4.js.erb b/...sets/javascripts/jquery.fancybox-1.3.4.js → .../javascripts/jquery.fancybox-1.3.4.js.erb
@@ -1090,7 +1090,7 @@
 			loading.addClass('fancybox-ie6');
 			wrap.addClass('fancybox-ie6');
 
-			$('<iframe id="fancybox-hide-sel-frame" src="' + (/^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank' ) + '" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(outer);
+                        $('<iframe id="fancybox-hide-sel-frame" src="<%= asset_path 'fancybox/blank.gif' %>" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(outer);
 		}
 	};
 

diff --git a/vendor/assets/javascripts/jquery.fancybox-1.3.4.pack.js b/vendor/assets/javascripts/jquery.fancybox-1.3.4.pack.js