vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #4920 from achillesrasquinha/chat-fixes

Browse source 
Fix Typing Toggling
This commit is contained in:
Achilles Rasquinha 2018-01-25 11:07:40 +05:30 • committed by GitHub
commit 6ed2cd44bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 77 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/chat/doctype/chat_message/chat_message_list.js
View file

@ -1,7 +1,8 @@
frappe.listview_settings['Chat Message'] = {
filters: [
['Chat Message', 'user', '==', frappe.session.user, true],
['Chat Room', 'owner', '==', frappe.session.user, true],
['Chat Room', frappe.session.user, 'in', 'users', true]
['Chat Message', 'user', '==', frappe.session.user, true]
// I need an or_filter here.
// ['Chat Room', 'owner', '==', frappe.session.user, true],
// ['Chat Room', frappe.session.user, 'in', 'users', true]
]
};

16
frappe/public/css/chat.css
View file

@ -291,6 +291,14 @@ a.no-decoration:active {
left: 50%;
transform: translate(-50%, -50%);
}
.frappe-chat > .frappe-chat-popper > .frappe-chat-popper-collapse > .panel .panel-heading .panel-title .media-heading {
font-size: 12px;
margin: 0px;
padding: 0px;
}
.frappe-chat > .frappe-chat-popper > .frappe-chat-popper-collapse > .panel .panel-heading .panel-title .media-subtitle {
font-size: 12px;
}
.frappe-chat > .frappe-chat-popper > .frappe-chat-popper-collapse > .panel .panel-heading .frappe-chat-action-bar form {
width: 100%;
}
@ -314,6 +322,10 @@ a.no-decoration:active {
vertical-align: middle;
max-width: 180px;
}
.frappe-chat > .frappe-chat-popper > .frappe-chat-popper-collapse > .panel.panel-bg {
background-size: 350px 500px;
background-image: url(/assets/frappe/images/chat/wallpaper-default.jpg);
}
.frappe-chat > .frappe-chat-popper > .frappe-chat-popper-collapse > .panel.panel-span {
position: fixed;
width: 100%;
@ -389,7 +401,6 @@ a.no-decoration:active {
.chat-list {
padding-bottom: 50px;
height: 100%;
background: #FAFBFC;
background-size: 350px 500px;
background-image: url(/assets/frappe/images/chat/wallpaper-default.jpg);
overflow-y: scroll;
@ -403,6 +414,9 @@ a.no-decoration:active {
.chat-list .chat-list-item .avatar {
vertical-align: top;
}
.chat-list .chat-list-item .avatar .standard-image {
background-color: white;
}
.chat-list .chat-list-item .chat-bubble {
min-width: 20%;
max-width: 75%;

32
frappe/public/js/frappe/chat.js
View file

@ -1575,7 +1575,7 @@ class extends Component {
state.room.name ?
Room : (
h("div", "",
h("div", { class: "text-center text-extra-muted" },
h("div", { class: "text-center text-muted" },
h(frappe.components.Octicon, { type: "comment-discussion", style: "font-size: 48px" }),
h("p","",__("Select a chat to start messaging."))
)
@ -1705,6 +1705,14 @@ class extends Component {
props.submit(state.query)
}
on_mounted ( )
{
$(document).ready(function (e)
{
// if ( e.keyCode === frappe.ui.keycode.CTRL )
})
}
render ( ) {
const { props, state } = this
const { actions } = props
@ -1944,7 +1952,7 @@ class extends Component {
}
return (
h("div", { class: `panel panel-default ${frappe._.is_mobile() ? "panel-span" : ""}` },
h("div", { class: `panel panel-default panel-bg ${frappe._.is_mobile() ? "panel-span" : ""}` },
h(frappe.Chat.Widget.Room.Header, { ...props, on_back: props.destroy }),
!frappe._.is_empty(props.messages) ?
h(frappe.chat.component.ChatList, {
@ -2011,7 +2019,7 @@ class extends Component {
const popper = props.layout === frappe.Chat.Layout.POPPER || frappe._.is_mobile()
return (
h("div", { class: "panel-heading" },
h("div", { class: "panel-heading", style: { "height": "50px" } }, // sorry. :(
h("div", { class: "level" },
popper ?
h(frappe.components.Button,{class:"btn-back",onclick:props.on_back},
@ -2102,7 +2110,7 @@ class extends Component {
)
:
h("div",{class:`${me ? "text-right" : ""}`},
!me && !props.groupable && !me ?
props.room_type === "Group" && !me ?
h(frappe.components.Avatar, {
title: frappe.user.full_name(props.user),
image: frappe.user.image(props.user)
@ -2342,6 +2350,22 @@ class extends Component {
}
}
/**
* @description Python equivalent to sys.platform
*/
frappe.provide('frappe._')
frappe._.platform = () =>
{
const string = navigator.appVersion
if ( string.includes("Win") ) return "Windows"
if ( string.includes("Mac") ) return "Darwin"
if ( string.includes("X11") ) return "UNIX"
if ( string.includes("Linux") ) return "Linux"
return undefined
}
/**
* @description Frappe's Asset Helper
*/

1
frappe/public/js/frappe/list/list_renderer.js
View file

@ -39,6 +39,7 @@ frappe.views.ListRenderer = Class.extend({
// default settings
this.order_by = this.order_by || 'modified desc';
this.filters = this.filters || [];
this.or_filters = this.or_filters || [];
this.page_length = this.page_length || 20;
},
setup_cache: function () {

31
frappe/public/less/chat.less
View file

@ -81,6 +81,23 @@
.panel-heading
{
// height: 50px;
.panel-title
{
.media-heading
{
font-size: 12px;
margin: 0px;
padding: 0px;
}
.media-subtitle
{
font-size: 12px;
}
}
.frappe-chat-action-bar
{
form
@ -117,6 +134,12 @@
}
}
& > .panel.panel-bg
{
background-size: 350px 500px;
background-image: url(/assets/frappe/images/chat/wallpaper-default.jpg);
}
& > .panel.panel-span
{
position: fixed;
@ -275,10 +298,9 @@
.chat-list
{
padding-bottom: 50px;
height: 100%;
background: @frappe-chat-list-bg-color;
// background: @frappe-chat-list-bg-color;
background-size: 350px 500px;
background-image: url(/assets/frappe/images/chat/wallpaper-default.jpg);
overflow-y: scroll;
@ -288,6 +310,11 @@
.avatar
{
vertical-align: top;
.standard-image
{
background-color: white;
}
}
.cursor-pointer;