Skip to content

Commit

Permalink
Merge branch 'IE'
Browse files Browse the repository at this point in the history 
* IE:
  gisaid iframe
  fix grid stacking on IE, windows/linux firefox
  babel-polyfill
  remove autocomplete script from index.html
  String.startsWith polyfill. Splash page now loads.
  es6-object-assign polyfill
  • Loading branch information
@jameshadfield
jameshadfield committed Mar 16, 2018
2 parents d213391 + 66b9585 commit 4348164
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 235 deletions.
233 changes: 0 additions & 233 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,238 +25,5 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" />

<script>
/**
Copyright (c) 2014 BrightPoint Consulting, Inc.
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.
*/
function autocomplete(parent) {
var _data = null,
_delay = 0,
_selection,
_margin = {
top: 30,
right: 10,
bottom: 50,
left: 80
},
__width = 420,
__height = 420,
_placeHolder = "Search",
_width,
_height,
_matches,
_searchTerm,
_lastSearchTerm,
_currentIndex,
_keys,
_selectedFunction = defaultSelected;
_minLength = 1,
_dataField = "dataField",
_labelField = "labelField";
_selection = d3.select(parent);

function component() {
var container = d3.select(parent);
container.attr("width", __width).attr("height", __height);
var enter = container.append("div").attr("id", "bp-ac").attr("class",
"bp-ac")
var input = enter.append("input").attr("id", "bp-input").attr("type",
"search").attr("class", "form-control").attr("placeholder",
_placeHolder).attr("type", "text").on("keyup", onKeyUp);
var dropDown = enter.append("div").attr("class",
"bp-autocomplete-dropdown");
var searching = dropDown.append("div").attr("class",
"bp-autocomplete-searching").text("Searching ...");
hideSearching();
hideDropDown();

function onKeyUp() {
_searchTerm = input.node().value;
var e = d3.event;
if (!(e.which == 38 || e.which == 40 || e.which == 13)) {
if (!_searchTerm || _searchTerm == "") {
showSearching("No results");
} else if (isNewSearchNeeded(_searchTerm, _lastSearchTerm)) {
_lastSearchTerm = _searchTerm;
_currentIndex = -1;
_results = [];
showSearching();
search();
processResults();
if (_matches.length == 0) {
showSearching("No results");
} else {
hideSearching();
showDropDown();
}
}
} else {
e.preventDefault();
}
}

function processResults() {
var results = dropDown.selectAll(".bp-autocomplete-row").data(
_matches, function(d) {
return d[_dataField];
});
results.enter().append("div").attr("class", "bp-autocomplete-row").on(
"click", function(d, i) {
row_onClick(d);
}).append("div").attr("class", "bp-autocomplete-title").html(
function(d) {
var re = new RegExp(_searchTerm, 'i');
var strPart = d[_dataField].match(re)[0];
return d[_dataField].replace(re,
"<span class='bp-autocomplete-highlight'>" + strPart +
"</span>");
});
results.exit().remove();
//Update results
results.select(".bp-autocomplete-title").html(function(d, i) {
var re = new RegExp(_searchTerm, 'i');
var strPart = _matches[i][_dataField].match(re);
if (strPart) {
strPart = strPart[0];
return _matches[i][_dataField].replace(re,
"<span class='bp-autocomplete-highlight'>" + strPart +
"</span>");
}
});
}

function search() {
var str = _searchTerm;
console.log("searching on " + _searchTerm);
console.log("-------------------");
if (str.length >= _minLength) {
_matches = [];
for (var i = 0; i < _keys.length; i++) {
var match = false;
match = match || (_keys[i][_dataField].toLowerCase().indexOf(
str.toLowerCase()) >= 0);
if (match && _matches.length < 10) {
_matches.push(_keys[i]);
//console.log("matches " + _keys[i][_dataField]);
}
}
}
}

function row_onClick(d) {
hideDropDown();
input.node().value = d[_dataField];
_selectedFunction(d);
}

function isNewSearchNeeded(newTerm, oldTerm) {
return newTerm.length >= _minLength && newTerm != oldTerm;
}

function hideSearching() {
searching.style("display", "none");
}

function hideDropDown() {
dropDown.style("display", "none");
}

function showSearching(value) {
searching.style("display", "block");
searching.text(value);
}

function showDropDown() {
dropDown.style("display", "block");
}
}

function measure() {
_width = __width - _margin.right - _margin.left;
_height = __height - _margin.top - _margin.bottom;
}

function defaultSelected(d) {
console.log(d[_dataField] + " selected");
}
component.render = function() {
measure();
component();
return component;
}
component.keys = function(_) {
if (!arguments.length) return _keys;
_keys = _;
return component;
}
component.dataField = function(_) {
if (!arguments.length) return _dataField;
_dataField = _;
return component;
}
component.labelField = function(_) {
if (!arguments.length) return _labelField;
_labelField = _;
return component;
}
component.margin = function(_) {
if (!arguments.length) return _margin;
_margin = _;
measure();
return component;
};
component.width = function(_) {
if (!arguments.length) return __width;
__width = _;
measure();
return component;
};
component.height = function(_) {
if (!arguments.length) return __height;
__height = _;
measure();
return component;
};
component.delay = function(_) {
if (!arguments.length) return _delay;
_delay = _;
return component;
};
component.keys = function(_) {
if (!arguments.length) return _keys;
_keys = _;
return component;
};
component.placeHolder = function(_) {
if (!arguments.length) return _placeHolder;
_placeHolder = _;
return component;
};
component.onSelected = function(_) {
if (!arguments.length) return _selectedFunction;
_selectedFunction = _;
return component;
};
return component;
}
</script>
</body>
</html>
3 changes: 3 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
},
"dependencies": {
"awesomplete": "^1.1.2",
"babel-polyfill": "^6.26.0",
"binomial": "^0.2.0",
"color": "^0.7.3",
"create-react-class": "^15.6.0",
Expand All @@ -115,6 +116,8 @@
"d3-time-format": "^2.0.5",
"d3-timer": "^1.0.7",
"d3-zoom": "^1.1.3",
"es6-object-assign": "^1.1.0",
"es6-promise-polyfill": "^1.2.0",
"express": "^4.13.3",
"express-static-gzip": "^0.2.2",
"leaflet": "^1.2.0",
Expand Down
46 changes: 46 additions & 0 deletions scripts/gisaid_iframe.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

<!DOCTYPE html>
<html lang="en">
<head>

<meta charset="utf-8">
<!--
This website is powered by TYPO3 - inspiring people to share!
TYPO3 is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.
TYPO3 is copyright 1998-2017 of Kasper Skaarhoj. Extensions are copyright of their respective owners.
Information and contribution at http://typo3.org/
-->

<base href="https://www.gisaid.org/">


<meta name="generator" content="TYPO3 CMS">
<meta name="viewport" content="width=device-width, initial-scale=1.0">


<link rel="stylesheet" type="text/css" href="typo3temp/compressor/merged-5c64311b2b392066da4c975e09ca139a-7786d4ccd2e791b172c00a2757dc5a36.css.1499348113.gzip" media="all">
<link rel="stylesheet" type="text/css" href="typo3temp/compressor/screen-a96b611c82dd32dae4cb3a3b45f48133.css.1521135151.gzip" media="screen, projection">
<link rel="stylesheet" type="text/css" href="typo3temp/compressor/rte-71e522aa00830a19c12945f71a69401e.css.1507642255.gzip" media="screen, projection">
<link rel="stylesheet" type="text/css" href="typo3temp/compressor/print-9dfc438437d2606877f463c2f76293a5.css.1499348057.gzip" media="print">


<script src="typo3temp/compressor/merged-b15ae52ac593eb6fb28e5e7d79989e79-1be3556e3a20b1749415127a2163f746.js.1499348057.gzip" type="text/javascript"></script>
<script src="typo3temp/compressor/merged-bb148bd2519f63b6e819d805bfc37f02-ed7c98db071919507f72915eb9eae2fd.js.1499780431.gzip" type="text/javascript"></script>


<title> GISAID - Nextflu App</title>
</head>
<body id="var4">
<!-- NEXTFLU URL: https://nextflu.org/gisaid/ NEXTSTRAIN URL: http://nextstrain.org/flu/h3n2/ha/3y -->
<div id="inhalt"><div id="spaltenre"><div id="normal"><div id="normalcontent"><div id="c323" class="csc-frame csc-frame-frame5"><iframe src="http://nextstrain.org/flu/h3n2/ha/3y" width="100%" height="600" frameborder="0"></iframe></div></div></div><!--TYPO3SEARCH_end--></div><div id="spaltenli"><ul id="menuehoch"><li class="l1 no"><a href="about-us/mission/">About us</a><ul><li class="no"><a href="about-us/mission/">Mission</a></li><li class="no"><a href="about-us/history/">History</a></li><li class="no"><a href="about-us/governance/">Governance</a></li><li class="no"><a href="about-us/public-private-partnerships/">Public-Private Partnerships</a></li><li class="no"><a href="about-us/grants/">Grants</a></li><li class="no"><a href="about-us/technical-partners/">Technical Partners</a></li><li class="no"><a href="about-us/acknowledgements/">Acknowledgements</a></li><li class="no"><a href="about-us/imprint/">Imprint</a></li></ul></li><li class="l1 act"><a href="epiflu-applications/flusurver-app/">EpiFlu™ Features</a><ul><li class="no"><a href="epiflu-applications/flusurver-app/">FluSurver App</a></li><li class="act"><a href="epiflu-applications/nextflu-app/">Nextflu App</a></li><li class="no"><a href="epiflu-applications/submitting-data-to-epiflutm/">Submitting Data to EpiFlu™</a></li><li class="no"><a href="epiflu-applications/upcoming-features-in-v20/">Upcoming Features in v2.0</a><ul><li class="no"><a href="epiflu-applications/upcoming-features-in-v20/flusurver-app/">FluSurver App</a></li><li class="no"><a href="epiflu-applications/upcoming-features-in-v20/influenza-annotation-pipeline/">Influenza Annotation Pipeline</a></li><li class="no"><a href="epiflu-applications/upcoming-features-in-v20/h5-clade-designation/">H5 Clade designation</a></li><li class="no"><a href="epiflu-applications/upcoming-features-in-v20/treetool-app/">TreeTool App</a></li><li class="no"><a href="epiflu-applications/upcoming-features-in-v20/temporary-publishing-embargo/">Temporary Publishing Embargo</a></li></ul></li></ul></li><li class="l1 no"><a href="updates/events-calendar/">Updates</a><ul><li class="no"><a href="updates/events-calendar/">Events Calendar</a></li><li class="no"><a href="updates/training-workshops/">Training Workshops</a></li><li class="no"><a href="updates/recent-zoonotic-infections/">Recent Zoonotic Infections</a></li><li class="no"><a href="updates/new-publications/">New Publications</a></li></ul></li><li class="l1 no"><a href="collaborations/collaboration-on-h5-antigenic-cartography/">Collaborations</a><ul><li class="no"><a href="collaborations/collaboration-on-h5-antigenic-cartography/">Collaboration on H5 Antigenic Cartography</a></li><li class="no"><a href="collaborations/global-collaboration-on-h5n8/">Global Collaboration on H5N8</a></li><li class="no"><a href="collaborations/equine-influenza-collaboration/">Equine Influenza Collaboration</a></li></ul></li><li class="l1 no"><a href="references/commentary-on-gisaid/">References</a><ul><li class="no"><a href="references/commentary-on-gisaid/">Commentary on GISAID</a></li><li class="no"><a href="references/gisaid-in-the-news/">GISAID in the News</a></li><li class="no"><a href="references/human-influenza-vaccine-composition/">Human Influenza Vaccine Composition</a></li><li class="no"><a href="references/statements-clarifications/">Statements &amp; Clarifications</a></li></ul></li><li class="l1 no"><a href="registration/register/">Registration</a><ul><li class="no"><a href="registration/register/">Register</a></li><li class="no"><a href="registration/terms-of-use/">Terms of Use</a></li></ul></li><li class="l1 no"><a href="help/contact/">Help</a><ul><li class="no"><a href="help/contact/">Contact</a></li><li class="no"><a href="help/faq/">FAQ</a></li><li class="no"><a href="help/downloads/">Downloads</a></li><li class="no"><a href="help/lost-password-recovery/">Lost Password Recovery</a></li><li class="no"><a href="help/publish-with-gisaid-references/">Publish with GISAID References</a></li><li class="no"><a href="help/sitemap/">Sitemap</a></li><li class="no"><a href="help/system-requirements/">System Requirements</a></li><li class="no"><a href="help/tutorials-and-videos/">Tutorials and Videos</a></li></ul></li></ul><div id="links"></div></div><div class="clear">&nbsp;</div></div><div id="fixo"><div id="fixo0"><a href="/" class="schild"><img src="fileadmin/gisaid/img/schild.png" alt="" /></a><div id="oben"><form action="help/search/" method="post" id="suche">
<div id="suche0">
<div id="swordwrap"><input id="sword" type="text" name="tx_indexedsearch[sword]" value="" /></div>
<div class="suchewrap"><input class="suche" type="image" src="fileadmin/gisaid/img/suche.png" alt="Suchen" title="Suchen" /></div>
</div>
</form><div class="login"><a href="http://platform.gisaid.org/epi3/start" title="EpiFlu Login" target="_top">Login</a></div><div class="clear">&nbsp;</div></div><ul id="menuequer"><li class="l1 no sub"><span>About us</span><ul><li class="all no"><a href="about-us/mission/">Mission</a></li><li class="all no"><a href="about-us/history/">History</a></li><li class="all no"><a href="about-us/governance/">Governance</a></li><li class="all no"><a href="about-us/public-private-partnerships/">Public-Private Partnerships</a></li><li class="all no"><a href="about-us/grants/">Grants</a></li><li class="all no"><a href="about-us/technical-partners/">Technical Partners</a></li><li class="all no"><a href="about-us/acknowledgements/">Acknowledgements</a></li><li class="all no"><a href="about-us/imprint/">Imprint</a></li></ul></li><li class="l1 act sub"><span>EpiFlu™ Features</span><ul><li class="all no"><a href="epiflu-applications/flusurver-app/">FluSurver App</a></li><li class="all act"><a href="epiflu-applications/nextflu-app/">Nextflu App</a></li><li class="all no"><a href="epiflu-applications/submitting-data-to-epiflutm/">Submitting Data to EpiFlu™</a></li><li class="all no sub"><a href="epiflu-applications/upcoming-features-in-v20/">Upcoming Features in v2.0</a><ul><li class="all no"><a href="epiflu-applications/upcoming-features-in-v20/flusurver-app/">FluSurver App</a></li><li class="all no"><a href="epiflu-applications/upcoming-features-in-v20/influenza-annotation-pipeline/">Influenza Annotation Pipeline</a></li><li class="all no"><a href="epiflu-applications/upcoming-features-in-v20/h5-clade-designation/">H5 Clade designation</a></li><li class="all no"><a href="epiflu-applications/upcoming-features-in-v20/treetool-app/">TreeTool App</a></li><li class="all no"><a href="epiflu-applications/upcoming-features-in-v20/temporary-publishing-embargo/">Temporary Publishing Embargo</a></li></ul></li></ul></li><li class="l1 no sub"><span>Updates</span><ul><li class="all no"><a href="updates/events-calendar/">Events Calendar</a></li><li class="all no"><a href="updates/training-workshops/">Training Workshops</a></li><li class="all no"><a href="updates/recent-zoonotic-infections/">Recent Zoonotic Infections</a></li><li class="all no"><a href="updates/new-publications/">New Publications</a></li></ul></li><li class="l1 no sub"><span>Collaborations</span><ul><li class="all no"><a href="collaborations/collaboration-on-h5-antigenic-cartography/">Collaboration on H5 Antigenic Cartography</a></li><li class="all no"><a href="collaborations/global-collaboration-on-h5n8/">Global Collaboration on H5N8</a></li><li class="all no"><a href="collaborations/equine-influenza-collaboration/">Equine Influenza Collaboration</a></li></ul></li><li class="l1 no sub"><span>References</span><ul><li class="all no"><a href="references/commentary-on-gisaid/">Commentary on GISAID</a></li><li class="all no"><a href="references/gisaid-in-the-news/">GISAID in the News</a></li><li class="all no"><a href="references/human-influenza-vaccine-composition/">Human Influenza Vaccine Composition</a></li><li class="all no"><a href="references/statements-clarifications/">Statements &amp; Clarifications</a></li></ul></li><li class="l1 no sub"><span>Registration</span><ul><li class="all no"><a href="registration/register/">Register</a></li><li class="all no"><a href="registration/terms-of-use/">Terms of Use</a></li></ul></li><li class="l1 no sub last"><span>Help</span><ul><li class="all no"><a href="help/contact/">Contact</a></li><li class="all no"><a href="help/faq/">FAQ</a></li><li class="all no"><a href="help/downloads/">Downloads</a></li><li class="all no"><a href="help/lost-password-recovery/">Lost Password Recovery</a></li><li class="all no"><a href="help/publish-with-gisaid-references/">Publish with GISAID References</a></li><li class="all no"><a href="help/sitemap/">Sitemap</a></li><li class="all no"><a href="help/system-requirements/">System Requirements</a></li><li class="all no"><a href="help/tutorials-and-videos/">Tutorials and Videos</a></li></ul></li></ul><a href="epiflu-applications/nextflu-app/#menuehoch" class="menuicon"><span class="cssicon"></span></a></div></div><div id="unten"><div id="unten0" class="csc-frame csc-frame-frame1 end"><div class="copyright">&copy;&nbsp;2008&nbsp;-&nbsp;2018 &nbsp; Freunde von GISAID e.V.</div><ul id="meta"><li><a href="about-us/imprint/">Imprint</a></li><li><a href="registration/terms-of-use/">Terms of Use</a></li><li><a href="help/contact/">Contact</a></li><li><a href="open-access/" target="_blank">Open Access</a></li><li><a href="twitter/" target="_blank">Twitter</a></li></ul></div></div>




</body>
</html>
Loading

0 comments on commit 4348164

Please sign in to comment.