Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert cms login.html to the require_page pattern in preparation for webpack

Browse Source
This commit is contained in:
Calen Pennington
2017-12-21 15:36:40 -05:00
parent bacd4334ed
commit 58bb7167c1
6 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/static/cms/js/build.js
View File

@@ -28,7 +28,7 @@
'js/certificates/factories/certificates_page_factory',
'js/factories/index',
'js/factories/library',
'js/factories/login',
'js/pages/login',
'js/factories/manage_users',
'js/factories/outline',
'js/factories/register',

2
cms/static/js/factories/login.js
View File

@@ -1,6 +1,6 @@
define(['jquery.cookie', 'utility', 'common/js/components/utils/view_utils'], function(cookie, utility, ViewUtils) {
'use strict';
return function(homepageURL) {
return function LoginFactory(homepageURL) {
function postJSON(url, data, callback) {
$.ajax({
type: 'POST',

11
cms/static/js/pages/login.js Normal file
View File

@@ -0,0 +1,11 @@
(function(define) {
'use strict';
define(
['js/factories/login', 'common/js/utils/page_factory'],
function(LoginFactory, invokePageFactory) {
invokePageFactory('LoginFactory', LoginFactory);
}
);
}).call(this, define || RequireJS.define);

9
cms/templates/login.html
View File

@@ -54,8 +54,9 @@ from openedx.core.djangolib.js_utils import js_escaped_string
</div>
</%block>
<%block name="requirejs">
require(["js/factories/login"], function(LoginFactory) {
LoginFactory("${reverse('homepage') | n, js_escaped_string}");
});
<%block name="requirejs_page">
<%static:require_page page_name="js/pages/login" class_name="LoginFactory">
## xss-lint: disable=mako-invalid-js-filter, mako-invalid-html-filter
"${reverse('homepage') | n, js_escaped_string}"
</%static:require_page>
</%block>

10
common/test/test-theme/cms/templates/login.html
View File

@@ -1,3 +1,4 @@
<%namespace name='static' file='/static_content.html'/>
<%page expression_filter="h"/>
<%inherit file="base.html" />
@@ -51,8 +52,9 @@ from openedx.core.djangolib.js_utils import js_escaped_string
</div>
</%block>
<%block name="requirejs">
require(["js/factories/login"], function(LoginFactory) {
LoginFactory("${reverse('homepage') | n, js_escaped_string }");
});
<%block name="requirejs_page">
<%static:require_page page_name="js/pages/login" class_name="LoginFactory">
## xss-lint: disable=mako-invalid-js-filter, mako-invalid-html-filter
"${reverse('homepage') | n, js_escaped_string}"
</%static:require_page>
</%block>

10
themes/red-theme/cms/templates/login.html
View File

@@ -1,3 +1,4 @@
<%namespace name='static' file='/static_content.html'/>
<%page expression_filter="h"/>
<%inherit file="base.html" />
@@ -50,8 +51,9 @@ from django.utils.translation import ugettext as _
</div>
</%block>
<%block name="requirejs">
require(["js/factories/login"], function(LoginFactory) {
LoginFactory("${reverse('homepage')}");
});
<%block name="requirejs_page">
<%static:require_page page_name="js/pages/login" class_name="LoginFactory">
## xss-lint: disable=mako-invalid-js-filter, mako-invalid-html-filter
"${reverse('homepage') | n, js_escaped_string}"
</%static:require_page>
</%block>