seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-07-12 15:28:44 -05:00
parent 0b138a3abc 63b2a30466
commit 6970edb44c
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/app/assets/javascripts/accounts_session_properties.js
View File

@ -292,17 +292,16 @@
$inputFiles.replaceWith($inputFiles.clone(true));
}
else {
}
// upload as soon as user picks their files.
uploadNotations($inputFiles.get(0).files)
.done(function() {
context._.each(fileNames, function(fileName) {
var $text = $('<span>').text(fileName);
var $file = $('<li>').append($text);
$selectedFilenames.append($file);
// upload as soon as user picks their files.
uploadNotations($inputFiles.get(0).files)
.done(function() {
context._.each(fileNames, function(fileName) {
var $text = $('<span>').text(fileName);
var $file = $('<li>').append($text);
$selectedFilenames.append($file);
})
})
})
}
}
function toggleSelectFiles(event) {

15
web/app/assets/javascripts/dialog/sessionSettingsDialog.js
View File

@ -134,15 +134,14 @@
$inputFiles.replaceWith($inputFiles.clone(true));
}
else {
}
// upload as soon as user picks their files.
uploadNotations($inputFiles.get(0).files)
.done(function() {
context._.each(fileNames, function(fileName) {
$selectedFilenames.append(fileName);
// upload as soon as user picks their files.
uploadNotations($inputFiles.get(0).files)
.done(function() {
context._.each(fileNames, function(fileName) {
$selectedFilenames.append(fileName);
})
})
})
}
}
function uploadNotations(notations) {

17
web/app/assets/javascripts/scheduled_session.js
View File

@ -989,17 +989,16 @@
$inputFiles.replaceWith($inputFiles.clone(true));
}
else {
}
// upload as soon as user picks their files.
uploadNotations($inputFiles.get(0).files)
.done(function() {
context._.each(fileNames, function(fileName) {
var $text = $('<span>').text(fileName);
var $file = $('<li>').append($text);
$selectedFilenames.append($file);
uploadNotations($inputFiles.get(0).files)
.done(function() {
context._.each(fileNames, function(fileName) {
var $text = $('<span>').text(fileName);
var $file = $('<li>').append($text);
$selectedFilenames.append($file);
})
})
})
}
}
function toggleSelectFiles(event) {