mirror of
https://git.teknik.io/Teknikode/Teknik.git
synced 2023-08-02 14:16:22 +02:00
Fixed url shorten button not capturing current url
This commit is contained in:
parent
80fd82a5e3
commit
ab9f813cd7
@ -15,8 +15,9 @@ function linkSaveKey(selector, uploadID, key, fileID) {
|
|||||||
success: function (html) {
|
success: function (html) {
|
||||||
if (html.result) {
|
if (html.result) {
|
||||||
$('#key-link-' + fileID).html('<button type="button" class="btn btn-default btn-sm" id="remove-key-link-' + fileID + '">Remove Key From Server</button>');
|
$('#key-link-' + fileID).html('<button type="button" class="btn btn-default btn-sm" id="remove-key-link-' + fileID + '">Remove Key From Server</button>');
|
||||||
$('#upload-link-' + fileID).html('<p><a href="' + html.result + '" target="_blank" class="alert-link">' + html.result + '</a></p>');
|
$('#upload-link-' + fileID).html('<p><a href="' + html.result + '" id="full-url-link-' + fileID + '" target="_blank" class="alert-link">' + html.result + '</a></p>');
|
||||||
linkRemoveKey('#remove-key-link-' + fileID + '', uploadID, key, fileID);
|
linkRemoveKey('#remove-key-link-' + fileID + '', uploadID, key, fileID);
|
||||||
|
$('#shortenUrl-button-' + fileID).prop('disabled', false);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("#top_msg").css('display', 'inline', 'important');
|
$("#top_msg").css('display', 'inline', 'important');
|
||||||
@ -37,8 +38,9 @@ function linkRemoveKey(selector, uploadID, key, fileID) {
|
|||||||
success: function (html) {
|
success: function (html) {
|
||||||
if (html.result) {
|
if (html.result) {
|
||||||
$('#key-link-' + fileID).html('<button type="button" class="btn btn-default btn-sm" id="save-key-link-' + fileID + '">Save Key To Server</button>');
|
$('#key-link-' + fileID).html('<button type="button" class="btn btn-default btn-sm" id="save-key-link-' + fileID + '">Save Key To Server</button>');
|
||||||
$('#upload-link-' + fileID).html('<p><a href="' + html.result + '#' + key + '" target="_blank" class="alert-link">' + html.result + '#' + key + '</a></p>');
|
$('#upload-link-' + fileID).html('<p><a href="' + html.result + '#' + key + '" id="full-url-link-' + fileID + '" target="_blank" class="alert-link">' + html.result + '#' + key + '</a></p>');
|
||||||
linkSaveKey('#save-key-link-' + fileID + '', uploadID, key, fileID);
|
linkSaveKey('#save-key-link-' + fileID + '', uploadID, key, fileID);
|
||||||
|
$('#shortenUrl-button-' + fileID).prop('disabled', false);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("#top_msg").css('display', 'inline', 'important');
|
$("#top_msg").css('display', 'inline', 'important');
|
||||||
@ -76,6 +78,7 @@ function linkUploadDelete(selector, uploadID) {
|
|||||||
|
|
||||||
function linkShortenUrl(selector, fileID, url) {
|
function linkShortenUrl(selector, fileID, url) {
|
||||||
$(selector).click(function () {
|
$(selector).click(function () {
|
||||||
|
var url = $('#full-url-link-' + fileID).html();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: shortenURL,
|
url: shortenURL,
|
||||||
@ -83,7 +86,7 @@ function linkShortenUrl(selector, fileID, url) {
|
|||||||
success: function (html) {
|
success: function (html) {
|
||||||
if (html.result) {
|
if (html.result) {
|
||||||
$(selector).prop('disabled', true);
|
$(selector).prop('disabled', true);
|
||||||
$('#upload-link-' + fileID).html('<p><a href="' + html.result.shortUrl + '" target="_blank" class="alert-link">' + html.result.shortUrl + '</a></p>');
|
$('#upload-link-' + fileID).html('<p><a href="' + html.result.shortUrl + '" id="full-url-link-' + fileID + '" target="_blank" class="alert-link">' + html.result.shortUrl + '</a></p>');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("#top_msg").css('display', 'inline', 'important');
|
$("#top_msg").css('display', 'inline', 'important');
|
||||||
@ -296,7 +299,7 @@ function uploadComplete(fileID, key, saveKey, serverSideEncrypt, evt) {
|
|||||||
}
|
}
|
||||||
$('#progress-' + fileID).children('.progress-bar').css('width', '100%');
|
$('#progress-' + fileID).children('.progress-bar').css('width', '100%');
|
||||||
$('#progress-' + fileID).children('.progress-bar').html('Complete');
|
$('#progress-' + fileID).children('.progress-bar').html('Complete');
|
||||||
$('#upload-link-' + fileID).html('<p><a href="' + fullName + '" target="_blank" class="alert-link">' + fullName + '</a></p>');
|
$('#upload-link-' + fileID).html('<p><a href="' + fullName + '" id="full-url-link-' + fileID + '" target="_blank" class="alert-link">' + fullName + '</a></p>');
|
||||||
var keyBtn = '<div class="col-sm-4 text-center" id="key-link-' + fileID + '"> \
|
var keyBtn = '<div class="col-sm-4 text-center" id="key-link-' + fileID + '"> \
|
||||||
<button type="button" class="btn btn-default btn-sm" id="save-key-link-' + fileID + '">Save Key On Server</button> \
|
<button type="button" class="btn btn-default btn-sm" id="save-key-link-' + fileID + '">Save Key On Server</button> \
|
||||||
</div>';
|
</div>';
|
||||||
|
Loading…
Reference in New Issue
Block a user