Commit 5b182de7 authored by Thomas Marrinan's avatar Thomas Marrinan

added preliminary support for psd images - layers appear not to work


Former-commit-id: 49e0416d1872185b7255b39af8c35fcae21d062d
parent 826835ea
{
"host": "131.193.76.128",
"host": "marrinan.evl.uic.edu",
"port": 9090,
"index_port": 9292,
"clock": 12,
......
......@@ -35,6 +35,7 @@ function appLoader(publicDir, hostOrigin, displayWidth, displayHeight, titleBarH
"image/jpeg": "image_viewer",
"image/png": "image_viewer",
"image/tiff": "image_viewer",
"image/vnd.adobe.photoshop": "image_viewer",
"video/mp4": "movie_player",
"video/youtube": "movie_player",
"application/pdf": "pdf_viewer",
......@@ -239,7 +240,7 @@ appLoader.prototype.loadImageFromFile = function(file, mime_type, url, external_
gm(buffer).size(function (err, size) {
if(err) throw err;
_this.loadImageFromDataBuffer(buffer, size.width, size.height, mime_type, url, external_url, name, function(appInstance) {
_this.loadImageFromDataBuffer(buffer, size.width, size.height, "image/png", url, external_url, name, function(appInstance) {
callback(appInstance);
});
});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment