wycats / merb-plugins fork watch download tarball
public
Description: Merb Plugins: Even more modules to hook up your Merb installation
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-plugins.git 
Fix some issues breaking Safari
Yehuda Katz (author)
Sun Jul 06 13:46:49 -0700 2008
commit  732fb1006cbaec5e07d94449fe88105bc8ce9f23
tree    2442afeb0baea8d95ce568f20ec12957ad8a985f
parent  22badf2ccdb34b070a876c8d607d0558b51bf46c
0
merb_screw_unit/app/views/layout/merb_screw_unit.html.erb 
...
8
9
10
11
 
12
13
14
...
19
20
21
22
 
23
24
25
26
27
28
29
30
31
32
 
33
34
35
 
...
8
9
10
 
11
12
13
14
...
19
20
21
 
22
23
24
25
26
27
28
 
 
 
 
29
30
31
32
 
0
@@ -8,7 +8,7 @@
0
   </head>
0
   <body>
0
     <iframe id="dom" src="<%= @spec_url %>?<%= MD5.hexdigest(Time.now.to_s) %>" style="display: none"></iframe>  
0
-    <script>          
0
+    <script type="text/javascript">
0
       Screw.Unit(function() {
0
         iframeWindow = $("#dom").contents()[0].defaultView;
0
         iframeWindow.XMLHttpRequest = Screw.XHR;
0
@@ -19,17 +19,14 @@
0
               queries[i].run();
0
             }
0
           }
0
-        };          
0
+        };
0
         
0
         before(function() {          
0
           $ = iframeWindow.$;
0
           $.ajaxSettings.async = false;
0
           $.fn.fireEvent = function(event) {
0
             runLivequeries();
0
-            this.trigger(event);
0
-            this.each(function() {
0
-              if($(this).is(":submit")) $(this).parents("form:first").submit();
0
-            });
0
+           	this.trigger(event);
0
             return this;
0
           };
0
         })
0
merb_screw_unit/public/javascripts/screw.builder.js 
...
74
75
76
77
 
78
79
80
 
...
74
75
76
 
77
78
79
80
 
0
@@ -74,7 +74,7 @@ var Screw = (function($) {
0
       .appendTo('body');
0
 
0
     $(screw).dequeue();
0
-    $("#dom").contents()[0].defaultView.onload = function() {
0
+    $("#dom")[0].onload = function() {
0
       setTimeout(function() {
0
         $(screw).trigger('loaded');
0
       }, 200);

Comments

  • fujin Sun Jul 06 16:06:00 -0700 2008

    Hey dude, does this work ok on FF/IE?

  • atmos Sun Jul 06 17:24:24 -0700 2008

    fujin, it works under FF/Safari here. Don’t have IE to test.