Commit 6bcc78f7 by Calen Pennington

Make lms jasmine tests mostly pass

parent 9458e539
{ {
"js_files": [ "js_files": [
"/static/js/jquery.min.js", "/static/js/vendor/jquery.min.js",
"/static/js/jquery-ui.min.js", "/static/js/vendor/jquery-ui.min.js",
"/static/js/jquery.leanModal.js", "/static/js/vendor/jquery.leanModal.min.js",
"/static/js/flot/jquery.flot.js" "/static/js/vendor/flot/jquery.flot.js"
], ],
"static_files": [ "static_files": [
"js/application.js" "js/application.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);
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
{# core files #} {# core files #}
<script src="{% static 'jasmine-latest/jasmine.js' %}"></script> <script src="{% static 'jasmine-latest/jasmine.js' %}"></script>
<script src="{% static 'jasmine-latest/jasmine-html.js' %}"></script> <script src="{% static 'jasmine-latest/jasmine-html.js' %}"></script>
<script src="{% static 'js/jasmine-jquery.js' %}"></script> <script src="{% static 'js/vendor/jasmine-jquery.js' %}"></script>
{# source files #} {# source files #}
{% for url in suite.js_files %} {% for url in suite.js_files %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment