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
df5dd1a4
Commit
df5dd1a4
authored
Jan 14, 2015
by
David Baumgold
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6385 from ataki/ataki/gridfs-hotfix
Fix visual bug with large file error msg in cms.
parents
36813c02
2b18f321
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
0 deletions
+19
-0
cms/static/js/spec/views/assets_spec.js
+15
-0
cms/static/js/views/assets.js
+4
-0
No files found.
cms/static/js/spec/views/assets_spec.js
View file @
df5dd1a4
...
...
@@ -169,6 +169,21 @@ define([ "jquery", "js/common_helpers/ajax_helpers", "js/views/asset", "js/views
expect
(
assetsView
.
largeFileErrorMsg
).
toBeNull
();
});
it
(
'hides the error modal if a large file, then small file is uploaded'
,
function
()
{
expect
(
assetsView
).
toBeDefined
();
mockFileUpload
.
files
[
0
].
size
=
assetsView
.
maxFileSize
;
$
(
'.choose-file-button'
).
click
();
$
(
".upload-modal .file-chooser"
).
fileupload
(
'add'
,
mockFileUpload
);
expect
(
assetsView
.
largeFileErrorMsg
).
toBeDefined
();
mockFileUpload
.
files
[
0
].
size
=
assetsView
.
maxFileSize
/
10
;
$
(
'.choose-file-button'
).
click
();
$
(
".upload-modal .file-chooser"
).
fileupload
(
'add'
,
mockFileUpload
);
expect
(
assetsView
.
largeFileErrorMsg
).
toBeNull
();
});
});
});
});
cms/static/js/views/assets.js
View file @
df5dd1a4
...
...
@@ -135,6 +135,7 @@ define(["jquery", "underscore", "gettext", "js/models/asset", "js/views/paging",
event
.
preventDefault
();
self
.
resetUploadModal
();
ModalUtils
.
showModal
();
$
(
'.modal-cover'
).
on
(
'click'
,
self
.
hideModal
);
$
(
'.file-input'
).
bind
(
'change'
,
self
.
startUpload
);
$
(
'.upload-modal .file-chooser'
).
fileupload
({
dataType
:
'json'
,
...
...
@@ -182,6 +183,9 @@ define(["jquery", "underscore", "gettext", "js/models/asset", "js/views/paging",
showFileSelectionMenu
:
function
(
event
)
{
event
.
preventDefault
();
if
(
assetsView
.
largeFileErrorMsg
)
{
assetsView
.
largeFileErrorMsg
.
hide
();
}
$
(
'.file-input'
).
click
();
},
...
...
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