GUACAMOLE-470: Add polyfill for <datalist> element (not supported by Safari).
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/3ae152fa Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/3ae152fa Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/3ae152fa Branch: refs/heads/master Commit: 3ae152fa35b07800ca5edbe42d14e869298fc252 Parents: 426a791 Author: Michael Jumper <[email protected]> Authored: Tue Jun 12 13:06:01 2018 -0700 Committer: Michael Jumper <[email protected]> Committed: Tue Jun 12 14:07:47 2018 -0700 ---------------------------------------------------------------------- guacamole/pom.xml | 8 ++++++++ guacamole/src/licenses/LICENSE | 9 +++++++++ .../bundled/datalist-polyfill-1.14.0/LICENSE | 21 ++++++++++++++++++++ guacamole/src/main/webapp/index.html | 3 ++- 4 files changed, 40 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/pom.xml ---------------------------------------------------------------------- diff --git a/guacamole/pom.xml b/guacamole/pom.xml index 0573c4c..ff662b1 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -386,6 +386,14 @@ <scope>runtime</scope> </dependency> + <!-- Polyfill for <datalist> element support --> + <dependency> + <groupId>org.webjars.bowergithub.mfranzke</groupId> + <artifactId>datalist-polyfill</artifactId> + <version>1.14.0</version> + <scope>runtime</scope> + </dependency> + <!-- Jetty 8 servlet API (websocket) --> <dependency> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/licenses/LICENSE ---------------------------------------------------------------------- diff --git a/guacamole/src/licenses/LICENSE b/guacamole/src/licenses/LICENSE index c2e6bf5..4474707 100644 --- a/guacamole/src/licenses/LICENSE +++ b/guacamole/src/licenses/LICENSE @@ -390,6 +390,15 @@ Carlito (http://code.google.com/p/chromium/issues/detail?id=280557) SIL Open Font (bundled/carlito/LICENSE) +datalist-polyfill (https://github.com/mfranzke/datalist-polyfill) +----------------------------------------------------------------- + + Version: 1.14.0 + From: 'Maximilian Franzke' (https://github.com/mfranzke) + License(s): + MIT (bundled/datalist-polyfill-1.14.0/LICENSE) + + FileSaver.js (https://github.com/eligrey/FileSaver.js) ------------------------------------------------------ http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE ---------------------------------------------------------------------- diff --git a/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE new file mode 100644 index 0000000..8864d4a --- /dev/null +++ b/guacamole/src/licenses/bundled/datalist-polyfill-1.14.0/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3ae152fa/guacamole/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html index fd5dba4..5a53d8a 100644 --- a/guacamole/src/main/webapp/index.html +++ b/guacamole/src/main/webapp/index.html @@ -71,8 +71,9 @@ <script type="text/javascript" src="webjars/angular-translate-interpolation-messageformat/2.16.0/angular-translate-interpolation-messageformat.min.js"></script> <script type="text/javascript" src="webjars/angular-translate-loader-static-files/2.16.0/angular-translate-loader-static-files.min.js"></script> - <!-- Polyfills for Blob and the FileSaver API --> + <!-- Polyfills for the "datalist" element, Blob and the FileSaver API --> <script type="text/javascript" src="webjars/blob-polyfill/1.0.20150320/Blob.js"></script> + <script type="text/javascript" src="webjars/datalist-polyfill/1.14.0/datalist-polyfill.min.js"></script> <script type="text/javascript" src="webjars/filesaver/1.3.3/FileSaver.min.js"></script> <!-- Allow arbitrary ordering of Angular module creation and retrieval -->
