mirror/0bin
1
0
Fork 0
mirror of https://github.com/Tygs/0bin.git synced 2023-08-10 21:13:00 +03:00
Code Issues Projects Releases Wiki Activity

Post merge fixes

Browse Source
This commit is contained in:
ksamuel 2020-08-12 10:19:31 +02:00
parent 933118c1cd
commit 601aa5a16b
2 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zerobin/static/js/behavior.js
View File

@ -336,13 +336,13 @@ window.zerobin = {
if (doneCallback) { if (doneCallback) {
doneCallback(content); doneCallback(content);
} }
}, 50); }, 250);
}, 50); }, 250);
}, 50); }, 250);
}, 50); }, 250);
}, },
/** Base64 decoding + uncompress + decrypt, with callbacks before each operation, /** Base64 decoding + uncompress + decrypt, with callbacks before each operation,
@ -391,25 +391,25 @@ window.zerobin = {
errorCallback(err); errorCallback(err);
} }
}, 50); /* "End of from bits to string" */ }, 250); /* "End of from bits to string" */
} catch (err) { } catch (err) {
errorCallback(err); errorCallback(err);
} }
}, 50); /* End of "from base 64 to bits" */ }, 250); /* End of "from base 64 to bits" */
} catch (err) { } catch (err) {
errorCallback(err); errorCallback(err);
} }
}, 50); /* End of "decompress" */ }, 250); /* End of "decompress" */
} catch (err) { } catch (err) {
errorCallback(err); errorCallback(err);
} }
}, 50); /* End of "decrypt" */ }, 250); /* End of "decrypt" */
}, },
/** Create a random base64-like string long enought to be suitable as /** Create a random base64-like string long enought to be suitable as
@ -629,7 +629,7 @@ window.zerobin = {
} }
} }
return total * 1000 / size; return total * 250 / size;
}, },
// prevent defaults // prevent defaults

105
zerobin/views/paste.tpl
View File

@ -23,35 +23,37 @@
<form action="/" method="get" accept-charset="utf-8"> <form action="/" method="get" accept-charset="utf-8">
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between">
<div class="btn-group" role="group" > <div class="btn-group" role="group">
<button v-if="support.clipboard" @click.prevent="copyToClipboard()" type="button" id="clip-button" class="btn btn-secondary">Copy To Clipboard</button> <button v-if="support.clipboard" @click.prevent="copyToClipboard()" type="button" id="clip-button"
<button type="button" id="email-link" class="btn btn-secondary" @click="handleSendByEmail($event)>Email this</button> class="btn btn-secondary">Copy To Clipboard</button>
<button type="button" id="email-link" class="btn btn-secondary" @click="handleSendByEmail($event)">Email
this</button>
</div> </div>
<div> <div>
<span class="paste-option btn-group"> <span class="paste-option btn-group">
<button class="btn btn-clone btn-secondary" @click.prevent="handleClone()">Clone</button> <button class="btn btn-clone btn-secondary" @click.prevent="handleClone()">Clone</button>
<button class="btn btn-secondar" v-if="downloadLink.url">
<a :href="downloadLink.url" :download="downloadLink.name"> Download</a>
</button>
<button class="btn btn-secondary">New Paste</button> <button class="btn btn-secondar" v-if="downloadLink.url">
<a :href="downloadLink.url" :download="downloadLink.name"> Download</a>
</button>
<button class="btn btn-secondary">New Paste</button>
</span> </span>
</div> </div>
</div> </div>
<div class="progress-container"> <div class="progress-container">
<div class="progress progress-bar progress-bar-striped active" v-show="isLoading"> <div class="progress progress-bar progress-bar-striped active" v-show="isLoading">
<div class="bar"></div> <div class="bar"></div>
</div> </div>
</div> </div>
%expiration = paste.humanized_expiration %expiration = paste.humanized_expiration
%if expiration: %if expiration:
<span id="expiration-tag">Expire {{ expiration }}</span> <span id="expiration-tag">Expire {{ expiration }}</span>
%end %end
<pre id="paste-content" class="prettyprint"> <pre id="paste-content" class="prettyprint">
@ -61,20 +63,20 @@
</pre> </pre>
<div class="d-flex justify-content-between down"> <div class="d-flex justify-content-between down">
<div v-if="currentPaste.ownerKey"> <div v-if="currentPaste.ownerKey">
<button class="btn btn-clone btn-secondary" @click="handleDeletePaste()">Delete Paste</button> <button class="btn btn-clone btn-secondary" @click="handleDeletePaste()">Delete Paste</button>
</div> </div>
<div> <div>
<span class="paste-option btn-group"> <span class="paste-option btn-group">
<button class="btn btn-clone btn-secondary" @click.prevent="handleClone()">Clone</button> <button class="btn btn-clone btn-secondary" @click.prevent="handleClone()">Clone</button>
<button class="btn btn-secondar" v-if="downloadLink.url">
<a :href="downloadLink.url" :download="downloadLink.name"> Download</a>
</button>
<button class="btn btn-secondary">New Paste</button> <button class="btn btn-secondar" v-if="downloadLink.url">
<a :href="downloadLink.url" :download="downloadLink.name"> Download</a>
</button>
<button class="btn btn-secondary">New Paste</button>
</span> </span>
</div> </div>
</div> </div>
</form> </form>
@ -85,68 +87,67 @@
<form class="well" method="post" action="/paste/create" @submit.prevent="encryptAndSendPaste()"> <form class="well" method="post" action="/paste/create" @submit.prevent="encryptAndSendPaste()">
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between">
<div> <div>
<label class="col-form-label">&nbsp;</label> <label class="col-form-label">&nbsp;</label>
<div class="file-upload"> <div class="file-upload">
<button type="button" class="btn btn-danger" @click.prevent="handleCancelClone()">Cancel clone</button> <button type="button" class="btn btn-danger" @click.prevent="handleCancelClone()">Cancel clone</button>
</div> </div>
</div> </div>
<div class="form-group select-date-clone paste-option"> <div class="form-group select-date-clone paste-option">
<label class="col-form-label" >Expiration:</label> <label class="col-form-label">Expiration:</label>
<div class="input-group"> <div class="input-group">
<select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration"> <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
<option value="burn_after_reading">Burn after reading</option> <option value="burn_after_reading">Burn after reading</option>
<option selected value="1_day">1 day</option> <option selected value="1_day">1 day</option>
<option value="1_month">1 month</option> <option value="1_month">1 month</option>
<option value="never">Never</option> <option value="never">Never</option>
</select> </select>
<div class="input-group-append"> <div class="input-group-append">
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="progress-container progress-clone" > </div>
<div class="progress progress-bar progress-bar-striped active" v-show="isLoading">
<div class="progress-container progress-clone">
<div class="progress progress-bar progress-bar-striped active" v-show="isLoading">
<div class="bar"></div> <div class="bar"></div>
</div> </div>
</div> </div>
<div> <div>
<textarea rows="10" style="width:100%;" <textarea rows="10" style="width:100%;" class=" form-control" @keydown.prevent.ctrl.enter="encryptAndSendPaste()"
class=" form-control" @keydown.prevent.ctrl.enter="encryptAndSendPaste()" id="content" name="content"></textarea>
id="content" name="content"></textarea>
</div> </div>
<div class="d-flex justify-content-between" v-if="displayBottomToolBar">> <div class="d-flex justify-content-between" v-if="displayBottomToolBar">>
<div> <div>
<label class="col-form-label">&nbsp;</label> <label class="col-form-label">&nbsp;</label>
<div class="file-upload"> <div class="file-upload">
<button type="button" class="btn btn-danger" @click.prevent="handleCancelClone()">Cancel clone</button> <button type="button" class="btn btn-danger" @click.prevent="handleCancelClone()">Cancel clone</button>
</div> </div>
</div> </div>
<div class="form-group select-date-clone paste-option"> <div class="form-group select-date-clone paste-option">
<label class="col-form-label" >Expiration:</label> <label class="col-form-label">Expiration:</label>
<div class="input-group"> <div class="input-group">
<select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration"> <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
<option value="burn_after_reading">Burn after reading</option> <option value="burn_after_reading">Burn after reading</option>
<option selected value="1_day">1 day</option> <option selected value="1_day">1 day</option>
<option value="1_month">1 month</option> <option value="1_month">1 month</option>
<option value="never">Never</option> <option value="never">Never</option>
</select> </select>
<div class="input-group-append"> <div class="input-group-append">
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>