Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to jQuery 3.5.1 #57

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade to jQuery 3.5.1 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e85cfe7
added bootstrap to package.json
delosrogers Jan 6, 2021
8fb78d0
changed package.json to jquery 3.5.1
delosrogers Jan 6, 2021
0b9b00b
changed .keyup(func()) to .on('keyup', func())
delosrogers Jan 11, 2021
c5c0d1a
replaced .click(func()) with .on("click", func())
delosrogers Jan 11, 2021
33ddec2
added jquery 3.5.1 to lib/js/
delosrogers Jan 12, 2021
e530e4d
changed index.html and multiple_clustergrams.html to use jquery 3.5.1
delosrogers Jan 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions clustergrammer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23409,7 +23409,7 @@ var Clustergrammer =
return this.__data__ == inst_order;
})[0];

$(inst_button).click();
$(inst_button).on("click");
}

return {
Expand Down Expand Up @@ -23471,7 +23471,7 @@ var Clustergrammer =
}

function run_search(params) {
$(params.root + ' .submit_gene_button').click();
$(params.root + ' .submit_gene_button').on("click");
$(params.root + ' .gene_search_box').autocomplete("search", '');
}

Expand Down Expand Up @@ -24619,14 +24619,14 @@ var Clustergrammer =
d3.selectAll('.awesomplete ul').style('z-index', 99);

// submit genes button
$(params.root + ' .gene_search_box').keyup(function (e) {
$(params.root + ' .gene_search_box').on("keyup", function (e) {
if (e.keyCode === 13) {
var search_gene = $(params.root + ' .gene_search_box').val();
run_row_search(cgm, search_gene, entities);
}
});

$(params.root + ' .submit_gene_button').off().click(function () {
$(params.root + ' .submit_gene_button').off().on("click", function () {
var search_gene = $(params.root + ' .gene_search_box').val();
run_row_search(cgm, search_gene, entities);
});
Expand All @@ -24641,7 +24641,7 @@ var Clustergrammer =
underscore.each(reorder_types, function (inst_rc) {

// reorder buttons
$(params.root + ' .toggle_' + inst_rc + '_order .btn').off().click(function (evt) {
$(params.root + ' .toggle_' + inst_rc + '_order .btn').off().on("click", function (evt) {

var order_id = $(evt.target).attr('name').replace('_row', '').replace('_col', '');

Expand Down Expand Up @@ -25022,7 +25022,7 @@ var Clustergrammer =
return this.__data__ == inst_order;
})[0];

$(inst_button).click();
$(inst_button).on("click");
}

// allows doubleclicking on d3 element
Expand Down Expand Up @@ -27866,7 +27866,7 @@ var Clustergrammer =
return button_dict[d];
});

$(params.root + ' .categorical_filter .btn').off().click(function () {
$(params.root + ' .categorical_filter .btn').off().on("click", function () {

d3.selectAll(params.root + ' .categorical_filter .btn').classed('active', false);

Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1 class='wait_message'>Please wait ...</h1>

<!-- Required JS Libraries -->
<script src="lib/js/d3.js"></script>
<script src="lib/js/jquery-1.11.2.min.js"></script>
<script src="lib/js/jquery-3.5.1.min.js"></script>
<script src="lib/js/underscore-min.js"></script>
<script src="lib/js/bootstrap.min.js"></script>

Expand Down
2 changes: 2 additions & 0 deletions lib/js/jquery-3.5.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion multiple_clustergrams.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@

<!-- Required JS Libraries -->
<script src="lib/js/d3.js"></script>
<script src="lib/js/jquery-1.11.2.min.js"></script>
<script src="lib/js/jquery-3.5.1.min.js"></script>
<script src="lib/js/underscore-min.js"></script>
<script src="lib/js/bootstrap.min.js"></script>

Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
"dependencies": {
"awesomplete": "1.1.1",
"d3": "^3.5.15",
"jquery": "1.11.0",
"jquery": "3.5.1",
"mathjs": "3.17.0",
"save-svg-as-png": "^1.1.0",
"style-loader": "^0.13.1",
"underscore": "1.8.3"
"underscore": "1.8.3",
"bootstrap": "4.5.3"
}
}