Merge commit '61313cc6ae09a2'

annasob · Nov 27, 2010 · f9138c8 · f9138c8
2 parents d14ac75 + 61313cc
commit f9138c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/demos/semantic_video/xml/webMadeMovies.xml b/demos/semantic_video/xml/webMadeMovies.xml
@@ -316,8 +316,8 @@
       </subtitles>
     </subtitles>
     <webpages>
-      <webpage in="00:04:00:08" out="00:04:19:00" target="iframes" resourceid="monahomepage" width="100%" height="100%"></webpage>
-      <webpage in="00:04:19:06" out="00:04:24:01" target="iframes" resourceid="celinehomepage" width="100%" height="100%"></webpage>
+      <webpage in="00:04:00:08" out="00:04:19:00" target="iframes" resourceid="monahomepage" />
+      <webpage in="00:04:19:06" out="00:04:24:01" target="iframes" resourceid="celinehomepage" />
     </webpages>
     <script in="4:45:00" start="displayCredits" stop="removeCredits"/>
   </timeline>

diff --git a/popcorn.js b/popcorn.js
@@ -761,9 +761,8 @@
     // Setup a default, iframe to hold the website
     var target = document.createElement('iframe');
     target.setAttribute('src', this.params.src);
-    target.setAttribute('width', this.params.width);
-    target.setAttribute('height', this.params.height);
-    target.setAttribute('id', this.id);
+    target.setAttribute('width', "100%");
+    target.setAttribute('height', "100%");
     document.getElementById(this.params.target).appendChild(target);
     // iframe is hidden by default
     target.setAttribute('style', 'display:none');