Merge pull request #3292 from dannon/backport_upload_fn_escape

[16.07] Upload file escaping backport.

client/galaxy/scripts/mvc/upload/composite/composite-row.js

@@ -157,7 +157,7 @@ return Backbone.View.extend({
 
     // render
     render: function() {
-        this.$('#file_name').html(this.model.get('file_name') || '-');
+        this.$('#file_name').html(_.escape(this.model.get('file_name') || '-'));
         this.$('#file_desc').html(this.model.get('file_desc') || 'Unavailable');
         this.$('#file_size').html(Utils.bytesToString (this.model.get('file_size')));
         this.$('#status').removeClass().addClass(this.status_classes.init);

client/galaxy/scripts/mvc/upload/default/default-row.js

@@ -150,7 +150,7 @@ return Backbone.View.extend({
         var file_mode   = this.model.get('file_mode');
 
         // update title
-        this.$('#title').html(file_name);
+        this.$('#title').html(_.escape(file_name));
 
         // update info
         this.$('#size').html(Utils.bytesToString (file_size));

static/maps/mvc/upload/default/default-row.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-row.js","sources":["../../../../src/mvc/upload/default/default-row.js"],"names":["define","Utils","UploadModel","UploadSettings","Popover","Select","Backbone","View","extend","status_classes","init","queued","running","success","error","settings","select_genome","select_extension","initialize","app","options","this","self","model","setElement","_template","title","container","$","placement","default_genome","value","css","onchange","genome","set","data","list_genomes","default_extension","extension","list_extensions","on","_removeRow","e","showExtensionInfo","$el","target","text","preventDefault","_showSettings","val","length","_refreshPercentage","_refreshStatus","_refreshInfo","_refreshGenome","_refreshExtension","_refreshFileSize","remove","collection","render","file_name","get","file_size","file_mode","html","bytesToString","removeClass","addClass","width","top","height","show","prototype","apply","info","hide","percentage","parseInt","status","enabled","attr","enable","disable","count","visible","empty","append","id"],"mappings":"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"}
+{"version":3,"file":"default-row.js","sources":["../../../../src/mvc/upload/default/default-row.js"],"names":["define","Utils","UploadModel","UploadSettings","Popover","Select","Backbone","View","extend","status_classes","init","queued","running","success","error","settings","select_genome","select_extension","initialize","app","options","this","self","model","setElement","_template","title","container","$","placement","default_genome","value","css","onchange","genome","set","data","list_genomes","default_extension","extension","list_extensions","on","_removeRow","e","showExtensionInfo","$el","target","text","preventDefault","_showSettings","val","length","_refreshPercentage","_refreshStatus","_refreshInfo","_refreshGenome","_refreshExtension","_refreshFileSize","remove","collection","render","file_name","get","file_size","file_mode","html","_","escape","bytesToString","removeClass","addClass","width","top","height","show","prototype","apply","info","hide","percentage","parseInt","status","enabled","attr","enable","disable","count","visible","empty","append","id"],"mappings":"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"}