mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Refactor away this poorly named and overloaded file

Browse source
This commit is contained in:
lilia 2014-08-31 18:17:54 -07:00
parent b9640a54bd
commit ad7456b367
3 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -154,7 +154,7 @@
<script type="text/javascript" src="js/views/conversation_list_view.js"></script> <script type="text/javascript" src="js/views/conversation_list_view.js"></script>
<script type="text/javascript" src="js/views/conversation_view.js"></script> <script type="text/javascript" src="js/views/conversation_view.js"></script>
<script type="text/javascript" src="js/views/new_conversation_view.js"></script> <script type="text/javascript" src="js/views/new_conversation_view.js"></script>
<script type="text/javascript" src="js/views/new_message_button.js"></script> <script type="text/javascript" src="js/views/new_group_view.js"></script>
<script type="text/javascript" src="js/popup.js"></script> <script type="text/javascript" src="js/popup.js"></script>
</body> </body>
</html> </html>

22
js/popup.js
View file

@ -21,12 +21,26 @@ Whisper.Layout = new (Backbone.View.extend({
this.resize(); this.resize();
new Whisper.ConversationListView({el: $('#contacts')}); new Whisper.ConversationListView({el: $('#contacts')});
new Whisper.Header({el: $('#header')}); window.addEventListener('resize', this.resize.bind(this));
Whisper.Threads.fetch({reset: true}); Whisper.Threads.fetch({reset: true});
}, },
events: { events: {
'resize': 'resize' 'click #new-message': 'new_message',
}, 'click #new-group': 'new_group'
},
new_message: function(e) {
e.preventDefault();
$('.conversation').hide().trigger('close'); // detach any existing conversation views
this.view = new Whisper.NewConversationView();
//todo: less new
},
new_group: function(e) {
e.preventDefault();
$('.conversation').trigger('close'); // detach any existing conversation views
new Whisper.NewGroupView({ el: $('.conversation') });
},
resize: function (e) { resize: function (e) {
var windowheight = window.innerHeight; var windowheight = window.innerHeight;
var form = $('.send-message-area').outerHeight(); var form = $('.send-message-area').outerHeight();
@ -45,7 +59,7 @@ Whisper.Layout = new (Backbone.View.extend({
$(content).insertAfter(this.gutter); $(content).insertAfter(this.gutter);
this.resize(); this.resize();
} }
}))({el: window}); }))({el: document});
textsecure.registerOnLoadFunction(function() { textsecure.registerOnLoadFunction(function() {
if (textsecure.storage.getUnencrypted("number_id") === undefined) { if (textsecure.storage.getUnencrypted("number_id") === undefined) {

20
js/views/new_message_button.js → js/views/new_group_view.js
View file

@ -43,24 +43,4 @@ var Whisper = Whisper || {};
} }
}); });
Whisper.Header = Backbone.View.extend({
events: {
'click #new-message': 'new_message',
'click #new-group': 'new_group'
},
new_message: function(e) {
e.preventDefault();
$('.conversation').hide().trigger('close'); // detach any existing conversation views
this.view = new Whisper.NewConversationView();
//todo: less new
},
new_group: function(e) {
e.preventDefault();
$('.conversation').trigger('close'); // detach any existing conversation views
new Whisper.NewGroupView({ el: $('.conversation') });
}
});
})(); })();