Skip to content

E
edx-platform
Commit 95f4ef5b by Rocky Duan
Options

Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 

Conflicts:
	lms/static/coffee/src/discussion.coffee
parents 6d159a0b 68e1aff0
Showing with 3 additions and 2 deletions
common/static/js/vendor/jquery-ui-1.8.16.custom.min.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
common/static/js/vendor/jquery-ui.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
lms/envs/common.py
...@@ -306,7 +306,7 @@ PIPELINE_CSS = { ...@@ -306,7 +306,7 @@ PIPELINE_CSS = {
'output_filename': 'css/lms-application.css', 'output_filename': 'css/lms-application.css',
}, },
'course': { 'course': {
'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/jquery-ui-1.8.16.custom.css', 'css/vendor/jquery.qtip.min.css'], 'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css'],
'output_filename': 'css/lms-course.css', 'output_filename': 'css/lms-course.css',
}, },
'ie-fixes': { 'ie-fixes': {
......
lms/static/coffee/src/discussion.coffee
...@@ -439,8 +439,9 @@ Discussion = ...@@ -439,8 +439,9 @@ Discussion =
autocomplete: autocomplete:
remoteDataType: 'json' remoteDataType: 'json'
interactive: true interactive: true
defaultText: "add a tag" defaultText: "Tag your post"
height: "30px" height: "30px"
width: "85%"
removeWithBackspace: true removeWithBackspace: true
$local(".discussion-submit-post").click -> $local(".discussion-submit-post").click ->
handleSubmitNewPost(this) handleSubmitNewPost(this)
......
lms/static/js/jquery-ui.min.js deleted 100755 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
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