Merge pull request #1375 from edx/db/requirejs-load-tender

Fix up Tender load order

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: {

cms/static/coffee/spec/main_squire.coffee

 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"

cms/static/coffee/src/main.coffee

 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')

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,

cms/templates/widgets/tender.html

 % if user.is_authenticated():
 <script type="text/javascript">
-require(['jquery'], function($) {
-  window.Tender = {
-    hideToggle: true,
-    title: '',
-    body: '',
-    hide_kb: 'true',
-    widgetToggles: $('.show-tender')
-  }
-});
+window.Tender = {
+  hideToggle: true,
+  title: '',
+  body: '',
+  hide_kb: 'true',
+  widgetToggles: document.getElementsByClassName('show-tender')
+}
+require(['tender']);
 </script>
-<script src="https://edxedge.tenderapp.com/tender_widget.js" type="text/javascript"></script>
 % endif