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

lint compliance

Browse Source
This commit is contained in:
ansuz 2017-07-12 10:54:24 +02:00
parent 3453e54357
commit 0483d15b8f
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.jshintignore
View File

@ -1,14 +1,8 @@
node_modules/ node_modules/
www/bower_components/ www/bower_components/
www/code/codemirror* www/common/pdfjs/
www/common/chainpad.js
storage/kad.js
www/common/otaml.js
server.js server.js
NetFluxWebsocketSrv.js
NetFluxWebsocketServer.js
WebRTCSrv.js
www/common/media-tag.js www/common/media-tag.js
www/scratch www/scratch

4
www/common/cryptpad-common.js
View File

@ -24,7 +24,7 @@ define([
// Configure MediaTags to use our local viewer // Configure MediaTags to use our local viewer
if (MediaTag && MediaTag.PdfPlugin) { if (MediaTag && MediaTag.PdfPlugin) {
MediaTag.PdfPlugin.viewer = '/common/pdfjs/web/viewer.html' MediaTag.PdfPlugin.viewer = '/common/pdfjs/web/viewer.html';
} }
/* This file exposes functionality which is specific to Cryptpad, but not to /* This file exposes functionality which is specific to Cryptpad, but not to
@ -1295,7 +1295,7 @@ define([
if (img.width > img.height) { if (img.width > img.height) {
$image.css('max-height', '100%'); $image.css('max-height', '100%');
$container.css('flex-direction', 'column'); $container.css('flex-direction', 'column');
if (cb) { cb($img); } if (cb) { cb($image); }
return; return;
} }
$image.css('max-width', '100%'); $image.css('max-width', '100%');

4
www/profile/main.js
View File

@ -173,13 +173,13 @@ define([
console.log(name); console.log(name);
console.log("Creating invite button"); console.log("Creating invite button");
var $button = $("<button>", { $("<button>", {
id: CREATE_INVITE_BUTTON, id: CREATE_INVITE_BUTTON,
title: Messages.profile_inviteButtonTitle, title: Messages.profile_inviteButtonTitle,
}) })
.addClass('btn btn-success') .addClass('btn btn-success')
.text(Messages.profile_inviteButton) .text(Messages.profile_inviteButton)
.click(function (e) { .click(function () {
Cryptpad.confirm(Messages._getKey('profile_inviteExplanation', [name]), function (yes) { Cryptpad.confirm(Messages._getKey('profile_inviteExplanation', [name]), function (yes) {
if (!yes) { return; } if (!yes) { return; }
console.log(obj.curveKey); console.log(obj.curveKey);