safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'webp' of git://github.com/flangelo/guacamole-client into check-webp-support

Browse Source 
Conflicts:
	guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java
	guacamole/src/main/webapp/app/client/services/guacImage.js
	guacamole/src/main/webapp/app/client/types/ManagedClient.js
This commit is contained in:
Michael Jumper
2015-09-20 17:24:42 -07:00
parent dc1fb9deaa 1544a43ea3
commit b890ab17f3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
guacamole/src/main/webapp/app/client/services/guacImage.js
View File

@@ -55,7 +55,12 @@ angular.module('client').factory('guacImage', ['$injector', function guacImage($
*/
'image/png' :
'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX///+nxBvI'
+ 'AAAACklEQVQI12NgAAAAAgAB4iG8MwAAAABJRU5ErkJggg=='
+ 'AAAACklEQVQI12NgAAAAAgAB4iG8MwAAAABJRU5ErkJggg==',
/**
* Test WebP image, encoded as base64.
*/
'image/webp' : 'UklGRhoAAABXRUJQVlA4TA0AAAAvAAAAEAcQERGIiP4HAA=='
};