prevent duplicate #lean_overlay elements

cms/static/cms/js/require-config.js

@@ -24,7 +24,7 @@ require.config({
         "jquery.ui": "js/vendor/jquery-ui.min",
         "jquery.form": "js/vendor/jquery.form",
         "jquery.markitup": "js/vendor/markitup/jquery.markitup",
-        "jquery.leanModal": "js/vendor/jquery.leanModal.min",
+        "jquery.leanModal": "js/vendor/jquery.leanModal",
         "jquery.ajaxQueue": "js/vendor/jquery.ajaxQueue",
         "jquery.smoothScroll": "js/vendor/jquery.smooth-scroll.min",
         "jquery.timepicker": "js/vendor/timepicker/jquery.timepicker",

cms/static/coffee/spec/main.coffee

@@ -7,7 +7,7 @@ requirejs.config({
         "jquery.ui": "xmodule_js/common_static/js/vendor/jquery-ui.min",
         "jquery.form": "xmodule_js/common_static/js/vendor/jquery.form",
         "jquery.markitup": "xmodule_js/common_static/js/vendor/markitup/jquery.markitup",
-        "jquery.leanModal": "xmodule_js/common_static/js/vendor/jquery.leanModal.min",
+        "jquery.leanModal": "xmodule_js/common_static/js/vendor/jquery.leanModal",
         "jquery.ajaxQueue": "xmodule_js/common_static/js/vendor/jquery.ajaxQueue",
         "jquery.smoothScroll": "xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min",
         "jquery.scrollTo": "xmodule_js/common_static/js/vendor/jquery.scrollTo-1.4.2-min",

cms/static/coffee/spec/main_squire.coffee

@@ -7,7 +7,7 @@ requirejs.config({
         "jquery.ui": "xmodule_js/common_static/js/vendor/jquery-ui.min",
         "jquery.form": "xmodule_js/common_static/js/vendor/jquery.form",
         "jquery.markitup": "xmodule_js/common_static/js/vendor/markitup/jquery.markitup",
-        "jquery.leanModal": "xmodule_js/common_static/js/vendor/jquery.leanModal.min",
+        "jquery.leanModal": "xmodule_js/common_static/js/vendor/jquery.leanModal",
         "jquery.smoothScroll": "xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min",
         "jquery.scrollTo": "xmodule_js/common_static/js/vendor/jquery.scrollTo-1.4.2-min",
         "jquery.timepicker": "xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker",

cms/static/js_test.yml

@@ -42,7 +42,7 @@ lib_paths:
     - xmodule_js/common_static/js/vendor/backbone.paginator.min.js
     - xmodule_js/common_static/js/vendor/backbone-relational.min.js
     - xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js
-    - xmodule_js/common_static/js/vendor/jquery.leanModal.min.js
+    - xmodule_js/common_static/js/vendor/jquery.leanModal.js
     - xmodule_js/common_static/js/vendor/jquery.ajaxQueue.js
     - xmodule_js/common_static/js/vendor/jquery.form.js
     - xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js

cms/static/js_test_squire.yml

@@ -40,7 +40,7 @@ lib_paths:
     - xmodule_js/common_static/js/vendor/backbone-associations-min.js
     - xmodule_js/common_static/js/vendor/backbone.paginator.min.js
     - xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js
-    - xmodule_js/common_static/js/vendor/jquery.leanModal.min.js
+    - xmodule_js/common_static/js/vendor/jquery.leanModal.js
     - xmodule_js/common_static/js/vendor/jquery.form.js
     - xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill.js
     - xmodule_js/common_static/js/vendor/sinon-1.17.0.js

common/lib/xmodule/xmodule/js/js_test.yml

@@ -47,7 +47,7 @@ lib_paths:
     - common_static/js/vendor/json2.js
     - common_static/js/vendor/underscore-min.js
     - common_static/js/vendor/backbone-min.js
-    - common_static/js/vendor/jquery.leanModal.min.js
+    - common_static/js/vendor/jquery.leanModal.js
     - common_static/js/vendor/CodeMirror/codemirror.js
     - common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js
     - common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js

common/static/common/js/spec/main_requirejs.js

@@ -7,7 +7,7 @@
             'jquery.flot': 'js/vendor/flot/jquery.flot.min',
             'jquery.form': 'js/vendor/jquery.form',
             'jquery.markitup': 'js/vendor/markitup/jquery.markitup',
-            'jquery.leanModal': 'js/vendor/jquery.leanModal.min',
+            'jquery.leanModal': 'js/vendor/jquery.leanModal',
             'jquery.ajaxQueue': 'js/vendor/jquery.ajaxQueue',
             'jquery.smoothScroll': 'js/vendor/jquery.smooth-scroll.min',
             'jquery.scrollTo': 'js/vendor/jquery.scrollTo-1.4.2-min',

common/static/js/vendor/jquery.leanModal.js

+// leanModal v1.1 by Ray Stone - http://finelysliced.com.au
+// Dual licensed under the MIT and GPL
+
+// Updated to prevent divs with duplicate IDs from being rendered.
+
+(function($) {
+    $.fn.extend({
+        leanModal: function(options) {
+            var defaults = {
+                top: 100,
+                overlay: 0.5,
+                closeButton: null
+            };
+
+            // Only append the overlay element if it isn't already present.
+            if ($("#lean_overlay").length == 0) {
+                var overlay = $("<div id='lean_overlay'></div>");
+                $("body").append(overlay);
+            }
+
+            options = $.extend(defaults, options);
+            return this.each(function() {
+                var o = options;
+                $(this).click(function(e) {
+                    var modal_id = $(this).attr("href");
+                    $("#lean_overlay").click(function() {
+                        close_modal(modal_id)
+                    });
+                    $(o.closeButton).click(function() {
+                        close_modal(modal_id)
+                    });
+                    var modal_height = $(modal_id).outerHeight();
+                    var modal_width = $(modal_id).outerWidth();
+                    $("#lean_overlay").css({
+                        "display": "block",
+                        opacity: 0
+                    });
+                    $("#lean_overlay").fadeTo(200, o.overlay);
+                    $(modal_id).css({
+                        "display": "block",
+                        "position": "fixed",
+                        "opacity": 0,
+                        "z-index": 11000,
+                        "left": 50 + "%",
+                        "margin-left": -(modal_width / 2) + "px",
+                        "top": o.top + "px"
+                    });
+                    $(modal_id).fadeTo(200, 1);
+                    e.preventDefault()
+                })
+            });
+
+            function close_modal(modal_id) {
+                $("#lean_overlay").fadeOut(200);
+                $(modal_id).css({
+                    "display": "none"
+                })
+            }
+        }
+    })
+})(jQuery);

common/static/js/vendor/jquery.leanModal.min.js

-// leanModal v1.1 by Ray Stone - http://finelysliced.com.au
-// Dual licensed under the MIT and GPL
-
-(function($){$.fn.extend({leanModal:function(options){var defaults={top:100,overlay:0.5,closeButton:null};var overlay=$("<div id='lean_overlay'></div>");$("body").append(overlay);options=$.extend(defaults,options);return this.each(function(){var o=options;$(this).click(function(e){var modal_id=$(this).attr("href");$("#lean_overlay").click(function(){close_modal(modal_id)});$(o.closeButton).click(function(){close_modal(modal_id)});var modal_height=$(modal_id).outerHeight();var modal_width=$(modal_id).outerWidth();
-$("#lean_overlay").css({"display":"block",opacity:0});$("#lean_overlay").fadeTo(200,o.overlay);$(modal_id).css({"display":"block","position":"fixed","opacity":0,"z-index":11000,"left":50+"%","margin-left":-(modal_width/2)+"px","top":o.top+"px"});$(modal_id).fadeTo(200,1);e.preventDefault()})});function close_modal(modal_id){$("#lean_overlay").fadeOut(200);$(modal_id).css({"display":"none"})}}})})(jQuery);

lms/static/js/spec/main.js

@@ -10,7 +10,7 @@
             'jquery.flot': 'xmodule_js/common_static/js/vendor/flot/jquery.flot.min',
             'jquery.form': 'xmodule_js/common_static/js/vendor/jquery.form',
             'jquery.markitup': 'xmodule_js/common_static/js/vendor/markitup/jquery.markitup',
-            'jquery.leanModal': 'xmodule_js/common_static/js/vendor/jquery.leanModal.min',
+            'jquery.leanModal': 'xmodule_js/common_static/js/vendor/jquery.leanModal',
             'jquery.ajaxQueue': 'xmodule_js/common_static/js/vendor/jquery.ajaxQueue',
             'jquery.smoothScroll': 'xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min',
             'jquery.scrollTo': 'xmodule_js/common_static/js/vendor/jquery.scrollTo-1.4.2-min',

lms/templates/courseware/xqa_interface.html

 <%namespace name='static' file='/static_content.html'/>
 
-<script type="text/javascript" src="${static.url('js/vendor/jquery.leanModal.min.js')}"></script>
+<script type="text/javascript" src="${static.url('js/vendor/jquery.leanModal.js')}"></script>
 <script type="text/javascript" src="${static.url('js/staff_debug_actions.js')}"></script>
 <script type="text/javascript">