tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge pull request #332 from acusti/dev

Browse source 
Styling plus a couple small fixes for issue attachments (& misc cleanup)
This commit is contained in:
无闻 2014-07-26 13:55:32 -04:00
commit 02a81ddb62
2 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
public/css/gogs.css
View file

@ -1826,21 +1826,24 @@ body {
} }
#attached { #attached {
height: 18px; margin: 10px 0 15px;
margin: 10px 10px 15px 10px;
} }
#attached-list .label { #attached-list .label {
display: inline-block;
vertical-align: top;
margin-right: 10px; margin-right: 10px;
padding-right: 0;
}
#attached-list .label .attachment-remove {
cursor: pointer;
}
#attached-list .label .attachment-remove:hover {
background: #d8d8d8;
} }
#issue-create-form #attached { #issue-create-form #attached {
margin-bottom: 0; margin-bottom: 0;
} }
#submit-error {
display: none;
padding: 10px 15px 15px 15px;
font-weight: bold;
text-align: center;
}

38
public/js/app.js
View file

@ -470,8 +470,8 @@ function initRepository() {
function initInstall() { function initInstall() {
// database type change // database type change
(function () { (function () {
var mysql_default = '127.0.0.1:3306' var mysql_default = '127.0.0.1:3306';
var postgres_default = '127.0.0.1:5432' var postgres_default = '127.0.0.1:5432';
$('#install-database').on("change", function () { $('#install-database').on("change", function () {
var val = $(this).val(); var val = $(this).val();
@ -621,11 +621,9 @@ function initIssue() {
// Upload. // Upload.
(function() { (function() {
var $attachedList = $("#attached-list"); var $attachedList = $("#attached-list");
var $addButton = $("#attachments-button"); var $addButton = $("#attachments-button");
var files = [];
var files = []; var fileInput = document.getElementById("attachments-input");
var fileInput = document.getElementById("attachments-input");
if (fileInput === null) { if (fileInput === null) {
return; return;
@ -637,21 +635,21 @@ function initIssue() {
files.splice($parent.data("index"), 1); files.splice($parent.data("index"), 1);
$parent.remove(); $parent.remove();
}); });
var clickedButton = undefined; var clickedButton;
$("button,input[type=\"submit\"]", fileInput.form).on("click", function() { $('#issue-reply-btn,input[type="submit"]', fileInput.form).on('click', function() {
clickedButton = this; clickedButton = this;
var $button = $(this); var $button = $(this);
$button.removeClass("btn-success"); $button.removeClass("btn-success btn-default");
$button.addClass("btn-warning"); $button.addClass("btn-warning");
$button.text("Submiting..."); $button.text("Submitting…");
}); });
fileInput.form.addEventListener("submit", function(event) { fileInput.form.addEventListener("submit", function(event) {
event.stopImmediatePropagation(); event.stopImmediatePropagation();
event.preventDefault(); event.preventDefault();
@ -677,7 +675,7 @@ function initIssue() {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.addEventListener("error", function() { xhr.addEventListener("error", function() {
debugger; console.log("Issue submit request failed. xhr.status: " + xhr.status);
}); });
xhr.addEventListener("load", function() { xhr.addEventListener("load", function() {
@ -700,7 +698,7 @@ function initIssue() {
$button.removeClass("btn-warning"); $button.removeClass("btn-warning");
$button.addClass("btn-danger"); $button.addClass("btn-danger");
$button.text("An error encoured!") $button.text("An error occurred!");
return; return;
} }
@ -728,7 +726,7 @@ function initIssue() {
return false; return false;
}); });
fileInput.addEventListener("change", function(event) { fileInput.addEventListener("change", function() {
for (var index = 0; index < fileInput.files.length; index++) { for (var index = 0; index < fileInput.files.length; index++) {
var file = fileInput.files[index]; var file = fileInput.files[index];
@ -754,9 +752,9 @@ function initIssue() {
this.value = ""; this.value = "";
}); });
$addButton.on("click", function() { $addButton.on("click", function(evt) {
fileInput.click(); fileInput.click();
return false; evt.preventDefault();
}); });
}()); }());
@ -769,7 +767,7 @@ function initIssue() {
$('.issue-edit-cancel').on("click", function () { $('.issue-edit-cancel').on("click", function () {
$('#issue h1.title,#issue .issue-main > .issue-content .content,#issue-edit-btn').toggleShow(); $('#issue h1.title,#issue .issue-main > .issue-content .content,#issue-edit-btn').toggleShow();
$('#issue-edit-title,.issue-edit-content,.issue-edit-cancel,.issue-edit-save').toggleHide(); $('#issue-edit-title,.issue-edit-content,.issue-edit-cancel,.issue-edit-save').toggleHide();
}) });
}()); }());
// issue ajax update // issue ajax update