Skip to content

Confidential Mode and 10s Expiration for the lol #82

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
jstuyck wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Confidential Mode and 10s Expiration for the lol #82

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e3d64f
Add the confidential mode and the 10s mode
Oct 1, 2014
96e74d0
Add the confidential mode
Oct 1, 2014
48b8960
Add function to hide clone button if confidetial
Oct 1, 2014
9d5dc6e
Confidential mode
Oct 1, 2014
0cac369
Confidential mode bug
Oct 1, 2014
9f8e801
Dont clone if confidential
Oct 1, 2014
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
Prev Previous commit
Next Next commit
Add function to hide clone button if confidetial
  • Loading branch information
Julien Stuyck committed Oct 1, 2014
commit 48b89601c32d1130870af14f33e59ab6b43ba19d
5 changes: 3 additions & 2 deletions js/zerobin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ function send_data() {
burnafterreading: $('input#burnafterreading').is(':checked') ? 1 : 0,
opendiscussion: $('input#opendiscussion').is(':checked') ? 1 : 0,
syntaxcoloring: $('input#syntaxcoloring').is(':checked') ? 1 : 0,
condfidential: $('input#confidential').is(':checked') ? 1 : 0
confidential: $('input#confidential').is(':checked') ? 1 : 0
};
$.post(scriptLocation(), data_to_send, 'json')
.error(function() {
Expand Down Expand Up @@ -432,12 +432,13 @@ function stateExistingPaste() {
$('button#sendbutton').hide();

// No "clone" for IE<10.
if ($('div#oldienotice').is(":visible")) {
if ($('div#oldienotice').is(":visible") || comments[0].meta.confidential ) {
$('button#clonebutton').hide();
}
else {
$('button#clonebutton').show();
}

$('button#rawtextbutton').show();

$('div#expiration').hide();
Expand Down
4 changes: 2 additions & 2 deletions tpl/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ <h3>{$VERSION}</h3>
<option value="10sec">10 seconds</option>
<option value="5min">5 minutes</option>
<option value="10min">10 minutes</option>
<option value="1hour">1 hour</option>
<option value="1hour" selected="selected">1 hour</option>
<option value="1day">1 day</option>
<option value="1week">1 week</option>
<option value="1month" selected="selected">1 month</option>
<option value="1month">1 month</option>
<option value="1year">1 year</option>
<option value="never">Never</option>
</select>
Expand Down