From 7791a7c4aa84ebd9c8eda6b8067f57dd8772a2b8 Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Thu, 4 Oct 2012 16:45:22 -0400
Subject: [PATCH] slight refactoring of the javascript

---
 cms/static/js/base.js | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 4260e2525a..36253b8691 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -233,32 +233,35 @@ function showFileSelectionMenu(e) {
 function startUpload(e) {
     $('.upload-modal h1').html('Uploading…');
     $('.upload-modal .file-name').html($('.file-input').val());
-
-    var bar = $('.upload-modal .progress-fill');
-
     $('.upload-modal .file-chooser').ajaxSubmit({
-        beforeSend: function() {
-            var percentVal = '0%';
-            bar.width(percentVal)
-            bar.html(percentVal);
-        },
-        uploadProgress: function(event, position, total, percentComplete) {
-            var percentVal = percentComplete + '%';
-            bar.width(percentVal)
-            bar.html(percentVal);
-        },
-        complete: function(xhr) {
-            if(xhr.status = 200){
-                markAsLoaded();
-            }
-            bar.html(xhr.responseText);
-            $('.upload-modal .choose-file-button').html('Load Another File').show();
-        }
+        beforeSend: resetUploadBar,
+        uploadProgress: showUploadFeedback,
+        complete: displayFinishedUpload
     });
     $('.upload-modal .choose-file-button').hide();
     $('.upload-modal .progress-bar').removeClass('loaded').show();
 }
 
+function resetUploadBar(){
+    var percentVal = '0%';
+    $('.upload-modal .progress-fill').width(percentVal)
+    $('.upload-modal .progress-fill').html(percentVal);
+}
+
+function showUploadFeedback(event, position, total, percentComplete) {
+    var percentVal = percentComplete + '%';
+    $('.upload-modal .progress-fill').width(percentVal);
+    $('.upload-modal .progress-fill').html(percentVal);
+}
+
+function displayFinishedUpload(xhr) {
+    if(xhr.status = 200){
+        markAsLoaded();
+    }
+    $('.upload-modal .progress-fill').html(xhr.responseText);
+    $('.upload-modal .choose-file-button').html('Load Another File').show();
+}
+
 function markAsLoaded() {
     $('.upload-modal .copy-button').css('display', 'inline-block');
     $('.upload-modal .progress-bar').addClass('loaded');