Skip to content

Added descriptions, Commit Changes button enabled and dumped dupe names on Copy #15

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

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

Added descriptions, Commit Changes button enabled and dumped dupe names on Copy #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd75166
Added support for description field to labels. Made Commit Changes b…
dhunt84971 Jun 5, 2020
c795cdf
Fixed error with Add new label.
dhunt84971 Jun 5, 2020
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
33 changes: 29 additions & 4 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,36 @@ $(document).ready(function () {
return "Basic " + Base64.encode(username + ":" + password);
}

function createNewLabelEntry(label, mode) {
function nameExists(name) {
return new Promise((resolve, reject) => {
var found = false;
$('.label-entry').each(function(index) {
var labelObject = serializeLabel($(this));
if (labelObject.name == name){
found = true;
};
});
resolve(found);
return found;
});
}

async function createNewLabelEntry(label, mode) {

var action = ' action="none" ';
var uncommitedSignClass = "";

if(mode === 'copy' || mode === 'new'){
// see if the name already exists. If it does the default action will be to skip it.
if(mode === 'copy'){
var exists = await nameExists(label.name);
if (exists) return; // Don't create the label entry.
}

action = ' action="create" new="true" ';
uncommitedSignClass = ' uncommited ';
}

if(label === undefined || label === null){
label = {
name: "",
Expand All @@ -197,6 +217,7 @@ $(document).ready(function () {
}

var origNameVal = ' orig-val="' + label.name + '"';
var origDescriptionVal = ' orig-val="' + label.description + '"';
var origColorVal = ' orig-val="' + label.color + '"';

var newElementEntry = $('\
Expand All @@ -205,6 +226,7 @@ $(document).ready(function () {
<span class="sharp-sign">#</span>\
<input name="color" type="text" class="input-small color-box" placeholder="Color" value="' + label.color + '" ' + origColorVal + '>\
<button type="button" class="btn btn-danger delete-button">Delete</button>\
<input name="description" type="text" class="input-large" placeholder="Description" value="' + label.description + '" ' + origDescriptionVal + '>\
</div>\
');

Expand Down Expand Up @@ -359,6 +381,8 @@ $('#copyFromRepoButton').click(function(e) {
if(username && repo){
apiCallListLabels(username, repo, 'copy', function(response) {
theButton.button('reset');
$('#commitButton').removeAttr('disabled');
$('#commitButton').removeClass('disabled');
});//set addUncommited to true because those are coming from another repo
}
else{
Expand Down Expand Up @@ -406,10 +430,11 @@ $('#commitButton').click(function(e) {
/**
* Makes a label entry out of a div having the class .label-entry
*/
function serializeLabel(jObjectLabelEntry) {
function serializeLabel(jObjectLabelEntry) {
return {
name: jObjectLabelEntry.children().filter('[name="name"]').val(),
color: jObjectLabelEntry.children().filter('[name="color"]').val(),
description: jObjectLabelEntry.children().filter('[name="description"]').val(),
originalName: jObjectLabelEntry.children().filter('[name="name"]').attr('orig-val')
};
}
Expand Down Expand Up @@ -611,4 +636,4 @@ $('#commitButton').click(function(e) {

};//end of Base64

}); //end of doc ready
}); //end of doc ready