CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

chg: [UI] bump jquery to 3.4.1

pull/486/head
Terrtia 2020-03-04 15:12:32 +01:00
parent 873797d87f
commit 0fb8245c07
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
9 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
var/www/modules/PasteSubmit/templates/submit_items.html
View File

@ -239,7 +239,7 @@ function submitPaste(){
</script>
<script>
jQuery("#all-tags-taxonomies").click(function(e){
jQuery("#all-tags-taxonomies").on("click", function(e){
//change input tags list
$.getJSON("{{ url_for('Tags.get_all_tags_taxonomies') }}",
function(data) {
@ -249,7 +249,7 @@ function submitPaste(){
</script>
<script>
jQuery("#all-tags-galaxies").click(function(e){
jQuery("#all-tags-galaxies").on("click", function(e){
$.getJSON("{{ url_for('Tags.get_all_tags_galaxy') }}",
function(data) {
ltagsgalaxies.setData(data)
@ -257,7 +257,7 @@ function submitPaste(){
});
{% for taxo in active_taxonomies %}
jQuery("#{{ taxo }}-id{{ loop.index0 }}").click(function(e){
jQuery("#{{ taxo }}-id{{ loop.index0 }}").on("click", function(e){
$.getJSON("{{ url_for('Tags.get_tags_taxonomie') }}?taxonomie={{ taxo }}",
function(data) {
ltags.setData(data)
@ -267,7 +267,7 @@ function submitPaste(){
</script>
<script>
{% for galaxy in active_galaxies %}
jQuery("#{{ galaxy }}-idgalax{{ loop.index0 }}").click(function(e){
jQuery("#{{ galaxy }}-idgalax{{ loop.index0 }}").on("click", function(e){
$.getJSON("{{ url_for('Tags.get_tags_galaxy') }}?galaxy={{ galaxy }}",
function(data) {
ltagsgalaxies.setData(data)
@ -294,8 +294,8 @@ function submitPaste(){
if(processing){
$("#loading_button").hide();
$("#pr").removeAttr('hidden');
$("#files_submitted_btn").removeAttr('hidden');
$("#pr").prop('hidden', false);
$("#files_submitted_btn").prop('hidden', false);
}
if(i < 100){
@ -309,8 +309,8 @@ function submitPaste(){
//error handler
if(isError){
document.getElementById('error_message').innerHTML = error;
$("#panel_error").removeAttr('hidden');
$("#error_submit_button").removeAttr('hidden');
$("#panel_error").prop('hidden', false);
$("#error_submit_button").prop('hidden', false);
err = err + 1;
}
@ -321,15 +321,15 @@ function submitPaste(){
} else {
document.getElementById('files_submitted').innerHTML = in_progress;
$("#progress-bar").removeClass('progress-bar-animated');
$("#submit_result").removeAttr('hidden');
$("#submit_result").prop('hidden', false);
if(isError){
document.getElementById('error_message').innerHTML = error;
$("#panel_error").removeAttr('hidden');
$("#error_submit_button").removeAttr('hidden');
$("#panel_error").prop('hidden', false);
$("#error_submit_button").prop('hidden', false);
} else {
$("#success_submit_button").removeAttr('hidden');
$("#success_submit_button").prop('hidden', false);
}
if(in_progress == '0 / '){
@ -339,7 +339,7 @@ function submitPaste(){
} else {
var link = data.link;
$("#submit_pastes").append(link);
$("#submit_pastes").removeAttr('hidden');
$("#submit_pastes").prop('hidden', false);
}

2
var/www/modules/hiddenServices/templates/Crawler_Splash_manual.html
View File

@ -135,7 +135,7 @@ $(document).ready(function(){
$("#nav_manual_crawler").addClass("active");
manual_crawler_input_controler();
$('#crawler_type').change(function () {
$('#crawler_type').on("change", function () {
manual_crawler_input_controler();
});
});

4
var/www/modules/hiddenServices/templates/Crawler_dashboard.html
View File

@ -160,11 +160,11 @@ var to_refresh = false
$(document).ready(function(){
$("#page-Crawler").addClass("active");
$("#nav_dashboard").addClass("active");
$( window ).focus(function() {
$( window ).on("focus", function() {
to_refresh = true
refresh_crawler_status();
});
$( window ).blur(function() {
$( window ).on("blur", function() {
to_refresh = false
});

2
var/www/modules/sentiment/templates/sentiment_analysis_trending.html
View File

@ -241,7 +241,7 @@
$("#"+activePage).addClass("active");
$('[data-toggle="tooltip"]').tooltip();
$("#LoadAll").click(function(){ draw_page("True"); });
$("#LoadAll").on("click", function(){ draw_page("True"); });
draw_page("False");
// Reload every 30min
setTimeout(function(){ location.reload(); }, 30*60*1000);

6
var/www/modules/terms/templates/credentials_tracker.html
View File

@ -116,7 +116,7 @@
perform_binding();
});
$("#seekInput").keyup(function(event){
$("#seekInput").on("keyup", function(event){
if(event.keyCode == 13){
$("#followTermBtn").click();
$("#seekInput").val("");
@ -135,8 +135,8 @@
<script>
function perform_binding() {
$(".btn-interaction").unbind("click.interaction");
$(".btn-interaction").bind("click.interaction", perform_operation);
$(".btn-interaction").off("click.interaction");
$(".btn-interaction").on("click.interaction", perform_operation);
}
function perform_modal_binding() {

2
var/www/static/js/indexjavascript.js
View File

@ -137,7 +137,7 @@ function initfunc( csvay, scroot) {
var source = new EventSource(urllog);
source.onmessage = function(event) {
var feed = jQuery.parseJSON( event.data );
var feed = JSON.parse( event.data );
create_log_table(feed);
};

2
var/www/static/js/sentiment_trending.js
View File

@ -183,7 +183,7 @@ function query_and_plot(provider, graphNum) {
var neu = 0;
for(i=0; i<data_array.length; i++){
var curr_data = jQuery.parseJSON(data_array[i].replace(/\'/g, '\"'));
var curr_data = JSON.parse(data_array[i].replace(/\'/g, '\"'));
compPosAvg += curr_data['compoundPos'];
compNegAvg += curr_data['compoundNeg'];
pos += curr_data['pos'];

40
var/www/static/js/tags.js
View File

@ -524,7 +524,7 @@
*/
this.expand = function()
{
if (!cfg.expanded && (this.input.val().length >= cfg.minChars || this.combobox.children().size() > 0)) {
if (!cfg.expanded && (this.input.val().length >= cfg.minChars || this.combobox.children().length > 0)) {
this.combobox.appendTo(this.container);
self._processSuggestions();
cfg.expanded = true;
@ -876,10 +876,10 @@
(cfg.editable === true ? '' : ' tag-ctn-readonly'),
style: cfg.style
}).width(w);
ms.container.focus($.proxy(handlers._onFocus, this));
ms.container.blur($.proxy(handlers._onBlur, this));
ms.container.keydown($.proxy(handlers._onKeyDown, this));
ms.container.keyup($.proxy(handlers._onKeyUp, this));
ms.container.on("focus", $.proxy(handlers._onFocus, this));
ms.container.on("blur", $.proxy(handlers._onBlur, this));
ms.container.on("keydown", $.proxy(handlers._onKeyDown, this));
ms.container.on("keyup", $.proxy(handlers._onKeyUp, this));
// holds the input field
ms.input = $('<input/>', $.extend({
@ -891,8 +891,8 @@
disabled: cfg.disabled
}, cfg.inputCfg)).width(w - (cfg.hideTrigger ? 16 : 42));
ms.input.focus($.proxy(handlers._onInputFocus, this));
ms.input.click($.proxy(handlers._onInputClick, this));
ms.input.on("focus", $.proxy(handlers._onInputFocus, this));
ms.input.on("click", $.proxy(handlers._onInputClick, this));
// holds the trigger on the right side
if(cfg.hideTrigger === false) {
@ -901,7 +901,7 @@
'class': 'tag-trigger',
html: '<div class="tag-trigger-ico"></div>'
});
ms.trigger.click($.proxy(handlers._onTriggerClick, this));
ms.trigger.on("click", $.proxy(handlers._onTriggerClick, this));
ms.container.append(ms.trigger);
}
@ -919,7 +919,7 @@
id: 'tag-sel-ctn-' + $('div[id^="tag-sel-ctn"]').length,
'class': 'tag-sel-ctn'
});
ms.selectionContainer.click($.proxy(handlers._onFocus, this));
ms.selectionContainer.on("click", $.proxy(handlers._onFocus, this));
if(cfg.selectionPosition === 'inner') {
ms.selectionContainer.append(ms.input);
@ -962,7 +962,7 @@
}
$(ms).trigger('afterrender', [ms]);
$("body").click(function(e) {
$("body").on("click", function(e) {
if(ms.container.hasClass('tag-ctn-bootstrap-focus') &&
ms.container.has(e.target).length === 0 &&
e.target.className.indexOf('tag-res-item') < 0 &&
@ -988,8 +988,8 @@
html: cfg.highlight === true ? self._highlightSuggestion(displayed) : displayed,
'data-json': JSON.stringify(value)
});
resultItemEl.click($.proxy(handlers._onComboItemSelected, ref));
resultItemEl.mouseover($.proxy(handlers._onComboItemMouseOver, ref));
resultItemEl.on("click", $.proxy(handlers._onComboItemSelected, ref));
resultItemEl.on("mouseover", $.proxy(handlers._onComboItemMouseOver, ref));
html += $('<div/>').append(resultItemEl).html();
});
ms.combobox.append(html);
@ -1032,7 +1032,7 @@
'class': 'tag-close-btn'
}).data('json', value).appendTo(selectedItemEl);
delItemEl.click($.proxy(handlers._onTagTriggerClick, ref));
delItemEl.on("click", $.proxy(handlers._onTagTriggerClick, ref));
}
}
@ -1077,7 +1077,7 @@
ms.collapse();
}
if(!_hasFocus){
ms.input.focus();
ms.input.trigger("focus")
} else if(_hasFocus && (cfg.expandOnFocus || _ctrlDown)){
self._processSuggestions();
if(_ctrlDown){
@ -1217,7 +1217,7 @@
* @private
*/
_onFocus: function() {
ms.input.focus();
ms.input.trigger("focus");
},
/**
@ -1290,7 +1290,7 @@
_selection.pop();
self._renderSelection();
$(ms).trigger('selectionchange', [ms, ms.getSelectedItems()]);
ms.input.focus();
ms.input.trigger("focus");
e.preventDefault();
}
break;
@ -1364,7 +1364,7 @@
obj[cfg.displayField] = obj[cfg.valueField] = freeInput;
ms.addToSelection(obj);
ms.collapse(); // reset combo suggestions
ms.input.focus();
ms.input.trigger("focus");
}
break;
}
@ -1423,7 +1423,7 @@
} else {
var curLength = ms.getRawValue().length;
if(curLength >= cfg.minChars){
ms.input.focus();
ms.input.trigger("focus");
ms.expand();
} else {
self._updateHelper(cfg.minCharsRenderer.call(this, cfg.minChars - curLength));
@ -1442,7 +1442,7 @@
$.fn.tagSuggest = function(options) {
var obj = $(this);
if(obj.size() === 1 && obj.data('tagSuggest')) {
if(obj.length === 1 && obj.data('tagSuggest')) {
return obj.data('tagSuggest');
}
@ -1479,7 +1479,7 @@
field.container.data('tagSuggest', field);
});
if(obj.size() === 1) {
if(obj.length === 1) {
return obj.data('tagSuggest');
}
return obj;

42
var/www/update_thirdparty.sh
View File

@ -13,7 +13,6 @@ rm -rf temp
mkdir temp
wget -q https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-${BOOTSTRAP_VERSION}-dist.zip -O temp/bootstrap${BOOTSTRAP_VERSION}.zip
wget -q https://github.com/FezVrasta/popper.js/archive/v1.14.3.zip -O temp/popper.zip
wget -q https://github.com/BlackrockDigital/startbootstrap-sb-admin/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}.zip
wget -q https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}-2.zip
wget -q https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip -O temp/FONT_AWESOME_4.7.0.zip
@ -21,28 +20,24 @@ wget -q https://github.com/FortAwesome/Font-Awesome/archive/5.7.1.zip -O temp/FO
wget -q https://github.com/d3/d3/releases/download/v${D3_JS_VERSION}/d3.zip -O temp/d3_${D3_JS_VERSION}.zip
# dateRangePicker
wget -q https://github.com/moment/moment/archive/2.22.2.zip -O temp/moment_2.22.2.zip
wget -q https://github.com/longbill/jquery-date-range-picker/archive/v0.18.0.zip -O temp/daterangepicker_v0.18.0.zip
wget -q https://github.com/moment/moment/archive/2.24.0.zip -O temp/moment.zip
wget -q https://github.com/longbill/jquery-date-range-picker/archive/v0.20.0.zip -O temp/daterangepicker.zip
unzip -qq temp/bootstrap${BOOTSTRAP_VERSION}.zip -d temp/
unzip -qq temp/popper.zip -d temp/
unzip -qq temp/${SBADMIN_VERSION}.zip -d temp/
unzip -qq temp/${SBADMIN_VERSION}-2.zip -d temp/
unzip -qq temp/FONT_AWESOME_4.7.0.zip -d temp/
unzip -qq temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip -d temp/
unzip -qq temp/d3_${D3_JS_VERSION}.zip -d temp/
unzip -qq temp/moment_2.22.2.zip -d temp/
unzip -qq temp/daterangepicker_v0.18.0.zip -d temp/
unzip -qq temp/moment.zip -d temp/
unzip -qq temp/daterangepicker.zip -d temp/
mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/js/bootstrap.min.js ./static/js/bootstrap4.min.js
mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/js/bootstrap.min.js.map ./static/js/bootstrap.min.js.map
mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/css/bootstrap.min.css ./static/css/bootstrap4.min.css
mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/css/bootstrap.min.css.map ./static/css/bootstrap4.min.css.map
mv temp/popper-core-1.14.3/dist/umd/popper.min.js ./static/js/
mv temp/popper-core-1.14.3/dist/umd/popper.min.js.map ./static/js/
mv temp/startbootstrap-sb-admin-${SBADMIN_VERSION} temp/sb-admin
mv temp/startbootstrap-sb-admin-2-${SBADMIN_VERSION} temp/sb-admin-2
mv temp/Font-Awesome-4.7.0 temp/font-awesome
@ -61,24 +56,29 @@ mv temp/font-awesome/ ./static/
rm -rf ./static/css/plugins/
mv temp/sb-admin/css/* ./static/css/
mv temp/sb-admin-2/dist/css/* ./static/css/
mv temp/jquery-date-range-picker-0.18.0/dist/daterangepicker.min.css ./static/css/
mv temp/jquery-date-range-picker-0.20.0/dist/daterangepicker.min.css ./static/css/
mv temp/d3.min.js ./static/js/
mv temp/moment-2.22.2/min/moment.min.js ./static/js/
mv temp/jquery-date-range-picker-0.18.0/dist/jquery.daterangepicker.min.js ./static/js/
mv temp/moment-2.24.0/min/moment.min.js ./static/js/
mv temp/jquery-date-range-picker-0.20.0/dist/jquery.daterangepicker.min.js ./static/js/
rm -rf temp
JQVERSION="1.12.4"
JQVERSION="3.4.1"
wget -q http://code.jquery.com/jquery-${JQVERSION}.js -O ./static/js/jquery.js
#Ressources for dataTable
wget -q https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js -O ./static/js/jquery.dataTables.min.js
wget -q https://cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.css -O ./static/css/dataTables.bootstrap.css
wget -q https://cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.js -O ./static/js/dataTables.bootstrap.js
wget -q https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js -O ./static/js/jquery.dataTables.min.js
wget -q https://cdn.datatables.net/plug-ins/1.10.20/integration/bootstrap/3/dataTables.bootstrap.css -O ./static/css/dataTables.bootstrap.css
wget -q https://cdn.datatables.net/plug-ins/1.10.20/integration/bootstrap/3/dataTables.bootstrap.js -O ./static/js/dataTables.bootstrap.js
wget -q https://cdn.datatables.net/1.10.18/css/dataTables.bootstrap4.min.css -O ./static/css/dataTables.bootstrap.min.css
wget -q https://cdn.datatables.net/1.10.18/js/dataTables.bootstrap4.min.js -O ./static/js/dataTables.bootstrap.min.js
wget -q https://cdn.datatables.net/1.10.20/css/dataTables.bootstrap4.min.css -O ./static/css/dataTables.bootstrap.min.css
wget -q https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js -O ./static/js/dataTables.bootstrap.min.js
#Ressources for bootstrap popover
POPPER_VERSION="2.0.6"
wget -q https://unpkg.com/@popperjs/core@${POPPER_VERSION}/dist/umd/popper.min.js -O ./static/js/popper.min.js
wget -q https://unpkg.com/@popperjs/core@${POPPER_VERSION}/dist/umd/popper.min.js.map -O ./static/js/popper.min.js.map
#Ressource for graph
wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.js -O ./static/js/jquery.flot.js
@ -93,10 +93,10 @@ wget -q http://canvasjs.com/fdm/chart/ -O temp/canvasjs.zip
unzip -qq temp/canvasjs.zip -d temp/
mv temp/jquery.canvasjs.min.js ./static/js/jquery.canvasjs.min.js
wget -q https://jqueryui.com/resources/download/jquery-ui-1.12.0.zip -O temp/jquery-ui.zip
wget -q https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip -O temp/jquery-ui.zip
unzip -qq temp/jquery-ui.zip -d temp/
mv temp/jquery-ui-1.12.0/jquery-ui.min.js ./static/js/jquery-ui.min.js
mv temp/jquery-ui-1.12.0/jquery-ui.min.css ./static/css/jquery-ui.min.css
mv temp/jquery-ui-1.12.1/jquery-ui.min.js ./static/js/jquery-ui.min.js
mv temp/jquery-ui-1.12.1/jquery-ui.min.css ./static/css/jquery-ui.min.css
rm -rf temp
mkdir -p ./static/image