Mercurial Mercurial > tweet_live / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Leslie Carr is sick
authorRaphael Velt <raph.velt@gmail.com>
Fri, 08 Feb 2013 17:23:47 +0100
changeset 786 4f473382089e
parent 785 bbf5921b5412
child 787 8f7d8f20276a
Leslie Carr is sick
web/museo-1213-04-web-ingenierie-philosophie/config.php file | annotate | diff | comparison | revisions
web/res/metadataplayer/LdtPlayer-core.js file | annotate | diff | comparison | revisions 
--- a/web/museo-1213-04-web-ingenierie-philosophie/config.php	Wed Feb 06 14:49:35 2013 +0100
+++ b/web/museo-1213-04-web-ingenierie-philosophie/config.php	Fri Feb 08 17:23:47 2013 +0100
@@ -17,9 +17,6 @@
     <li>
         <p><b>Yannick Prié</b>, Université de Nantes.</p>
     </li>
-    <li>
-        <p><b>Leslie Carr</b>, University of Southampton, Webscience Trust.</p>
-    </li>
 </ul>
 ",
 
--- a/web/res/metadataplayer/LdtPlayer-core.js	Wed Feb 06 14:49:35 2013 +0100
+++ b/web/res/metadataplayer/LdtPlayer-core.js	Fri Feb 08 17:23:47 2013 +0100
@@ -1662,6 +1662,12 @@
     
     if (typeof this.width === "undefined") {
         this.width = this.$.width();
+    } else {
+        this.$.css("width", this.width);
+    }
+    
+    if (typeof this.height !== "undefined") {
+        this.$.css("height", this.height);
     }
     
     /* Setting this.player at the end in case it's been overriden
tweet_live