upgrade Uploadify to 3.1.1

fixes #8221

test plan: no user visible changes in behavior, so this is a regression
test. repeat this test plan once for s3 files and once for local
files:
  * verify file uploads on /courses/X/files and /dashboard/files
    * upload to other folders
    * upload multiple files
    * zip uploads
    * weird characters in filenames, duplicate filenames
  * verify other places we upload files like content imports and sis
    imports

Change-Id: I01b7805eb947097b250bf9be944a9347ecc4ff5e

Author: codekitchen

app/coffeescripts/bundles/full_files.coffee

@@ -1,2 +1,2 @@
-require ['full_files', 'uploadify']
+require ['full_files', 'use!uploadify']
 

app/models/attachment.rb

@@ -507,10 +507,13 @@ def ajax_upload_params(pseudonym, local_upload_url, s3_success_url, options = {}
         {'key' => sanitized_filename},
         {'acl' => 'private'},
         ['starts-with', '$Filename', ''],
-        ['starts-with', '$folder', ''],
         ['content-length-range', 1, (options[:max_size] || CONTENT_LENGTH_RANGE)]
       ]
     }
+    if res[:upload_params]['folder'].present?
+      policy['conditions'] << ['starts-with', '$folder', '']
+    end
+
     extras = []
     if options[:no_redirect]
       extras << {'success_action_status' => '201'}
@@ -538,7 +541,6 @@ def ajax_upload_params(pseudonym, local_upload_url, s3_success_url, options = {}
     res[:id] = id
     res[:upload_params].merge!({
        'Filename' => '',
-       'folder' => '',
        'key' => sanitized_filename,
        'acl' => 'private',
        'Policy' => policy_encoded,

app/views/layouts/facebook.html.erb

@@ -28,7 +28,7 @@
       paths: {
         common: 'compiled/bundles/common',
         jqueryui: 'vendor/jqueryui',
-        uploadify: '../flash/uploadify/jquery.uploadify.v2.1.4'
+        uploadify: '../flash/uploadify/jquery.uploadify-3.1.min'
       }
     };
   </script>

lib/canvas/require_js.rb

@@ -50,8 +50,8 @@ def paths
         @paths ||= {
           :common => 'compiled/bundles/common',
           :jqueryui => 'vendor/jqueryui',
-          :uploadify => '../flash/uploadify/jquery.uploadify.v2.1.4',
           :use => 'vendor/use',
+          :uploadify => '../flash/uploadify/jquery.uploadify-3.1.min'
         }.update(plugin_paths).to_json.gsub(/([,{])/, "\\1\n    ")
       end
 
@@ -95,10 +95,15 @@ def shims
             'vendor/slickgrid/plugins/slick.rowselectionmodel': {
               deps: ['use!vendor/slickgrid/slick.core'],
               attach: 'Slick'
+            },
+
+            'uploadify' : {
+              deps: ['jquery'],
+              attach: '$'
             }
           }
         JS
       end
     end
   end
-end
+end