Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
665f983c
Commit
665f983c
authored
Feb 24, 2016
by
cahrens
Committed by
Brian Jacobel
May 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak focus/blur functions for JQuery upgrade.
Fix incorrectly scoped selector.
parent
4ba07bf7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
25 deletions
+6
-25
cms/static/js/views/course_info_update.js
+2
-2
cms/static/js/views/experiment_group_edit.js
+2
-2
lms/static/coffee/spec/feedback_form_spec.coffee
+0
-3
lms/static/js/edxnotes/views/shim.js
+0
-17
lms/static/js/spec/student_account/login_spec.js
+2
-1
No files found.
cms/static/js/views/course_info_update.js
View file @
665f983c
...
...
@@ -10,8 +10,8 @@ define(["js/views/validation", "codemirror", "js/models/course_update",
// collection is CourseUpdateCollection
events
:
{
"click .new-update-button"
:
"onNew"
,
"click
#course-update-view
.save-button"
:
"onSave"
,
"click
#course-update-view
.cancel-button"
:
"onCancel"
,
"click .save-button"
:
"onSave"
,
"click .cancel-button"
:
"onCancel"
,
"click .post-actions > .edit-button"
:
"onEdit"
,
"click .post-actions > .delete-button"
:
"onDelete"
},
...
...
cms/static/js/views/experiment_group_edit.js
View file @
665f983c
...
...
@@ -12,8 +12,8 @@ function(BaseView, _, str, gettext, groupEditTemplate) {
events
:
{
'click .action-close'
:
'removeGroup'
,
'change .group-name'
:
'changeName'
,
'focus .group
s-fields input
'
:
'onFocus'
,
'blur .group
s-fields input
'
:
'onBlur'
'focus .group
-name
'
:
'onFocus'
,
'blur .group
-name
'
:
'onBlur'
},
className
:
function
()
{
...
...
lms/static/coffee/spec/feedback_form_spec.coffee
View file @
665f983c
...
...
@@ -8,9 +8,6 @@ describe 'FeedbackForm', ->
spyOn
(
$
,
'postWithPrefix'
).
and
.
callFake
(
url
,
data
,
callback
,
format
)
->
callback
()
it
'binds to the #feedback_button'
,
->
expect
(
$
(
'#feedback_button'
)).
toHandle
'click'
it
'post data to /send_feedback on click'
,
->
$
(
'#feedback_subject'
).
val
'Awesome!'
$
(
'#feedback_message'
).
val
'This site is really good.'
...
...
lms/static/js/edxnotes/views/shim.js
View file @
665f983c
...
...
@@ -6,23 +6,6 @@ define([
var
_t
=
Annotator
.
_t
;
/**
* We currently run JQuery 1.7.2 in Jasmine tests and LMS.
* AnnotatorJS 1.2.9. uses two calls to addBack (in the two functions
* 'isAnnotator' and 'onHighlightMouseover') which was only defined in
* JQuery 1.8.0. In LMS, it works without throwing an error because
* JQuery.UI 1.10.0 adds support to jQuery<1.8 by augmenting '$.fn' with
* that missing function. It is not the case for all Jasmine unit tests,
* so we add it here if necessary.
**/
if
(
!
$
.
fn
.
addBack
)
{
$
.
fn
.
addBack
=
function
(
selector
)
{
return
this
.
add
(
selector
===
null
?
this
.
prevObject
:
this
.
prevObject
.
filter
(
selector
)
);
};
}
/**
* The original _setupDynamicStyle uses a very expensive call to
* Util.maxZIndex(...) that sets the z-index of .annotator-adder,
* .annotator-outer, .annotator-notice, .annotator-filter. We set these
...
...
lms/static/js/spec/student_account/login_spec.js
View file @
665f983c
...
...
@@ -3,13 +3,14 @@
define
([
'jquery'
,
'underscore'
,
'sinon'
,
'common/js/spec_helpers/template_helpers'
,
'common/js/spec_helpers/ajax_helpers'
,
'js/student_account/models/LoginModel'
,
'js/student_account/views/LoginView'
,
'js/student_account/models/PasswordResetModel'
],
function
(
$
,
_
,
TemplateHelpers
,
AjaxHelpers
,
LoginModel
,
LoginView
,
PasswordResetModel
)
{
function
(
$
,
_
,
sinon
,
TemplateHelpers
,
AjaxHelpers
,
LoginModel
,
LoginView
,
PasswordResetModel
)
{
describe
(
'edx.student.account.LoginView'
,
function
()
{
var
model
=
null
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment