diff --git a/conversation.html b/conversation.html
new file mode 100644
index 00000000..a2cf79df
--- /dev/null
+++ b/conversation.html
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/index2.html b/index2.html
new file mode 100644
index 00000000..9571a887
--- /dev/null
+++ b/index2.html
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+ Signal for Chrome
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/js/background.js b/js/background.js
index 94bdc9f0..1ab2e5ed 100644
--- a/js/background.js
+++ b/js/background.js
@@ -56,6 +56,32 @@
request.respond(500, 'Bad encrypted websocket message');
});
});
+ var opened = false;
+ var panel = 0;
+
+ chrome.browserAction.onClicked.addListener(function () {
+ if (opened === false) {
+ opened = true;
+ chrome.windows.create({
+ url: 'index2.html',
+ type: 'panel',
+ focused: true,
+ width: 260, // 280 for chat
+ height: 440 // 420 for chat
+ }, function (window) {
+ var isPanelEnabled = window.alwaysOnTop;
+ panel = window.id;
+ });
+ } else if (opened === true) {
+ chrome.windows.update(panel, { focused: true });
+ }
+ chrome.windows.onRemoved.addListener(function (windowId) {
+ if (windowId === panel) {
+ panel = 0;
+ opened = false;
+ }
+ });
+ });
};
function onMessageReceived(pushMessage) {
@@ -196,5 +222,4 @@
console.log('got delivery receipt for unknown message', pushMessage.source, timestamp);
});
};
-
})();
diff --git a/js/conversation_panel.js b/js/conversation_panel.js
new file mode 100644
index 00000000..5d28581f
--- /dev/null
+++ b/js/conversation_panel.js
@@ -0,0 +1,57 @@
+/*global $, Whisper, Backbone, textsecure, extension*/
+/* vim: ts=4:sw=4:expandtab:
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+(function () {
+ 'use strict';
+
+ window.Whisper = window.Whisper || {};
+
+ function loadConversation (id) {
+ var conversation = new Whisper.Conversation({ id: id });
+ conversation.fetch().then(function () {
+ new Whisper.ConversationView({ model: conversation}).render().$el.appendTo($('#conversation-container'));
+ });
+
+ // clean 'er up
+ conversationInfo = undefined;
+ };
+
+ var conversationInfo = {
+ id: '',
+ idPairs: {}
+ };
+
+ extension.on('loadConversation', function (message) {
+ debugger;
+ if (conversationInfo.id) {
+ if (message.windowId === conversationInfo.id) {
+ loadConversation(message.conversationId);
+ }
+ } else {
+ conversationInfo.idPairs[message.windowId] = message.conversationId;
+ }
+ });
+
+ chrome.windows.getCurrent(function (windowInfo) {
+ window.document.title = conversationInfo.id = windowInfo.id;
+
+ var conversationId = conversationInfo.idPairs[conversationInfo.id];
+
+ if (typeof conversationId !== 'undefined') {
+ loadConversation(conversationId);
+ }
+ });
+}());
diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js
index fbd5d0d9..0107c050 100644
--- a/js/views/conversation_list_item_view.js
+++ b/js/views/conversation_list_item_view.js
@@ -19,6 +19,7 @@ var Whisper = Whisper || {};
(function () {
'use strict';
+ // list of conversations, showing user/group and last message sent
Whisper.ConversationListItemView = Backbone.View.extend({
tagName: 'div',
className: 'contact',
@@ -36,11 +37,28 @@ var Whisper = Whisper || {};
},
open: function(e) {
+ var modelId = this.model.id;
+
this.$el.addClass('selected');
if (!this.view) {
this.view = new Whisper.ConversationView({ model: this.model });
}
+
+ chrome.windows.create({
+ url: 'conversation.html#' + modelId,
+ type: 'panel',
+ focused: true,
+ width: 280,
+ height: 420
+ }, function (windowInfo) {
+ debugger;
+ extension.trigger('loadConversation', {
+ windowId: windowInfo.id,
+ conversationId: modelId
+ });
+ });
+
this.model.collection.trigger('selected', this.view);
},
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 9bd4bcf5..ce3b8469 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -37,8 +37,8 @@
this.view = new Whisper.MessageListView({
collection: this.model.messageCollection
});
- this.$el.find('.discussion-container').append(this.view.el);
-
+ $('#conversation-container').append(this.view.el);
+//new ...({el: $(#conversation-container)})
this.model.fetchMessages({reset: true});
},
@@ -83,7 +83,20 @@
}
},
+ /*addAll: function() {
+ this.collection.each(this.addOne);
+ },
+ addOne: function(model) {
+ var view = new Whisper.Message({model: model});
+ view.render();
+ $(this.el).append(view.el);
+ model.bind('remove', view.remove);
+ },*/
+
render: function() {
+ //this.$el.empty();
+ //this.addAll();
+
this.delegateEvents();
this.view.delegateEvents();
this.view.scrollToBottom();
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 85455b26..7cffb296 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -22,9 +22,7 @@
initialize: function () {
this.gutter = $('#gutter');
this.contacts = $('#contacts');
- this.resize();
- window.addEventListener('resize', this.resize.bind(this));
this.conversations = new Whisper.ConversationCollection();
new Whisper.ConversationListView({
@@ -70,23 +68,8 @@
});
this.setContent(view.render().$el.show());
},
- resize: function (e) {
- var windowheight = window.innerHeight,
- form = $('.send-message-area').outerHeight(),
- gutter_offset = this.gutter.offset().top,
- contacts_offset = this.contacts.offset().top;
- if (window.innerWidth < 480) {
- this.gutter.css('height', windowheight - gutter_offset - form);
- this.contacts.css('height', windowheight - contacts_offset - form);
- } else {
- this.gutter.css('height', windowheight - gutter_offset);
- this.contacts.css('height', windowheight - contacts_offset);
- }
- $('.discussion').css('height', windowheight - gutter_offset - form);
- },
setContent: function (content) {
$(content).insertAfter(this.gutter);
- this.resize();
}
});
diff --git a/manifest.json b/manifest.json
index 555dd29b..97d12b48 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,7 +16,7 @@
"default_icon": {
"19": "icon.png"
},
- "default_popup": "index.html"
+ "default_title": "TextSecure"
},
"background": {
diff --git a/stylesheets/_gutter.scss b/stylesheets/_gutter.scss
deleted file mode 100644
index e9a43112..00000000
--- a/stylesheets/_gutter.scss
+++ /dev/null
@@ -1,73 +0,0 @@
-
-.gutter {
- float:left;
- border-right:1px solid lightgray;
- width:240px;
- position:relative;
- background-color:blue;
- z-index:100;
- .contact {
- float:left;
- width:100%;
- border-bottom:1px solid whitesmoke;
- color:#333;
- &:hover {
- background-color:whitesmoke;
- margin-top:-1px;
- border-bottom:1px solid lightgray;
- border-top:1px solid lightgray;
- }
- }
- .contact-details {
- position:relative;
- width:156px;
- float:left;
- text-align: left;
- h3 {
- font-size:13px;
- margin-bottom:4px;
- }
- .last-message {
- color:lighten(#333, 40%);
- letter-spacing:0.15px;
- -webkit-text-stroke: 0.2px;
- margin:0;
- font-size: 12px;
- }
- .last-timestamp {
- position:absolute;
- top:14px;
- right:8px;
- font-size:12px;
- font-weight: 500;
- color:gray;
- }
- }
-}
-.avatar {
- cursor:pointer;
- height:56px;
- width:56px;
- display:inline-block;
- margin:10px;
- margin-right:14px;
- float:left;
- clear:both;
- background-color:whitesmoke;
-}
-
-.search {
- padding:10px;
- border-bottom:1px solid whitesmoke;
- input[type=search] {
- box-sizing: border-box;
- font-size:12px;
- outline:0;
- width:100%;
- margin:0;
- letter-spacing: 0.25px;
- padding:4px 8px;
- border:1px solid lightgray;
- }
-}
-
diff --git a/stylesheets/index.css b/stylesheets/index.css
index c682e58c..516d2acc 100644
--- a/stylesheets/index.css
+++ b/stylesheets/index.css
@@ -1,41 +1,3 @@
-.clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; }
-.clearfix:after { clear: both; }
-.clearfix { zoom: 1; }
-
-body {
- min-width: 320px;
- min-height: 500px;
-}
-.number.error {
- background-color: #ffdddd;
-}
-
-.gutter {
- padding-bottom: 0;
- overflow: hidden;
-}
-
-#contacts {
- overflow-y: scroll;
-}
-#contacts::-webkit-scrollbar {
- display: none;
-}
-
-.contact.selected {
- background-color: aliceblue;
-}
-
-.gutter .contact .avatar {
- background-position: center;
- background-size: cover;
-}
-
-.conversation {
- margin: 0;
- padding: 0;
-}
-
ul.discussion {
margin: 0;
padding: 10px;
@@ -115,6 +77,7 @@ img.preview {
ul.country-list {
min-width: 197px !important;
}
+<<<<<<< HEAD
div.attachments {
width: 95% !important;
@@ -211,4 +174,4 @@ input.file-input {
font-size: 1em;
position: relative;
}
-}
\ No newline at end of file
+}
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 5a7d9da4..f26951ce 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -81,99 +81,94 @@ body {
.gutter .search {
display: block; } }
-@media screen and (min-width: 320px) {
- .gutter {
- width: 64px;
+.gutter {
+ width: 100%;
+ float: left;
+ border-right: 1px solid lightgray;
+ position: relative;
+ box-sizing: border-box;
+ overflow: scroll;
+ background-color: white;
+ padding-bottom: 80px;
+ z-index: 100; }
+ .gutter .contact {
+ cursor: pointer;
float: left;
- border-right: 1px solid lightgray;
- position: relative;
- box-sizing: border-box;
- height: 458px;
- overflow: scroll;
- background-color: white;
- padding-bottom: 80px; }
- .gutter .contact {
- cursor: pointer;
- float: left;
- width: 100%;
- border-bottom: 1px solid whitesmoke;
- color: #333; }
- .gutter .contact:hover {
- background-color: whitesmoke;
- margin-top: -1px;
- border-bottom: 1px solid lightgray;
- border-top: 1px solid lightgray; }
- .gutter .contact.active {
- background-color: #ecfcff;
- margin-top: -1px;
- border-bottom: 1px solid lightgray;
- border-top: 1px solid lightgray; }
- .gutter .contact .avatar {
- height: 42px;
- width: 42px;
- border-radius: 42px;
- cursor: pointer;
- display: inline-block;
- margin: 10px;
- margin-right: 14px;
- float: left;
- clear: both;
- background-color: whitesmoke; }
- .gutter .contact .contact-details {
- display: none; } }
-@media screen and (min-width: 480px) {
- .gutter {
- width: 240px;
- height: auto;
- z-index: 100; }
- .gutter .search {
- padding: 10px;
- border-bottom: 1px solid whitesmoke; }
- .gutter .search input[type=search] {
- box-sizing: border-box;
- font-size: 12px;
- outline: 0;
- width: 100%;
- margin: 0;
- letter-spacing: 0.25px;
- padding: 4px 8px;
- border: 1px solid lightgray; }
- .gutter .search.d6 {
- display: block; }
+ width: 100%;
+ border-bottom: 1px solid whitesmoke;
+ color: #333; }
+ .gutter .contact:hover {
+ background-color: whitesmoke;
+ margin-top: -1px;
+ border-bottom: 1px solid lightgray;
+ border-top: 1px solid lightgray; }
+ .gutter .contact.active {
+ background-color: #ecfcff;
+ margin-top: -1px;
+ border-bottom: 1px solid lightgray;
+ border-top: 1px solid lightgray; }
.gutter .contact .avatar {
- height: 56px;
- width: 56px; }
- .gutter .contact .contact-details {
- display: block;
- position: relative;
- width: 156px;
+ height: 42px;
+ width: 42px;
+ border-radius: 42px;
+ cursor: pointer;
+ display: inline-block;
+ margin: 10px;
+ margin-right: 14px;
float: left;
- text-align: left; }
- .gutter .contact .contact-details h3 {
- font-size: 13px;
- margin-bottom: 4px; }
- .gutter .contact .contact-details .contact-name {
- width: 105px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis; }
- .gutter .contact .contact-details .last-message {
- color: #999999;
- letter-spacing: 0.15px;
- -webkit-text-stroke: 0.2px;
- margin: 0;
- font-size: 12px;
- width: 150px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis; }
- .gutter .contact .contact-details .last-timestamp {
- position: absolute;
- top: 14px;
- right: 8px;
- font-size: 12px;
- font-weight: 500;
- color: gray; } }
+ clear: both;
+ background-color: whitesmoke; }
+ .gutter .contact .contact-details {
+ display: none; }
+ .gutter .search {
+ padding: 10px;
+ border-bottom: 1px solid whitesmoke; }
+ .gutter .search input[type=search] {
+ box-sizing: border-box;
+ font-size: 12px;
+ outline: 0;
+ width: 100%;
+ margin: 0;
+ letter-spacing: 0.25px;
+ padding: 4px 8px;
+ border: 1px solid lightgray; }
+ .gutter .search.d6 {
+ display: block; }
+ .gutter .contact .avatar {
+ height: 56px;
+ width: 56px; }
+ .gutter .contact .contact-details {
+ display: block;
+ position: relative;
+ width: 156px;
+ float: left;
+ text-align: left; }
+ .gutter .contact .contact-details h3 {
+ font-size: 13px;
+ margin-bottom: 4px; }
+ .gutter .contact .contact-details .contact-name {
+ width: 105px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis; }
+ .gutter .contact .contact-details .last-message {
+ color: #999999;
+ letter-spacing: 0.15px;
+ -webkit-text-stroke: 0.2px;
+ margin: 0;
+ font-size: 12px;
+ width: 150px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis; }
+ .gutter .contact .contact-details .last-timestamp {
+ position: absolute;
+ top: 14px;
+ right: 8px;
+ font-size: 12px;
+ font-weight: 500;
+ color: gray; }
+
.conversation {
margin-top: 10px;
width: 100%;
diff --git a/stylesheets/manifest.css.map b/stylesheets/manifest.css.map
index 8f912685..958ec1e9 100644
--- a/stylesheets/manifest.css.map
+++ b/stylesheets/manifest.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "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",
+"mappings": "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",
"sources": ["settings/_reset.scss","context/_title_bar.scss","context/_notifications.scss","view/_search.scss","view/_gutter.scss","settings/_swatchbook.scss","view/_conversation.scss","view/_send_message_area.scss"],
"names": [],
"file": "manifest.css"
diff --git a/stylesheets/view/_gutter.scss b/stylesheets/view/_gutter.scss
index 9dba9a71..bc0cd911 100644
--- a/stylesheets/view/_gutter.scss
+++ b/stylesheets/view/_gutter.scss
@@ -1,119 +1,107 @@
-@media #{$D7} {
- .gutter {
- width:64px;
+.gutter {
+ width:100%;
+ float:left;
+ border-right:1px solid lightgray;
+ position:relative;
+ box-sizing: border-box;
+ overflow: scroll;
+ background-color:white;
+ padding-bottom:80px;
+
+ .contact {
+ cursor:pointer;
float:left;
- border-right:1px solid lightgray;
- position:relative;
- box-sizing: border-box;
- height:458px;
- overflow: scroll;
- background-color:white;
- padding-bottom:80px;
- .search {
- //display:none;
+ width:100%;
+ border-bottom:1px solid whitesmoke;
+ color:#333;
+ &:hover {
+ background-color:whitesmoke;
+ margin-top:-1px;
+ border-bottom:1px solid lightgray;
+ border-top:1px solid lightgray;
}
- .contact {
+ &.active {
+ background-color:$lightblue;
+ margin-top:-1px;
+ border-bottom:1px solid lightgray;
+ border-top:1px solid lightgray;
+ }
+ .avatar {
+ height:42px;
+ width:42px;
+ border-radius:42px;
cursor:pointer;
+ display:inline-block;
+ margin:10px;
+ margin-right:14px;
float:left;
+ clear:both;
+ background-color:whitesmoke;
+ }
+ .contact-details {
+ display:none;
+ }
+ }
+
+ z-index:100;
+ .search {
+ padding:10px;
+ border-bottom:1px solid whitesmoke;
+ input[type=search] {
+ box-sizing: border-box;
+ font-size:12px;
+ outline:0;
width:100%;
- border-bottom:1px solid whitesmoke;
- color:#333;
- &:hover {
- background-color:whitesmoke;
- margin-top:-1px;
- border-bottom:1px solid lightgray;
- border-top:1px solid lightgray;
- }
- &.active {
- background-color:$lightblue;
- margin-top:-1px;
- border-bottom:1px solid lightgray;
- border-top:1px solid lightgray;
- }
- .avatar {
- height:42px;
- width:42px;
- border-radius:42px;
- cursor:pointer;
- display:inline-block;
- margin:10px;
- margin-right:14px;
- float:left;
- clear:both;
- background-color:whitesmoke;
- }
- .contact-details {
- display:none;
- }
+ margin:0;
+ letter-spacing: 0.25px;
+ padding:4px 8px;
+ border:1px solid lightgray;
+ }
+ &.d6 {
+ display:block;
}
}
-}
-
-@media #{$D6} {
-
- .gutter {
- width:240px;
- height:auto;
- z-index:100;
- .search {
- padding:10px;
- border-bottom:1px solid whitesmoke;
- input[type=search] {
- box-sizing: border-box;
- font-size:12px;
- outline:0;
- width:100%;
+ .contact {
+ .avatar {
+ height:56px;
+ width:56px;
+ }
+ .contact-details {
+ display:block;
+ position:relative;
+ width:156px;
+ float:left;
+ text-align: left;
+ h3 {
+ font-size:13px;
+ margin-bottom:4px;
+ }
+ .contact-name {
+ width: 105px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ .last-message {
+ color:lighten(#333, 40%);
+ letter-spacing:0.15px;
+ -webkit-text-stroke: 0.2px;
margin:0;
- letter-spacing: 0.25px;
- padding:4px 8px;
- border:1px solid lightgray;
+ font-size: 12px;
+ width: 150px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
- &.d6 {
- display:block;
+ .last-timestamp {
+ position:absolute;
+ top:14px;
+ right:8px;
+ font-size:12px;
+ font-weight: 500;
+ color:gray;
}
}
- .contact {
- .avatar {
- height:56px;
- width:56px;
- }
- .contact-details {
- display:block;
- position:relative;
- width:156px;
- float:left;
- text-align: left;
- h3 {
- font-size:13px;
- margin-bottom:4px;
- }
- .contact-name {
- width: 105px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- .last-message {
- color:lighten(#333, 40%);
- letter-spacing:0.15px;
- -webkit-text-stroke: 0.2px;
- margin:0;
- font-size: 12px;
- width: 150px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- .last-timestamp {
- position:absolute;
- top:14px;
- right:8px;
- font-size:12px;
- font-weight: 500;
- color:gray;
- }
- }
- }
-
}
-}
+
+}
\ No newline at end of file