mirror of https://github.com/xwiki-labs/cryptpad
lint compliance
This commit is contained in:
parent
e6743887fc
commit
9e27f111cb
|
@ -125,11 +125,11 @@
|
|||
}
|
||||
&:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
|
||||
color: @color;
|
||||
opacity: 1;
|
||||
opacity: 1;
|
||||
}
|
||||
&::-moz-placeholder { /* Mozilla Firefox 19+ */
|
||||
color: @color;
|
||||
opacity: 1;
|
||||
opacity: 1;
|
||||
}
|
||||
&:-ms-input-placeholder { /* Internet Explorer 10-11 */
|
||||
color: @color;
|
||||
|
@ -167,7 +167,7 @@
|
|||
|
||||
.cp-avatar,
|
||||
.cp-app-contacts-right-col {
|
||||
flex:1 1 auto;
|
||||
flex: 1 1 auto;
|
||||
}
|
||||
.cp-app-contacts-remove-history {
|
||||
.hover;
|
||||
|
@ -196,7 +196,7 @@
|
|||
& > div {
|
||||
padding: 0 10px;
|
||||
}
|
||||
.cp-app-contacts-content {
|
||||
.cp-app-contacts-content {
|
||||
overflow: hidden;
|
||||
word-wrap: break-word;
|
||||
&> * {
|
||||
|
@ -234,7 +234,7 @@
|
|||
resize: none;
|
||||
overflow-y: auto;
|
||||
.placeholder(#bbb);
|
||||
&[disabled=true] {
|
||||
&[disabled="true"] {
|
||||
.placeholder(#999);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -413,7 +413,7 @@ Messenger, MessengerUI, Messages) {
|
|||
return $container;
|
||||
};
|
||||
|
||||
var initChat = function (toolbar, config) {
|
||||
var initChat = function (toolbar) {
|
||||
var $container = $('<div>', {id: 'cp-app-contacts-container'})
|
||||
.prependTo(toolbar.chatContent);
|
||||
var sframeChan = Common.getSframeChannel();
|
||||
|
|
|
@ -41,7 +41,6 @@ define([
|
|||
|
||||
$container.addClass('cp-app-contacts-initializing');
|
||||
|
||||
var spinner = '<span class="fa fa-spinner fa-pulse fa-4x fa-fw"></span>';
|
||||
var messaging = h('div#cp-app-contacts-messaging', [
|
||||
h('span.fa.fa-spinner.fa-pulse.fa-4x.fa-fw.cp-app-contacts-spinner'),
|
||||
h('div.cp-app-contacts-info', [
|
||||
|
@ -210,7 +209,6 @@ define([
|
|||
$(removeHistory).click(function () {
|
||||
// XXX
|
||||
console.error("TODO: only display clear button if owned");
|
||||
return;
|
||||
UI.confirm(Messages.contacts_confirmRemoveHistory, function (yes) {
|
||||
if (!yes) { return; }
|
||||
|
||||
|
@ -607,8 +605,9 @@ define([
|
|||
$messages.find(userQuery(curvePublic)).remove();
|
||||
if (channel && channel.curvePublic === curvePublic) {
|
||||
showInfo();
|
||||
}
|
||||
if (!removedByMe) {
|
||||
// TODO UI.alert if this is triggered by the other guy
|
||||
// (we need more data on the 'unfriend' event to determine its origin)
|
||||
}
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue