Merge branch 'QA_4_4'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/js/pmd/move.js b/js/pmd/move.js
index 96b9c2acc2..31ad5557e2 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -26,7 +26,10 @@ AJAX.registerOnload('pmd/move.js', function () {
             if (! $.FullScreen.isFullScreen()) {
                 $('#page_content').removeClass('content_fullscreen')
                     .css({'width': 'auto', 'height': 'auto'});
-                $('#toggleFullscreen').show();
+                var $img = $('#toggleFullscreen img');
+                $img.attr('src', $img.data('enter'));
+                var $span = $img.siblings('span');
+                $span.text($span.data('enter'));
             }
         });
     } else {
@@ -520,16 +523,17 @@ function Rect(x1, y1, w, h, color)
 //--------------------------- FULLSCREEN -------------------------------------
 function Toggle_fullscreen()
 {
-    var button = $('#toggleFullscreen').children().last();
+    var $img = $('#toggleFullscreen img');
+    var $span = $img.siblings('span');
     if (! $.FullScreen.isFullScreen()) {
-        button.html(button.attr('data-exit'));
+        $img.attr('src', $img.data('exit'))
+        $span.text($span.data('exit'));
         $('#page_content')
             .addClass('content_fullscreen')
             .css({'width': screen.width - 5, 'height': screen.height - 5})
             .requestFullScreen();
     }
     if ($.FullScreen.isFullScreen()) {
-        button.html(button.attr('data-enter'));
         $.FullScreen.cancelFullScreen();
     }
 }