diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee index 55381d82f8..4251307892 100644 --- a/cms/static/coffee/spec/main.coffee +++ b/cms/static/coffee/spec/main.coffee @@ -22,10 +22,8 @@ requirejs.config({ "underscore.string": "xmodule_js/common_static/js/vendor/underscore.string.min", "backbone": "xmodule_js/common_static/js/vendor/backbone-min", "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min", - "youtube": "//www.youtube.com/player_api?noext", "tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/tiny_mce", "jquery.tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/jquery.tinymce", - "mathjax": "https://edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full", "xmodule": "xmodule_js/src/xmodule", "utility": "xmodule_js/common_static/js/src/utility", "sinon": "xmodule_js/common_static/js/vendor/sinon-1.7.1", @@ -35,6 +33,10 @@ requirejs.config({ "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly.pkgd", "domReady": "xmodule_js/common_static/js/vendor/domReady", + "mathjax": "//edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full", + "youtube": "//www.youtube.com/player_api?noext", + "tender": "//edxedge.tenderapp.com/tender_widget" + "coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix" } shim: { diff --git a/cms/static/coffee/spec/main_squire.coffee b/cms/static/coffee/spec/main_squire.coffee index 28a3f03ce1..ee23792509 100644 --- a/cms/static/coffee/spec/main_squire.coffee +++ b/cms/static/coffee/spec/main_squire.coffee @@ -1,5 +1,5 @@ requirejs.config({ - paths: { + paths: { "gettext": "xmodule_js/common_static/js/test/i18n", "mustache": "xmodule_js/common_static/js/vendor/mustache", "codemirror": "xmodule_js/common_static/js/vendor/CodeMirror/codemirror", @@ -22,19 +22,23 @@ requirejs.config({ "underscore.string": "xmodule_js/common_static/js/vendor/underscore.string.min", "backbone": "xmodule_js/common_static/js/vendor/backbone-min", "backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min", - "youtube": "//www.youtube.com/player_api?noext", "tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/tiny_mce", "jquery.tinymce": "xmodule_js/common_static/js/vendor/tiny_mce/jquery.tinymce", - "mathjax": "https://edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full", "xmodule": "xmodule_js/src/xmodule", "utility": "xmodule_js/common_static/js/src/utility", "sinon": "xmodule_js/common_static/js/vendor/sinon-1.7.1", "squire": "xmodule_js/common_static/js/vendor/Squire", "jasmine-stealth": "xmodule_js/common_static/js/vendor/jasmine-stealth", "jasmine.async": "xmodule_js/common_static/js/vendor/jasmine.async", + "draggabilly": "xmodule_js/common_static/js/vendor/draggabilly.pkgd", + "domReady": "xmodule_js/common_static/js/vendor/domReady", + + "mathjax": "//edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full", + "youtube": "//www.youtube.com/player_api?noext", + "tender": "//edxedge.tenderapp.com/tender_widget.js" "coffee/src/ajax_prefix": "xmodule_js/common_static/coffee/src/ajax_prefix" - }, + } shim: { "gettext": { exports: "gettext" diff --git a/cms/static/coffee/src/main.coffee b/cms/static/coffee/src/main.coffee index c88b14fee4..6834960d45 100644 --- a/cms/static/coffee/src/main.coffee +++ b/cms/static/coffee/src/main.coffee @@ -1,5 +1,6 @@ define ["domReady", "jquery", "underscore.string", "backbone", "gettext", - "js/views/feedback_notification", "jquery.cookie"], + "js/views/feedback_notification", + "coffee/src/ajax_prefix", "jquery.cookie"], (domReady, $, str, Backbone, gettext, NotificationView) -> AjaxPrefix.addAjaxPrefix jQuery, -> $("meta[name='path_prefix']").attr('content') diff --git a/cms/templates/base.html b/cms/templates/base.html index 152bb40918..ff2fcf9b01 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -68,6 +68,7 @@ var require = { "draggabilly": "js/vendor/draggabilly.pkgd", // externally hosted files + "tender": "//edxedge.tenderapp.com/tender_widget", "mathjax": "//edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full", // youtube URL does not end in ".js". We add "?noext" to the path so // that require.js adds the ".js" to the query component of the URL, diff --git a/cms/templates/widgets/tender.html b/cms/templates/widgets/tender.html index eafcd75c18..19c3f5269a 100644 --- a/cms/templates/widgets/tender.html +++ b/cms/templates/widgets/tender.html @@ -1,14 +1,12 @@ % if user.is_authenticated(): - % endif