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

Drop remaining coffee use

Browse Source 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
This commit is contained in:
Michael Terry
2018-03-23 15:30:20 -04:00
committed by Michael Terry
parent 2abbd1eb83
commit a34c8c8233
107 changed files with 3346 additions and 2502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/xsslint/tests/templates/test.coffee
View File

@@ -1,2 +0,0 @@
var x = "<string>" + message + "</strong>"
var template = "<%= invalid %>"

2
scripts/xsslint/tests/test_main.py
View File

@@ -77,8 +77,6 @@ class TestXSSLinter(TestCase):
output = self.out.getvalue()
# Assert violation details are displayed.
self.assertIsNotNone(re.search('test\.html.*{}'.format(self.ruleset.mako_missing_default.rule_id), output))
self.assertIsNotNone(re.search('test\.coffee.*{}'.format(self.ruleset.javascript_concat_html.rule_id), output))
self.assertIsNotNone(re.search('test\.coffee.*{}'.format(self.ruleset.underscore_not_escaped.rule_id), output))
self.assertIsNotNone(re.search('test\.js.*{}'.format(self.ruleset.javascript_concat_html.rule_id), output))
self.assertIsNotNone(re.search('test\.js.*{}'.format(self.ruleset.underscore_not_escaped.rule_id), output))
lines_with_rule = 0

4
scripts/xsslint/xsslint/default_config.py
View File

@@ -24,12 +24,10 @@ UNDERSCORE_LINTER = UnderscoreTemplateLinter(
)
JAVASCRIPT_SKIP_DIRS = SKIP_DIRS + ('i18n', 'static/coffee')
COFFEESCRIPT_SKIP_DIRS = SKIP_DIRS
JAVASCRIPT_SKIP_DIRS = SKIP_DIRS + ('i18n',)
JAVASCRIPT_LINTER = JavaScriptLinter(
underscore_linter=UNDERSCORE_LINTER,
javascript_skip_dirs=JAVASCRIPT_SKIP_DIRS,
coffeescript_skip_dirs=COFFEESCRIPT_SKIP_DIRS
)

7
scripts/xsslint/xsslint/linters.py
View File

@@ -309,7 +309,7 @@ class UnderscoreTemplateLinter(BaseLinter):
class JavaScriptLinter(BaseLinter):
"""
The linter for JavaScript and CoffeeScript files.
The linter for JavaScript files.
"""
LINE_COMMENT_DELIM = "//"
@@ -325,7 +325,7 @@ class JavaScriptLinter(BaseLinter):
javascript_interpolate='javascript-interpolate',
)
def __init__(self, underscore_linter, javascript_skip_dirs=None, coffeescript_skip_dirs=None):
def __init__(self, underscore_linter, javascript_skip_dirs=None):
"""
Init method.
"""
@@ -333,7 +333,6 @@ class JavaScriptLinter(BaseLinter):
self.underscore_linter = underscore_linter
self.ruleset = self.ruleset + self.underscore_linter.ruleset
self._skip_javascript_dirs = javascript_skip_dirs or ()
self._skip_coffeescript_dirs = coffeescript_skip_dirs or ()
def process_file(self, directory, file_name):
"""
@@ -356,8 +355,6 @@ class JavaScriptLinter(BaseLinter):
if file_name.lower().endswith('.js') and not file_name.lower().endswith('.min.js'):
skip_dirs = self._skip_javascript_dirs
elif file_name.lower().endswith('.coffee'):
skip_dirs = self._skip_coffeescript_dirs
else:
return results

4
scripts/xsslint_config.py
View File

@@ -32,12 +32,10 @@ UNDERSCORE_LINTER = UnderscoreTemplateLinter(
)
JAVASCRIPT_SKIP_DIRS = SKIP_DIRS + ('i18n', 'static/coffee')
COFFEESCRIPT_SKIP_DIRS = SKIP_DIRS
JAVASCRIPT_SKIP_DIRS = SKIP_DIRS + ('i18n',)
JAVASCRIPT_LINTER = JavaScriptLinter(
underscore_linter=UNDERSCORE_LINTER,
javascript_skip_dirs=JAVASCRIPT_SKIP_DIRS,
coffeescript_skip_dirs=COFFEESCRIPT_SKIP_DIRS
)