web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lint compliance

Browse Source
This commit is contained in:
yflory 2018-09-06 18:45:53 +02:00
parent e6743887fc
commit 9e27f111cb
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
customize.dist/src/less2/include/messenger.less
View File

@ -125,11 +125,11 @@
} }
&:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
color: @color; color: @color;
opacity: 1; opacity: 1;
} }
&::-moz-placeholder { /* Mozilla Firefox 19+ */ &::-moz-placeholder { /* Mozilla Firefox 19+ */
color: @color; color: @color;
opacity: 1; opacity: 1;
} }
&:-ms-input-placeholder { /* Internet Explorer 10-11 */ &:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: @color; color: @color;
@ -167,7 +167,7 @@
.cp-avatar, .cp-avatar,
.cp-app-contacts-right-col { .cp-app-contacts-right-col {
flex:1 1 auto; flex: 1 1 auto;
} }
.cp-app-contacts-remove-history { .cp-app-contacts-remove-history {
.hover; .hover;
@ -196,7 +196,7 @@
& > div { & > div {
padding: 0 10px; padding: 0 10px;
} }
.cp-app-contacts-content { .cp-app-contacts-content {
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
&> * { &> * {
@ -234,7 +234,7 @@
resize: none; resize: none;
overflow-y: auto; overflow-y: auto;
.placeholder(#bbb); .placeholder(#bbb);
&[disabled=true] { &[disabled="true"] {
.placeholder(#999); .placeholder(#999);
} }
} }

2
www/common/toolbar3.js
View File

@ -413,7 +413,7 @@ Messenger, MessengerUI, Messages) {
return $container; return $container;
}; };
var initChat = function (toolbar, config) { var initChat = function (toolbar) {
var $container = $('<div>', {id: 'cp-app-contacts-container'}) var $container = $('<div>', {id: 'cp-app-contacts-container'})
.prependTo(toolbar.chatContent); .prependTo(toolbar.chatContent);
var sframeChan = Common.getSframeChannel(); var sframeChan = Common.getSframeChannel();

5
www/contacts/messenger-ui.js
View File

@ -41,7 +41,6 @@ define([
$container.addClass('cp-app-contacts-initializing'); $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', [ var messaging = h('div#cp-app-contacts-messaging', [
h('span.fa.fa-spinner.fa-pulse.fa-4x.fa-fw.cp-app-contacts-spinner'), h('span.fa.fa-spinner.fa-pulse.fa-4x.fa-fw.cp-app-contacts-spinner'),
h('div.cp-app-contacts-info', [ h('div.cp-app-contacts-info', [
@ -210,7 +209,6 @@ define([
$(removeHistory).click(function () { $(removeHistory).click(function () {
// XXX // XXX
console.error("TODO: only display clear button if owned"); console.error("TODO: only display clear button if owned");
return;
UI.confirm(Messages.contacts_confirmRemoveHistory, function (yes) { UI.confirm(Messages.contacts_confirmRemoveHistory, function (yes) {
if (!yes) { return; } if (!yes) { return; }
@ -607,8 +605,9 @@ define([
$messages.find(userQuery(curvePublic)).remove(); $messages.find(userQuery(curvePublic)).remove();
if (channel && channel.curvePublic === curvePublic) { if (channel && channel.curvePublic === curvePublic) {
showInfo(); showInfo();
}
if (!removedByMe) {
// TODO UI.alert if this is triggered by the other guy // TODO UI.alert if this is triggered by the other guy
// (we need more data on the 'unfriend' event to determine its origin)
} }
}); });