[#793] webpage plugin no longer needs http://

ScottDowne · Oct 29, 2011 · 0b68d98 · 0b68d98
1 parent 9b39828
commit 0b68d98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/plugins/webpage/popcorn.webpage.html b/plugins/webpage/popcorn.webpage.html
@@ -14,7 +14,7 @@
         id: "webpages-a",
         start: 0,
         end: 5,
-        src: "http://webmademovies.org/",
+        src: "//webmademovies.org/",
         target: "webpagediv"
       })
       .webpage({

diff --git a/plugins/webpage/popcorn.webpage.js b/plugins/webpage/popcorn.webpage.js
@@ -62,6 +62,9 @@
 
       var target = document.getElementById( options.target );
 
+      // make src an iframe acceptable string
+      options.src = options.src.replace( /^(https?:)?(\/\/)?/, "//" );
+
       // make an iframe
       options._iframe = document.createElement( "iframe" );
       options._iframe.setAttribute( "width", "100%" );

diff --git a/plugins/webpage/popcorn.webpage.unit.js b/plugins/webpage/popcorn.webpage.unit.js
@@ -26,7 +26,7 @@ test( "Popcorn Webpage Plugin", function() {
     id: "webpages-a",
     start: 0,
     end: 1,
-    src: "http://webmademovies.org",
+    src: "webmademovies.org",
     target: "webpagediv"
   })
   .webpage({