← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/filesystem/browser/media/browser.js

  • Committer: David Coles
  • Date: 2010-07-28 07:05:06 UTC
  • mto: This revision was merged to the branch mainline in revision 1830.
  • Revision ID: coles.david@gmail.com-20100728070506-7stovzc09cthpm1g
Use "?return=contents" URL instead of '/download/' since "Content-Disposition: 
attachment" causes issues with certain embeded media (mainly SVG).

NB: The URLs generated do not support browsing revisions. See bug #610745.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/filesystem/browser/media/browser.js
563
563
    disable_save_if_safe();
564
564
 
565
565
    /* URL */
566
 
    var url = app_url(download_app, path);
 
566
    var url = app_url(service_app, path) + "?return=contents";
567
567
 
568
568
    /* Image Preview */
569
569
    var img = $("<img />");
586
586
    disable_save_if_safe();
587
587
 
588
588
    /* URL */
589
 
    var url = app_url(download_app, path);
 
589
    var url = app_url(service_app, path) + "?return=contents";
 
590
    var download_url = app_url(download_app, path);
590
591
 
591
592
    /* Fallback Download Link */
592
593
    var link = $('<p>Could not display video in browser.<p><p><a /></p>');
593
594
    var a = link.find('a');
594
 
    a.attr("href", url);
 
595
    a.attr("href", download_url);
595
596
    a.text("Download " + path);
596
597
 
597
598
    /* Fallback Object Tag */
625
626
    disable_save_if_safe();
626
627
 
627
628
    /* URL */
628
 
    var url = app_url(download_app, path);
 
629
    var url = app_url(service_app, path) + "?return=contents";
 
630
    var download_url = app_url(download_app, path);
629
631
 
630
632
    /* Fallback Download Link */
631
633
    var link = $('<p>Could not display audio in browser.<p><p><a /></p>');
632
634
    var a = link.find('a');
633
 
    a.attr("href", url);
 
635
    a.attr("href", download_url);
634
636
    a.text("Download " + path);
635
637
 
636
638
    /* Fallback Object Tag */