JavaScript License fixes for LibreJS compatibility

pull/56/head
luccioman 9 years ago
parent 8b95e5c91f
commit a73c9327a5

@ -2,6 +2,7 @@
<!-- This page is only XHTML 1.0 Transitional and not Strict because iframes are in use -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
#%env/templates/metas.template%#
<script type="text/javascript">
//<![CDATA[
function xmlhttpPost() {
@ -53,7 +54,6 @@ function updatepage(str) {
//]]>
</script>
<title>YaCy '#[clientname]#': View URL Content</title>
#%env/templates/metas.template%#
<script type="text/javascript" src="js/highslide/highslide.js"></script>
</head>
<body>

@ -10,31 +10,31 @@
<link href="/env/bootstrap/css/bootstrap-switch.min.css" rel="stylesheet">
<script>
/*
@licstart The following is the entire license notice for the
JavaScript code in this page.
/*
@licstart The following is the entire license notice for the
JavaScript code in this page.
Copyright (C) 2005-2016 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
and other YaCy developers (see http://yacy.net/en/Join.html)
first published 07.04.2005 on http://yacy.net
Copyright (C) 2005-2016 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
and other YaCy developers (see http://yacy.net/en/Join.html)
first published 07.04.2005 on http://yacy.net
The JavaScript code in this page is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
The JavaScript code in this page is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@licend The above is the entire license notice
for the JavaScript code in this page.
*/
@licend The above is the entire license notice
for the JavaScript code in this page.
*/
</script>
<script src="/env/bootstrap/js/jquery.min.js"></script>

@ -1,4 +1,7 @@
/*
/*
* @licstart The following is the entire license notice for the
* JavaScript code in this file.
*
* Copyright (C) 2006 - 2014 Alexander Schier, Martin Thelian, Michael Peter Christen,
* Florian Richter, Stefan Förster, David Wieditz
*
@ -17,6 +20,9 @@
*
* You should have received a copy of the GNU General Public License
* along with YaCy. If not, see <http://www.gnu.org/licenses/>.
*
* @licend The above is the entire license notice
* for the JavaScript code in this file.
*/
var AJAX_OFF="/env/grafics/empty.gif";

@ -1,3 +1,31 @@
/*
@licstart The following is the entire license notice for the
JavaScript code in this file.
Copyright (C) 2005-2016 Torstein Hønsi
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.
@licend The above is the entire license notice
for the JavaScript code in this file.
*/
/**
* Name: Highslide JS
* Version: 4.1.13 (2011-10-06)

File diff suppressed because one or more lines are too long

@ -13,6 +13,33 @@
Thanks to many, many people for contributions and suggestions.
Licenced as X11: http://www.kryogenix.org/code/browser/licence.html
This basically means: do what you want with it.
@licstart The following is the entire license notice for the
JavaScript code in this file.
Copyright (c) 1997-2007 Stuart Langridge
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.
@licend The above is the entire license notice
for the JavaScript code in this file.
*/
@ -169,7 +196,7 @@ sorttable = {
for (var i=0; i<table.tBodies[0].rows.length; i++) {
text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
if (text != '') {
if (text.match(/^-?[£$¤]?[\d,.]+%?$/)) {
if (text.match(/^-?[<EFBFBD>$<24>]?[\d,.]+%?$/)) {
return sorttable.sort_numeric;
}
// check for a date: dd/mm/yyyy or dd/mm/yy

@ -67,6 +67,39 @@ public class HTMLResponseWriter implements QueryResponseWriter {
@Override
public void init(@SuppressWarnings("rawtypes") NamedList n) {
}
/**
* Append YaCy JavaScript license information to writer
* @param writer must be non null
* @throws IOException when a write error occured
*/
private void writeJSLicence(final Writer writer) throws IOException {
writer.write("<script>");
writer.write("/*");
writer.write("@licstart The following is the entire license notice for the");
writer.write("JavaScript code in this page.");
writer.write("");
writer.write("Copyright (C) 2013-2015 by Michael Peter Christen and reger");
writer.write("");
writer.write("The JavaScript code in this page is free software: you can redistribute it and/or");
writer.write("modify it under the terms of the GNU General Public License");
writer.write("as published by the Free Software Foundation; either version 2");
writer.write("of the License, or (at your option) any later version.");
writer.write("");
writer.write("This program is distributed in the hope that it will be useful,");
writer.write("but WITHOUT ANY WARRANTY; without even the implied warranty of");
writer.write("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the");
writer.write("GNU General Public License for more details.");
writer.write("");
writer.write("You should have received a copy of the GNU General Public License");
writer.write("along with this program; if not, write to the Free Software");
writer.write("Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.");
writer.write("");
writer.write("@licend The above is the entire license notice");
writer.write("for the JavaScript code in this page.");
writer.write("*/");
writer.write("</script>");
}
@Override
public void write(final Writer writer, final SolrQueryRequest request, final SolrQueryResponse rsp) throws IOException {
@ -84,6 +117,7 @@ public class HTMLResponseWriter implements QueryResponseWriter {
writer.write(" xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n");
writer.write(" xmlns:foaf=\"http://xmlns.com/foaf/0.1/\">\n");
writer.write("<head profile=\"http://www.w3.org/2003/g/data-view\">\n");
this.writeJSLicence(writer);
//writer.write("<link rel=\"transformation\" href=\"http://www-sop.inria.fr/acacia/soft/RDFa2RDFXML.xsl\"/>\n");
writer.write("<!-- Bootstrap core CSS -->\n");

Loading…
Cancel
Save