Merge pull request #612 from greezybacon/issue/thread-image-float

Preserve inline image floating in ticket thread Reviewed-By: Peter Rotich <peter@osticket.com>
osTicket · Feb 27, 2014 · d67c8dc · d67c8dc
2 parents 12da45f + 498f0e2
commit d67c8dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/js/osticket.js b/js/osticket.js
@@ -136,7 +136,8 @@ showImagesInline = function(urls, thread_id) {
             e = $(el);
         if (info) {
             // Add a hover effect with the filename
-            var timeout, caption = $('<div class="image-hover">');
+            var timeout, caption = $('<div class="image-hover">')
+                .css({'float':e.css('float')});
             e.wrap(caption).parent()
                 .hover(
                     function() {

diff --git a/scp/js/ticket.js b/scp/js/ticket.js
@@ -430,7 +430,8 @@ showImagesInline = function(urls, thread_id) {
             e = $(el);
         if (info) {
             // Add a hover effect with the filename
-            var timeout, caption = $('<div class="image-hover">');
+            var timeout, caption = $('<div class="image-hover">')
+                .css({'float',e.css('float')});
             e.wrap(caption).parent()
                 .hover(
                     function() {