Browse Source

Merge branch '10.0' of https://github.com/muk-it/muk_web.git into 10.0

pull/5/head
Mathias Markl 8 years ago
parent
commit
8bf6e659ce
  1. 2
      muk_web_preview_image/static/description/index.html
  2. 4
      muk_web_preview_image/static/src/js/preview_generator.js

2
muk_web_preview_image/static/description/index.html

@ -11,7 +11,7 @@
</section>
<section class="oe_container" style="padding-top: 25px;">
<div class="oe_row oe_spaced">
<div class="oe_row oe_spaced" style="height: 550px;">
<div class="oe_picture">
<h3 class="oe_slogan">Overview</h3>
<p class="oe_mt32">Extendes the Preview Dialog to support images.

4
muk_web_preview_image/static/src/js/preview_generator.js

@ -32,7 +32,9 @@ var ImageHandler = PreviewHandler.extend({
checkExtension: function(extension) {
return ['.cod', '.ras', '.fif', '.gif', '.ief', '.jpeg', '.jpg', '.jpe', '.png', '.tiff',
'.tif', '.mcf', '.wbmp', '.fh4', '.fh5', '.fhc', '.ico', '.pnm', '.pbm', '.pgm',
'.ppm', '.rgb', '.xwd', '.xbm', '.xpm'].includes(extension);
'.ppm', '.rgb', '.xwd', '.xbm', '.xpm', 'cod', 'ras', 'fif', 'gif', 'ief', 'jpeg',
'jpg', 'jpe', 'png', 'tiff', '.tif', 'mcf', 'wbmp', 'fh4', 'fh5', 'fhc', 'ico',
'pnm', 'pbm', 'pgm', '.ppm', 'rgb', 'xwd', 'xbm', 'xpm'].includes(extension);
},
checkType: function(mimetype) {
return ['image/cis-cod', 'image/cmu-raster', 'image/fif', 'image/gif', 'image/ief', 'image/jpeg',

Loading…
Cancel
Save