Skip to content

E
edx-platform
Commit 9dc5cdde by Prem Sichanugrist
Options

Move vendored js files into js/vendor/

parent 07aae06d
Showing with 17 additions and 17 deletions
cms/static/coffee/files.json
{ {
"js_files": [ "js_files": [
"/static/js/jquery.min.js", "/static/js/vendor/jquery.min.js",
"/static/js/json2.js", "/static/js/vendor/json2.js",
"/static/js/underscore-min.js", "/static/js/vendor/underscore-min.js",
"/static/js/backbone-min.js" "/static/js/vendor/backbone-min.js"
] ]
} }
cms/templates/base.html
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
% else: % else:
<link rel="stylesheet" href="${ STATIC_URL }/css/base-style.css"> <link rel="stylesheet" href="${ STATIC_URL }/css/base-style.css">
% endif % endif
<link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/markitup/skins/simple/style.css" /> <link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/vendor/markitup/skins/simple/style.css" />
<link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/markitup/sets/wiki/style.css" /> <link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/vendor/markitup/sets/wiki/style.css" />
<title><%block name="title"></%block></title> <title><%block name="title"></%block></title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
</head> </head>
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<%block name="content"></%block> <%block name="content"></%block>
<script type="text/javascript" src="${ STATIC_URL}/js/jquery.min.js"></script> <script type="text/javascript" src="${ STATIC_URL}/js/vendor/jquery.min.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/json2.js"></script> <script type="text/javascript" src="${ STATIC_URL}/js/vendor/json2.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/underscore-min.js"></script> <script type="text/javascript" src="${ STATIC_URL}/js/vendor/underscore-min.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/backbone-min.js"></script> <script type="text/javascript" src="${ STATIC_URL}/js/vendor/backbone-min.js"></script>
<script type="text/javascript" src="${ STATIC_URL }/js/markitup/jquery.markitup.js"></script> <script type="text/javascript" src="${ STATIC_URL }/js/vendor/markitup/jquery.markitup.js"></script>
<script type="text/javascript" src="${ STATIC_URL }/js/markitup/sets/wiki/set.js"></script> <script type="text/javascript" src="${ STATIC_URL }/js/vendor/markitup/sets/wiki/set.js"></script>
% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<%static:js group='main'/> <%static:js group='main'/>
% else: % else:
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
% endif % endif
<%static:js group='module-js'/> <%static:js group='module-js'/>
<script src="${ STATIC_URL }/js/jquery.inlineedit.js"></script> <script src="${ STATIC_URL }/js/vendor/jquery.inlineedit.js"></script>
<script src="${ STATIC_URL }/js/jquery.cookie.js"></script> <script src="${ STATIC_URL }/js/vendor/jquery.cookie.js"></script>
<script src="${ STATIC_URL }/js/jquery.leanModal.min.js"></script> <script src="${ STATIC_URL }/js/vendor/jquery.leanModal.min.js"></script>
<script src="${ STATIC_URL }/js/jquery.tablednd.js"></script> <script src="${ STATIC_URL }/js/vendor/jquery.tablednd.js"></script>
</body> </body>
</html> </html>
......
cms/templates/jasmine/base.html
...@@ -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