google_calendar_onebox.rb in onebox-1.7.4

- old
+ new
@@ -6,20 +6,24 @@
       matches_regexp /^(https?:)?\/\/((www|calendar)\.google\.[\w.]{2,}|goo\.gl)\/calendar\/.+$/
       always_https
 
       def to_html
         url = @url.split('&').first
-        "<iframe src='#{url}&rm=minimal' style='border: 0' width='800' height='600' frameborder='0' scrolling='no'>#{placeholder_html}</iframe>"
+        escaped_src = ::Onebox::Helpers.normalize_url_for_output(url)
+        "<iframe src='#{src}&rm=minimal' style='border: 0' width='800' height='600' frameborder='0' scrolling='no'>#{placeholder_html}</iframe>"
       end
 
       def placeholder_html
-        <<HTML
-<div placeholder><div class='gdocs-onebox gdocs-onebox-splash' style='display:table-cell;vertical-align:middle;width:800px;height:600px'>
-<div style='text-align:center;'>
-<div class='gdocs-onebox-logo g-calendar-logo'></div>
-<p>Google Calendar</p>
-</div></div></div>
-HTML
+        <<-HTML
+          <div placeholder>
+            <div class='gdocs-onebox gdocs-onebox-splash' style='display:table-cell;vertical-align:middle;width:800px;height:600px'>
+              <div style='text-align:center;'>
+                <div class='gdocs-onebox-logo g-calendar-logo'></div>
+                <p>Google Calendar</p>
+              </div>
+            </div>
+          </div>
+        HTML
       end
     end
   end
-end
\ No newline at end of file
+end