Merge pull request #1113 from edx/christina/fix-asset-index

Put the non-Backboned assets JavaScript back into its own file.

cms/envs/common.py

@@ -257,6 +257,7 @@ PIPELINE_JS = {
              'js/src/utility.js',
              'js/models/settings/course_grading_policy.js',
              'js/models/asset.js', 'js/models/assets.js',
+             'js/views/assets.js',
              'js/views/assets_view.js', 'js/views/asset_view.js'],
         'output_filename': 'js/cms-application.js',
         'test_order': 0

cms/static/js/views/assets.js

+// This code is temporarily moved out of asset_index.html
+// to fix AWS pipelining issues. We can move it back after RequireJS is integrated.
+$(document).ready(function() {
+    $('.uploads .upload-button').bind('click', showUploadModal);
+    $('.upload-modal .close-button').bind('click', hideModal);
+    $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu);
+});
+
+var showUploadModal = function (e) {
+    e.preventDefault();
+    resetUploadModal();
+    // $modal has to be global for hideModal to work.
+    $modal = $('.upload-modal').show();
+    $('.file-input').bind('change', startUpload);
+    $('.upload-modal .file-chooser').fileupload({
+        dataType: 'json',
+        type: 'POST',
+        maxChunkSize: 100 * 1000 * 1000,      // 100 MB
+        autoUpload: true,
+        progressall: function(e, data) {
+            var percentComplete = parseInt((100 * data.loaded) / data.total, 10);
+            showUploadFeedback(e, percentComplete);
+        },
+        maxFileSize: 100 * 1000 * 1000,   // 100 MB
+        maxNumberofFiles: 100,
+        add: function(e, data) {
+            data.process().done(function () {
+                data.submit();
+            });
+        },
+        done: function(e, data) {
+            displayFinishedUpload(data.result);
+        }
+
+    });
+
+    $modalCover.show();
+};
+
+var showFileSelectionMenu = function(e) {
+    e.preventDefault();
+    $('.file-input').click();
+};
+
+var startUpload = function (e) {
+    var file = e.target.value;
+
+    $('.upload-modal h1').html(gettext('Uploading…'));
+    $('.upload-modal .file-name').html(file.substring(file.lastIndexOf("\\") + 1));
+    $('.upload-modal .choose-file-button').hide();
+    $('.upload-modal .progress-bar').removeClass('loaded').show();
+};
+
+var resetUploadModal = function () {
+    $('.file-input').unbind('change', startUpload);
+
+    // Reset modal so it no longer displays information about previously
+    // completed uploads.
+    var percentVal = '0%';
+    $('.upload-modal .progress-fill').width(percentVal);
+    $('.upload-modal .progress-fill').html(percentVal);
+    $('.upload-modal .progress-bar').hide();
+
+    $('.upload-modal .file-name').show();
+    $('.upload-modal .file-name').html('');
+    $('.upload-modal .choose-file-button').html(gettext('Choose File'));
+    $('.upload-modal .embeddable-xml-input').val('');
+    $('.upload-modal .embeddable').hide();
+};
+
+var showUploadFeedback = function (event, percentComplete) {
+    var percentVal = percentComplete + '%';
+    $('.upload-modal .progress-fill').width(percentVal);
+    $('.upload-modal .progress-fill').html(percentVal);
+};
+
+var displayFinishedUpload = function (resp) {
+    var asset = resp.asset;
+
+    $('.upload-modal h1').html(gettext('Upload New File'));
+    $('.upload-modal .embeddable-xml-input').val(asset.portable_url);
+    $('.upload-modal .embeddable').show();
+    $('.upload-modal .file-name').hide();
+    $('.upload-modal .progress-fill').html(resp.msg);
+    $('.upload-modal .choose-file-button').html(gettext('Load Another File')).show();
+    $('.upload-modal .progress-fill').width('100%');
+
+    // TODO remove setting on window object after RequireJS.
+    window.assetsView.addAsset(new CMS.Models.Asset(asset));
+};

cms/templates/asset_index.html

@@ -20,96 +20,8 @@
     <script type="text/javascript">
         var assets = new CMS.Models.AssetCollection(${asset_list});
         assets.url = "${update_asset_callback_url}";
-        var assetsView = new CMS.Views.Assets({collection: assets, el: $('#asset_table_body')});
-
-        $(document).ready(function() {
-            $('.uploads .upload-button').bind('click', showUploadModal);
-            $('.upload-modal .close-button').bind('click', hideModal);
-            $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu);
-        });
-
-        var showUploadModal = function (e) {
-            e.preventDefault();
-            resetUploadModal();
-            // $modal has to be global for hideModal to work.
-            $modal = $('.upload-modal').show();
-            $('.file-input').bind('change', startUpload);
-            $('.upload-modal .file-chooser').fileupload({
-                dataType: 'json',
-                type: 'POST',
-                maxChunkSize: 100 * 1000 * 1000,      // 100 MB
-                autoUpload: true,
-                progressall: function(e, data) {
-                    var percentComplete = parseInt((100 * data.loaded) / data.total, 10);
-                    showUploadFeedback(e, percentComplete);
-                },
-                maxFileSize: 100 * 1000 * 1000,   // 100 MB
-                maxNumberofFiles: 100,
-                add: function(e, data) {
-                    data.process().done(function () {
-                        data.submit();
-                    });
-                },
-                done: function(e, data) {
-                    displayFinishedUpload(data.result);
-                }
-
-            });
-
-            $modalCover.show();
-        };
-
-        var showFileSelectionMenu = function(e) {
-            e.preventDefault();
-            $('.file-input').click();
-        };
-
-        var startUpload = function (e) {
-            var file = e.target.value;
-
-            $('.upload-modal h1').html(gettext('Uploading…'));
-            $('.upload-modal .file-name').html(file.substring(file.lastIndexOf("\\") + 1));
-            $('.upload-modal .choose-file-button').hide();
-            $('.upload-modal .progress-bar').removeClass('loaded').show();
-        };
-
-        var resetUploadModal = function () {
-            $('.file-input').unbind('change', startUpload);
-
-            // Reset modal so it no longer displays information about previously
-            // completed uploads.
-            var percentVal = '0%';
-            $('.upload-modal .progress-fill').width(percentVal);
-            $('.upload-modal .progress-fill').html(percentVal);
-            $('.upload-modal .progress-bar').hide();
-
-            $('.upload-modal .file-name').show();
-            $('.upload-modal .file-name').html('');
-            $('.upload-modal .choose-file-button').html(gettext('Choose File'));
-            $('.upload-modal .embeddable-xml-input').val('');
-            $('.upload-modal .embeddable').hide();
-        };
-
-        var showUploadFeedback = function (event, percentComplete) {
-            var percentVal = percentComplete + '%';
-            $('.upload-modal .progress-fill').width(percentVal);
-            $('.upload-modal .progress-fill').html(percentVal);
-        };
-
-        var displayFinishedUpload = function (resp) {
-            var asset = resp.asset;
-
-            $('.upload-modal h1').html(gettext('Upload New File'));
-            $('.upload-modal .embeddable-xml-input').val(asset.portable_url);
-            $('.upload-modal .embeddable').show();
-            $('.upload-modal .file-name').hide();
-            $('.upload-modal .progress-fill').html(resp.msg);
-            $('.upload-modal .choose-file-button').html(gettext('Load Another File')).show();
-            $('.upload-modal .progress-fill').width('100%');
-
-            assetsView.addAsset(new CMS.Models.Asset(asset));
-        };
-
+        // TODO remove setting on window object after RequireJS.
+        window.assetsView = new CMS.Views.Assets({collection: assets, el: $('#asset_table_body')});
     </script>
 </%block>