Merge pull request #293 from pierotofy/iefix

Moved values() shim, added IE warning in dashboard
pull/299/head
Piero Toffanin 2017-09-28 17:36:27 -04:00 zatwierdzone przez GitHub
commit 751fbc1f84
3 zmienionych plików z 11 dodań i 4 usunięć

Wyświetl plik

@ -5,6 +5,11 @@ import ProcessingNodeOption from './ProcessingNodeOption';
import PresetUtils from '../classes/PresetUtils';
import PropTypes from 'prop-types';
import $ from 'jquery';
import values from 'object.values';
if (!Object.values) {
values.shim();
}
class EditPresetDialog extends React.Component {
static defaultProps = {

Wyświetl plik

@ -1,6 +1,5 @@
import '../css/EditTaskForm.scss';
import React from 'react';
import values from 'object.values';
import Utils from '../classes/Utils';
import EditPresetDialog from './EditPresetDialog';
import ErrorMessage from './ErrorMessage';
@ -8,9 +7,6 @@ import PropTypes from 'prop-types';
import Storage from '../classes/Storage';
import $ from 'jquery';
if (!Object.values) {
values.shim();
}
class EditTaskForm extends React.Component {
static defaultProps = {

Wyświetl plik

@ -5,6 +5,12 @@
{% load render_bundle from webpack_loader %}
{% render_bundle 'Dashboard' attrs='async' %}
<!--[if lte IE 8]>
<div class="alert alert-warning alert-dismissible">
WebODM cannot be used with this version of Internet Explorer. Could you please upgrade <a href="https://www.microsoft.com/en-us/download/internet-explorer.aspx">Internet Explorer</a> to the latest version or use <a href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a>?
</div>
<![endif]-->
{% if no_processingnodes %}
<h3>{% trans 'Welcome! ☺' %}</h3>
{% trans 'Add a Processing Node' as add_processing_node %}