From ef0af6e9d5240467308ec4cd5bf740830ea30b06 Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Wed, 17 Sep 2014 18:51:26 +0500
Subject: [PATCH] Fixed full screen functionality for image module in
 HTMLModule. TNL-265

---
 common/lib/xmodule/xmodule/js/src/html/display.coffee | 2 ++
 common/lib/xmodule/xmodule/js/src/html/imageModal.js  | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/html/display.coffee b/common/lib/xmodule/xmodule/js/src/html/display.coffee
index c34919dc40..194ef4b70c 100644
--- a/common/lib/xmodule/xmodule/js/src/html/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/html/display.coffee
@@ -6,6 +6,8 @@ class @HTMLModule
     Collapsible.setCollapsibles(@el)
     if MathJax?
 	    MathJax.Hub.Queue ["Typeset", MathJax.Hub, @el[0]]
+    if setupFullScreenModal?
+      setupFullScreenModal()
 
   $: (selector) ->
     $(selector, @el)
diff --git a/common/lib/xmodule/xmodule/js/src/html/imageModal.js b/common/lib/xmodule/xmodule/js/src/html/imageModal.js
index 19953eae03..0cc4fdb688 100644
--- a/common/lib/xmodule/xmodule/js/src/html/imageModal.js
+++ b/common/lib/xmodule/xmodule/js/src/html/imageModal.js
@@ -1,6 +1,7 @@
-$(function() {
+var setupFullScreenModal = function() {
   
-  // Set up on page load
+  // Setup full screen image modal.
+  // Executed from HTMLModule in display.js.
   $("a.modal-content").each(function() {
     var smallImageObject = $(this).children();
     var largeImageSRC = $(this).attr('href');
@@ -106,4 +107,4 @@ $(function() {
       $(".wrapper-modal-image .image-content .image-controls .modal-ui-icon").toggleClass('is-disabled');
     }
   });
-});
\ No newline at end of file
+};