Variable names changed from underscore to CamelCase. Eslint rules updated. #64

This commit is contained in:
n1474335 2017-01-31 18:24:56 +00:00
parent f8193797fa
commit e3c977934b
66 changed files with 3176 additions and 3172 deletions

View file

@ -16,7 +16,7 @@ var OperationsWaiter = function(app, manager) {
this.manager = manager;
this.options = {};
this.remove_intent = false;
this.removeIntent = false;
};
@ -26,17 +26,17 @@ var OperationsWaiter = function(app, manager) {
*
* @param {event} e
*/
OperationsWaiter.prototype.search_operations = function(e) {
OperationsWaiter.prototype.searchOperations = function(e) {
var ops, selected;
if (e.type === "search") { // Search
e.preventDefault();
ops = document.querySelectorAll("#search-results li");
if (ops.length) {
selected = this.get_selected_op(ops);
selected = this.getSelectedOp(ops);
if (selected > -1) {
this.manager.recipe.add_operation(ops[selected].innerHTML);
this.app.auto_bake();
this.manager.recipe.addOperation(ops[selected].innerHTML);
this.app.autoBake();
}
}
}
@ -47,7 +47,7 @@ OperationsWaiter.prototype.search_operations = function(e) {
e.preventDefault();
ops = document.querySelectorAll("#search-results li");
if (ops.length) {
selected = this.get_selected_op(ops);
selected = this.getSelectedOp(ops);
if (selected > -1) {
ops[selected].classList.remove("selected-op");
}
@ -58,7 +58,7 @@ OperationsWaiter.prototype.search_operations = function(e) {
e.preventDefault();
ops = document.querySelectorAll("#search-results li");
if (ops.length) {
selected = this.get_selected_op(ops);
selected = this.getSelectedOp(ops);
if (selected > -1) {
ops[selected].classList.remove("selected-op");
}
@ -66,26 +66,26 @@ OperationsWaiter.prototype.search_operations = function(e) {
ops[selected-1].classList.add("selected-op");
}
} else {
var search_results_el = document.getElementById("search-results"),
var searchResultsEl = document.getElementById("search-results"),
el = e.target,
str = el.value;
while (search_results_el.firstChild) {
$(search_results_el.firstChild).popover("destroy");
search_results_el.removeChild(search_results_el.firstChild);
while (searchResultsEl.firstChild) {
$(searchResultsEl.firstChild).popover("destroy");
searchResultsEl.removeChild(searchResultsEl.firstChild);
}
$("#categories .in").collapse("hide");
if (str) {
var matched_ops = this.filter_operations(str, true),
matched_ops_html = "";
var matchedOps = this.filterOperations(str, true),
matchedOpsHtml = "";
for (var i = 0; i < matched_ops.length; i++) {
matched_ops_html += matched_ops[i].to_stub_html();
for (var i = 0; i < matchedOps.length; i++) {
matchedOpsHtml += matchedOps[i].toStubHtml();
}
search_results_el.innerHTML = matched_ops_html;
search_results_el.dispatchEvent(this.manager.oplistcreate);
searchResultsEl.innerHTML = matchedOpsHtml;
searchResultsEl.dispatchEvent(this.manager.oplistcreate);
}
}
};
@ -94,37 +94,37 @@ OperationsWaiter.prototype.search_operations = function(e) {
/**
* Filters operations based on the search string and returns the matching ones.
*
* @param {string} search_str
* @param {string} searchStr
* @param {boolean} highlight - Whether or not to highlight the matching string in the operation
* name and description
* @returns {string[]}
*/
OperationsWaiter.prototype.filter_operations = function(search_str, highlight) {
var matched_ops = [],
matched_descs = [];
OperationsWaiter.prototype.filterOperations = function(searchStr, highlight) {
var matchedOps = [],
matchedDescs = [];
search_str = search_str.toLowerCase();
searchStr = searchStr.toLowerCase();
for (var op_name in this.app.operations) {
var op = this.app.operations[op_name],
name_pos = op_name.toLowerCase().indexOf(search_str),
desc_pos = op.description.toLowerCase().indexOf(search_str);
for (var opName in this.app.operations) {
var op = this.app.operations[opName],
namePos = opName.toLowerCase().indexOf(searchStr),
descPos = op.description.toLowerCase().indexOf(searchStr);
if (name_pos >= 0 || desc_pos >= 0) {
var operation = new HTMLOperation(op_name, this.app.operations[op_name], this.app, this.manager);
if (namePos >= 0 || descPos >= 0) {
var operation = new HTMLOperation(opName, this.app.operations[opName], this.app, this.manager);
if (highlight) {
operation.highlight_search_string(search_str, name_pos, desc_pos);
operation.highlightSearchString(searchStr, namePos, descPos);
}
if (name_pos < 0) {
matched_ops.push(operation);
if (namePos < 0) {
matchedOps.push(operation);
} else {
matched_descs.push(operation);
matchedDescs.push(operation);
}
}
}
return matched_descs.concat(matched_ops);
return matchedDescs.concat(matchedOps);
};
@ -135,7 +135,7 @@ OperationsWaiter.prototype.filter_operations = function(search_str, highlight) {
* @param {element[]} ops
* @returns {number}
*/
OperationsWaiter.prototype.get_selected_op = function(ops) {
OperationsWaiter.prototype.getSelectedOp = function(ops) {
for (var i = 0; i < ops.length; i++) {
if (ops[i].classList.contains("selected-op")) {
return i;
@ -151,8 +151,8 @@ OperationsWaiter.prototype.get_selected_op = function(ops) {
* @listens Manager#oplistcreate
* @param {event} e
*/
OperationsWaiter.prototype.op_list_create = function(e) {
this.manager.recipe.create_sortable_seed_list(e.target);
OperationsWaiter.prototype.opListCreate = function(e) {
this.manager.recipe.createSortableSeedList(e.target);
$("[data-toggle=popover]").popover();
};
@ -163,11 +163,11 @@ OperationsWaiter.prototype.op_list_create = function(e) {
*
* @param {event} e
*/
OperationsWaiter.prototype.operation_dblclick = function(e) {
OperationsWaiter.prototype.operationDblclick = function(e) {
var li = e.target;
this.manager.recipe.add_operation(li.textContent);
this.app.auto_bake();
this.manager.recipe.addOperation(li.textContent);
this.app.autoBake();
};
@ -177,46 +177,46 @@ OperationsWaiter.prototype.operation_dblclick = function(e) {
*
* @param {event} e
*/
OperationsWaiter.prototype.edit_favourites_click = function(e) {
OperationsWaiter.prototype.editFavouritesClick = function(e) {
e.preventDefault();
e.stopPropagation();
// Add favourites to modal
var fav_cat = this.app.categories.filter(function(c) {
var favCat = this.app.categories.filter(function(c) {
return c.name === "Favourites";
})[0];
var html = "";
for (var i = 0; i < fav_cat.ops.length; i++) {
var op_name = fav_cat.ops[i];
var operation = new HTMLOperation(op_name, this.app.operations[op_name], this.app, this.manager);
html += operation.to_stub_html(true);
for (var i = 0; i < favCat.ops.length; i++) {
var opName = favCat.ops[i];
var operation = new HTMLOperation(opName, this.app.operations[opName], this.app, this.manager);
html += operation.toStubHtml(true);
}
var edit_favourites_list = document.getElementById("edit-favourites-list");
edit_favourites_list.innerHTML = html;
this.remove_intent = false;
var editFavouritesList = document.getElementById("edit-favourites-list");
editFavouritesList.innerHTML = html;
this.removeIntent = false;
var editable_list = Sortable.create(edit_favourites_list, {
var editableList = Sortable.create(editFavouritesList, {
filter: ".remove-icon",
onFilter: function (evt) {
var el = editable_list.closest(evt.item);
var el = editableList.closest(evt.item);
if (el) {
$(el).popover("destroy");
el.parentNode.removeChild(el);
}
},
onEnd: function(evt) {
if (this.remove_intent) evt.item.remove();
if (this.removeIntent) evt.item.remove();
}.bind(this),
});
Sortable.utils.on(edit_favourites_list, "dragleave", function() {
this.remove_intent = true;
Sortable.utils.on(editFavouritesList, "dragleave", function() {
this.removeIntent = true;
}.bind(this));
Sortable.utils.on(edit_favourites_list, "dragover", function() {
this.remove_intent = false;
Sortable.utils.on(editFavouritesList, "dragover", function() {
this.removeIntent = false;
}.bind(this));
$("#edit-favourites-list [data-toggle=popover]").popover();
@ -228,18 +228,18 @@ OperationsWaiter.prototype.edit_favourites_click = function(e) {
* Handler for save favourites click events.
* Saves the selected favourites and reloads them.
*/
OperationsWaiter.prototype.save_favourites_click = function() {
var favourites_list = [],
OperationsWaiter.prototype.saveFavouritesClick = function() {
var favouritesList = [],
favs = document.querySelectorAll("#edit-favourites-list li");
for (var i = 0; i < favs.length; i++) {
favourites_list.push(favs[i].textContent);
favouritesList.push(favs[i].textContent);
}
this.app.save_favourites(favourites_list);
this.app.load_favourites();
this.app.populate_operations_list();
this.manager.recipe.initialise_operation_drag_n_drop();
this.app.saveFavourites(favouritesList);
this.app.loadFavourites();
this.app.populateOperationsList();
this.manager.recipe.initialiseOperationDragNDrop();
};
@ -247,37 +247,37 @@ OperationsWaiter.prototype.save_favourites_click = function() {
* Handler for reset favourites click events.
* Resets favourites to their defaults.
*/
OperationsWaiter.prototype.reset_favourites_click = function() {
this.app.reset_favourites();
OperationsWaiter.prototype.resetFavouritesClick = function() {
this.app.resetFavourites();
};
/**
* Handler for op_icon mouseover events.
* Handler for opIcon mouseover events.
* Hides any popovers already showing on the operation so that there aren't two at once.
*
* @param {event} e
*/
OperationsWaiter.prototype.op_icon_mouseover = function(e) {
var op_el = e.target.parentNode;
OperationsWaiter.prototype.opIconMouseover = function(e) {
var opEl = e.target.parentNode;
if (e.target.getAttribute("data-toggle") === "popover") {
$(op_el).popover("hide");
$(opEl).popover("hide");
}
};
/**
* Handler for op_icon mouseleave events.
* Handler for opIcon mouseleave events.
* If this icon created a popover and we're moving back to the operation element, display the
* operation popover again.
*
* @param {event} e
*/
OperationsWaiter.prototype.op_icon_mouseleave = function(e) {
var op_el = e.target.parentNode,
to_el = e.toElement || e.relatedElement;
OperationsWaiter.prototype.opIconMouseleave = function(e) {
var opEl = e.target.parentNode,
toEl = e.toElement || e.relatedElement;
if (e.target.getAttribute("data-toggle") === "popover" && to_el === op_el) {
$(op_el).popover("show");
if (e.target.getAttribute("data-toggle") === "popover" && toEl === opEl) {
$(opEl).popover("show");
}
};