summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-08-13 15:44:28 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-08-13 15:44:28 -0400
commitc8bb59f269159f52bb794b2aafdc65673af36f9e (patch)
treeda275376d0319917a46a7ffcd04649b1351b0392
parent807606569bffad00ae62fe695b75e1292d74aec5 (diff)
parent5e2a18fe3c9940cf1e0a94d9e3c932c2ef6cee24 (diff)
Merge branch 'master' of /pichat/repo
-rw-r--r--static/js/fullscreen.js2
-rw-r--r--template/fullscreen.st4
2 files changed, 3 insertions, 3 deletions
diff --git a/static/js/fullscreen.js b/static/js/fullscreen.js
index 78ef904..2de2d76 100644
--- a/static/js/fullscreen.js
+++ b/static/js/fullscreen.js
@@ -17,7 +17,7 @@ function scanMessagesForImages(messages){
}
function displayImage(){
- $("#big-image").attr("src", this.src)
+ $("#big-image").html('<img src="'+this.src+'">')
}
function refresh() {
diff --git a/template/fullscreen.st b/template/fullscreen.st
index ccda851..906cbe6 100644
--- a/template/fullscreen.st
+++ b/template/fullscreen.st
@@ -6,11 +6,11 @@
<style>
html, body, div, img { margin: 0; padding: 0; border: 0; overflow: hidden; }
#controls { display: none; }
-#big-image { width: 100%; height: 100%; }
+#big-image img { width: 100%; height: 100%; }
</style>
</head>
<body>
-<img id="big-image"></img>
+<div id="big-image"></div>
<div id="controls"></div>
<script>
Timestamp = $timestamp$;