Skip to content

Commit

Permalink
Work on adapt-it#100
Browse files Browse the repository at this point in the history 
Delete confirmation dialog
  • Loading branch information
@eb1
eb1 committed Oct 21, 2020
1 parent abfc047 commit fd488fa
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 15 deletions.
45 changes: 31 additions & 14 deletions www/js/views/ProjectViews.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ define(function (require) {
var htmlstring = "",
filter = this.model.get('FilterMarkers'),
value = "false";
USFMMarkers.each(function (item, index, list) {
USFMMarkers.each(function (item, index) {
if (item.get('userCanSetFilter') && item.get('userCanSetFilter') === '1') {
value = (filter.indexOf("\\" + item.get('name') + " ") >= 0) ? "true" : "false";
htmlstring += "<tr><td><label class='topcoat-checkbox'><input class='c' type='checkbox' id='filter-" + index + " value='" + value;
Expand Down Expand Up @@ -905,10 +905,11 @@ define(function (require) {
"click #btnProjSelect": "onSelectProject",
"click #btnProjDelete": "onDeleteProject"
},
// User clicked the "switch to this project" button. Sets the current project to the selected project, clears the
// local translation stuff (so it reloads the proper project info from the DB), and navigates to the home screen.
onSelectProject: function (event) {
event.stopPropagation();
var index = event.currentTarget.parentElement.parentElement.id.substr(4);
// TODO: confirm
window.Application.currentProject = window.Application.ProjectList.at(index);
localStorage.setItem("CurrentProjectID", window.Application.currentProject.get("projectid"));
// Clear out any local chapter/book/sourcephrase/KB stuff so it loads
Expand All @@ -919,21 +920,41 @@ define(function (require) {
window.Application.kbList.length = 0;
// head back to the home page
window.location.replace("");

},
// User clicked the Delete project. Confirms the delete intent, and then calls reallyDeleteProj() to actually delete it.
onDeleteProject: function (event) {
event.stopPropagation();
var index = event.currentTarget.parentElement.parentElement.id.substr(4);
var proj = window.Application.ProjectList.at(index);
// TODO: confirm
window.Application.ProjectList.remove(proj); // remove from the collection
proj.destroy(); // also deletes everything associated with this project
// confirm with the user -- this nukes the project and everything related to it
// (translation work and KB)
if (navigator.notification) {
// on mobile device
navigator.notification.confirm(i18n.t('view.dscWarnRemoveProject'), function (buttonIndex) {
if (buttonIndex === 1) {
this.reallyDeleteProj(proj);
}
}, i18n.t('view.lblRemoveProject'));
} else {
// in browser
if (confirm(i18n.t('view.dscWarnRemoveProject'))) {
this.reallyDeleteProj(proj);
}
}
},
// does the dirty work of deleting the project, after the user has confirmed the intent (above)
reallyDeleteProj: function (project) {
window.Application.ProjectList.remove(project); // remove from the collection
project.destroy(); // also deletes everything associated with this project
this.showProjects(); // redraw the UI
},
// User clicked the Add Project... toggle button. Just shows/hides the clickable area where the user can either
// create or copy a project
onAddProject: function () {
// Toggle "create new from..." action area
$("#projNewActions").toggleClass("hide");
},
// User clicked on a project in the list -- shows / hides the available actions for the selected project.
onClickProject: function (event) {
var SELECT_BTN = "<div class=\"control-row\"><button id=\"btnProjSelect\" class=\"btnSelect\" title=\"" + i18n.t("view.lblSelectProject") + "\"><span class=\"btn-check\" role=\"img\"></span>" + i18n.t("view.lblSelectProject") + "</button></div>",
DELETE_BTN = "<div class=\"control-row\"><button id=\"btnProjDelete\" title=\"" + i18n.t("view.lblRemoveProject") + "\" class=\"btnDelete\"><span class=\"btn-delete\" role=\"img\"></span>" + i18n.t("view.lblRemoveProject") + "</button></div>",
Expand All @@ -960,6 +981,7 @@ define(function (require) {
}
}
},
// iterates through the project list. If there's only one, hides the list
showProjects: function () {
var projHtml = "";
if (window.Application.ProjectList.length === 1) {
Expand Down Expand Up @@ -1151,7 +1173,7 @@ define(function (require) {
OnCancel: function () {
// just display the project settings list (don't save)
$("#WizStepTitle").hide();
$("#StepInstructions").hide();
$("#StepInstructions").addClass("hide");
$("#tbBottom").addClass("hide");
$('#ProjectItems').show();
$("#StepTitle").html(i18n.t('view.lblProjectSettings'));
Expand All @@ -1165,7 +1187,7 @@ define(function (require) {
this.UpdateProject(step);
// show / hide the appropriate UI elements
$("#WizStepTitle").hide();
$("#StepInstructions").hide();
$("#StepInstructions").addClass("hide");
$("#tbBottom").addClass("hide");
$('#ProjectItems').show();
$("#StepTitle").html(i18n.t('view.lblProjectSettings'));
Expand Down Expand Up @@ -1308,7 +1330,7 @@ define(function (require) {
});
// hide the project list items
$("#WizStepTitle").show();
$("#StepInstructions").show();
$("#StepInstructions").removeClass("hide");
$("#editor").addClass("scroller-bottom-tb");
$("#editor").removeClass("scroller-notb");
$("#tbBottom").removeClass("hide");
Expand Down Expand Up @@ -1406,11 +1428,6 @@ define(function (require) {
$("#StepTitle").html(i18n.t('view.ttlProject'));
$("#ProjList").html(projList(window.Application.ProjectList));
break;
case 11: // new project
// instructions
currentView = new ProjAddNewView({model: this.model});
$("#StepTitle").html(i18n.t('view.ttlProject'));
break;
}
this.container.show(currentView);
}
Expand Down
3 changes: 2 additions & 1 deletion www/tpl/EditProject.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1 class="topcoat-navigation-bar__title bg-lightblue" id="StepTitle">{{t 'view.
</div>
<!-- <div class="container" style="height: calc(100% - 70px);"> -->
<div id="editor" class="topcoat-list__container scroller-notb">
<div class="Instructions control-row l-indent" id="StepInstructions"></div>
<div class="Instructions control-row l-indent hide" id="StepInstructions"></div>
<div id="StepContainer"></div>
<div id="ProjectItems">
<div class="topcoat-list__header" id="lblAllTrans">{{t 'view.lblGeneralSettings'}}</div>
Expand All @@ -34,6 +34,7 @@ <h1 class="topcoat-navigation-bar__title bg-lightblue" id="StepTitle">{{t 'view.
<span class="chevron"></span></a>
</li>
</ul>
<div class="control-row"></div>
<div class="topcoat-list__header" id="lblAllTrans">Current Project Settings</div>
<ul class="chapter-list topcoat-list__container">
<li class="topcoat-list__item">
Expand Down

0 comments on commit fd488fa

Please sign in to comment.