Skip to content

Commit

Permalink
Merge pull request #11449 from chadlwilson/clean-up-prototype
Browse files Browse the repository at this point in the history
Clean up more legacy Prototype and related vanilla JS
  • Loading branch information
chadlwilson committed Apr 5, 2023
2 parents bbd84c2 + 144dd72 commit daefcf2
Show file tree
Hide file tree
Showing 15 changed files with 12 additions and 1,504 deletions.
Expand Up @@ -31,22 +31,6 @@
}
]
},
"script.aculo.us": {
"moduleName": "script.aculo.us",
"moduleVersion": "1.8.0",
"moduleUrls": [
"https://github.com/madrobby/scriptaculous"
],
"filenames": [
"effects-1.8.0.js"
],
"moduleLicenses": [
{
"moduleLicense": "MIT",
"moduleLicenseUrl": "https://spdx.org/licenses/MIT.html"
}
]
},
"d3": {
"moduleName": "d3",
"moduleVersion": "3.1.5",
Expand Down
Expand Up @@ -57,7 +57,7 @@ public JobStatusJsonPresentationModel(JobInstance instance) {
this(instance, null, new DurationBean(instance.getId()));
}

public Map toJsonHash() {
public Map<String, Object> toJsonHash() {
Map<String, Object> jsonParams = new LinkedHashMap<>();
jsonParams.put("agent", agent.getHostnameForDisplay());
jsonParams.put("agent_ip", agent.getIpaddress());
Expand Down
Expand Up @@ -32,12 +32,9 @@
// toJSON that need to be worked around with Json.parse(Json.stringify(jsonObject)) in various places
//= require "lib/prototype-1.6.0.3.js"

// Used by Rails job history dropdown (at very least, via .dropdown-menu) and ModalBox claims it doe
// Used by Rails job history dropdown (at very least, via .dropdown-menu)
//= require "lib/bootstrap-2.3.2.min.js"

// Used by Rails stage details / stage history (via ModalBox) at least
//= require "lib/effects-1.8.0.js"

// used by Rails value_stream_map_renderer
//= require "lib/jquery-ui-1.7.3.custom.min.js"

Expand Down
Expand Up @@ -33,8 +33,7 @@
},
displayAnyErrorMessages: function displayErrorMessagesOnBuildDetails(json) {
if (is_result_unknown(json)) {
var text = $$WordBreaker.break_text(json.building_info.name);
$('#trans_content').html("Failed to find log in <br/>" + text);
$('#trans_content').html("Failed to find log in <br/>" + json.building_info.name);
new TransMessage('trans_message', $('#build_detail_summary_container')[0], {
type: TransMessage.TYPE_ERROR,
autoHide: false,
Expand Down

This file was deleted.

Expand Up @@ -17,7 +17,6 @@ function make_collapsable(container_id) {
var container_id_selector = "#" + container_id.replace(/\./g,"\\.");
jQuery(container_id_selector + " .hidereveal_expander").click(function (event) {
jQuery(container_id_selector).toggleClass("hidereveal_collapsed");
new ElementAligner().alignAll();
event.stopPropagation();
});
}
Expand Down

This file was deleted.

0 comments on commit daefcf2

Please sign in to comment.