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

OLIVE-75 - CourseID Term not rendering correctly

Browse Source
This commit is contained in:
asadiqbal
2016-08-11 19:15:43 +05:00
parent d2788ff2f1
commit 1e938162db
3 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cms/static/js/index.js
View File

@@ -67,6 +67,23 @@ define(['domReady', 'jquery', 'underscore', 'js/utils/cancel_on_escape', 'js/vie
});
};
var rtlTextDirection = function() {
var Selectors = {
new_course_run: '#new-course-run'
};
if ($('body').hasClass('rtl')) {
$(Selectors.new_course_run).addClass('course-run-text-direction placeholder-text-direction');
$(Selectors.new_course_run).on('input', function() {
if (this.value === '') {
$(Selectors.new_course_run).addClass('placeholder-text-direction');
} else {
$(Selectors.new_course_run).removeClass('placeholder-text-direction');
}
});
}
};
var makeCancelHandler = function(addType) {
return function(e) {
e.preventDefault();
@@ -81,18 +98,22 @@ define(['domReady', 'jquery', 'underscore', 'js/utils/cancel_on_escape', 'js/vie
};
var addNewCourse = function(e) {
var $newCourse,
$cancelButton,
$courseName;
e.preventDefault();
$('.new-course-button').addClass('is-disabled').attr('aria-disabled', true);
$('.new-course-save').addClass('is-disabled').attr('aria-disabled', true);
var $newCourse = $('.wrapper-create-course').addClass('is-shown');
var $cancelButton = $newCourse.find('.new-course-cancel');
var $courseName = $('.new-course-name');
$newCourse = $('.wrapper-create-course').addClass('is-shown');
$cancelButton = $newCourse.find('.new-course-cancel');
$courseName = $('.new-course-name');
$courseName.focus().select();
$('.new-course-save').on('click', saveNewCourse);
$cancelButton.bind('click', makeCancelHandler('course'));
CancelOnEscape($cancelButton);
CreateCourseUtils.setupOrgAutocomplete();
CreateCourseUtils.configureHandlers();
rtlTextDirection();
};
var saveNewLibrary = function(e) {

10
cms/static/js/spec/views/pages/index_spec.js
View File

@@ -60,6 +60,16 @@ define(['jquery',
$('.new-course-org').autocomplete('destroy');
});
it('set the correct direction of text in case of rtl', function() {
$('body').addClass('rtl');
$('.new-course-button').click();
$('.new-course-run').val('2014_T2').trigger('input');
expect($('.new-course-run').hasClass('placeholder-text-direction')).toBe(false);
$('.new-course-run').val('').trigger('input');
expect($('.new-course-run').hasClass('placeholder-text-direction')).toBe(true);
});
it('displays an error when saving fails', function() {
var requests = AjaxHelpers.requests(this);
$('.new-course-button').click();

8
cms/static/sass/views/_dashboard.scss
View File

@@ -677,6 +677,14 @@
.new-course-run {
width: 100%;
}
.course-run-text-direction {
direction: ltr;
text-align: right;
}
.placeholder-text-direction {
direction: rtl;
}
.new-course-name {
@extend %t-title5;