# HG changeset patch
# User hamidouk
# Date 1323092247 -3600
# Node ID 375e8af3c9cd610a15e9f0e41c9e7bc179ed3642
# Parent  e08183460e0f528fdcb494289e8be7ceb9e45132# Parent  6148fb647f464f8d103c74f459a044adde51b93a
Merge with popcorn-port

diff -r e08183460e0f -r 375e8af3c9cd src/js/init.js
--- a/src/js/init.js	Mon Dec 05 14:34:15 2011 +0100
+++ b/src/js/init.js	Mon Dec 05 14:37:27 2011 +0100
@@ -16,6 +16,13 @@
       case "html5":
            var tmpId = Popcorn.guid("video"); 
            IriSP.jQuery("#" + containerDiv).append("<video src='" + options.file + "' id='" + tmpId + "'></video>");
+
+           if (options.hasOwnProperty("width"))
+             IriSP.jQuery("#" + containerDiv).css("width", options.width);
+           
+           if (options.hasOwnProperty("height"))
+             IriSP.jQuery("#" + containerDiv).css("height", options.height);
+
            pop = Popcorn("#" + tmpId).mediafragment({start : 0});
         break;