colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load notifications script from background page

Browse Source
This commit is contained in:
lilia
2015-05-12 17:07:13 -07:00
parent f90f6328dd
commit ddbaf87741
2 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/options.js
View File

@@ -15,18 +15,19 @@
*/ */
;(function() { ;(function() {
'use strict'; 'use strict';
extension.windows.getBackground(function(bg) {
$('.notifications .on button').click(function() { $('.notifications .on button').click(function() {
Whisper.Notifications.disable(); bg.Whisper.Notifications.disable();
initOptions(); initOptions();
}); });
$('.notifications .off button').click(function() { $('.notifications .off button').click(function() {
Whisper.Notifications.enable(initOptions); bg.Whisper.Notifications.enable(initOptions);
initOptions(); initOptions();
}); });
function initOptions() { function initOptions() {
if (Whisper.Notifications.isEnabled()) { if (bg.Whisper.Notifications.isEnabled()) {
$('.notifications .on').show(); $('.notifications .on').show();
$('.notifications .off').hide(); $('.notifications .off').hide();
} else { } else {
@@ -69,7 +70,6 @@
}); });
$(function() { $(function() {
extension.windows.getBackground(function(bg) {
if (bg.textsecure.registration.isDone()) { if (bg.textsecure.registration.isDone()) {
$('#complete-number').text(bg.textsecure.storage.user.getNumber()); $('#complete-number').text(bg.textsecure.storage.user.getNumber());
$('#setup-complete').show().addClass('in'); $('#setup-complete').show().addClass('in');

1
options.html
View File

@@ -117,7 +117,6 @@
<script type="text/javascript" src="js/components.js"></script> <script type="text/javascript" src="js/components.js"></script>
<script type="text/javascript" src="js/database.js"></script> <script type="text/javascript" src="js/database.js"></script>
<script type="text/javascript" src="js/notifications.js"></script>
<script type="text/javascript" src="js/libphonenumber-util.js"></script> <script type="text/javascript" src="js/libphonenumber-util.js"></script>
<script type="text/javascript" src="js/models/messages.js"></script> <script type="text/javascript" src="js/models/messages.js"></script>
<script type="text/javascript" src="js/models/conversations.js"></script> <script type="text/javascript" src="js/models/conversations.js"></script>