From 3ba94a1ba24ad8709a200abcf8451bdeac2c67a1 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 18 May 2017 14:54:02 +0200 Subject: [PATCH 1/2] correctly set release version number --- customize.dist/about.html | 2 +- customize.dist/contact.html | 2 +- customize.dist/index.html | 2 +- customize.dist/privacy.html | 2 +- customize.dist/src/fragments/footer.html | 2 +- customize.dist/terms.html | 2 +- package.json | 2 +- www/settings/index.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/customize.dist/about.html b/customize.dist/about.html index 044343a24..954a3fb6f 100644 --- a/customize.dist/about.html +++ b/customize.dist/about.html @@ -114,7 +114,7 @@ -
CryptPad v1.6.0 (Hodag)
+
CryptPad v1.7.0 (Hodag)
diff --git a/customize.dist/contact.html b/customize.dist/contact.html index 70dbf9083..5d43d15a5 100644 --- a/customize.dist/contact.html +++ b/customize.dist/contact.html @@ -111,7 +111,7 @@ -
CryptPad v1.6.0 (Hodag)
+
CryptPad v1.7.0 (Hodag)
diff --git a/customize.dist/index.html b/customize.dist/index.html index 420d3664a..a1b1fe56b 100644 --- a/customize.dist/index.html +++ b/customize.dist/index.html @@ -233,7 +233,7 @@ -
CryptPad v1.6.0 (Hodag)
+
CryptPad v1.7.0 (Hodag)
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html index 345bac0f1..35bab1958 100644 --- a/customize.dist/privacy.html +++ b/customize.dist/privacy.html @@ -132,7 +132,7 @@ -
CryptPad v1.6.0 (Hodag)
+
CryptPad v1.7.0 (Hodag)
diff --git a/customize.dist/src/fragments/footer.html b/customize.dist/src/fragments/footer.html index 68f4c4610..55b332a0f 100644 --- a/customize.dist/src/fragments/footer.html +++ b/customize.dist/src/fragments/footer.html @@ -39,5 +39,5 @@ -
CryptPad v1.6.0 (Hodag)
+
CryptPad v1.7.0 (Hodag)
diff --git a/customize.dist/terms.html b/customize.dist/terms.html index e652f6aa4..2504b1147 100644 --- a/customize.dist/terms.html +++ b/customize.dist/terms.html @@ -115,7 +115,7 @@ -
CryptPad v1.6.0 (Hodag)
+
CryptPad v1.7.0 (Hodag)
diff --git a/package.json b/package.json index 75a4fbb11..dd089605c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "1.8.0", + "version": "1.7.0", "dependencies": { "chainpad-server": "^1.0.1", "express": "~4.10.1", diff --git a/www/settings/index.html b/www/settings/index.html index 3fde61f4a..f6ab459c9 100644 --- a/www/settings/index.html +++ b/www/settings/index.html @@ -105,7 +105,7 @@ -
CryptPad v1.6.0 (Hodag)
+
CryptPad v1.7.0 (Hodag)
From d187945e94afc229eb211287291f1a10c7348e95 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 18 May 2017 14:55:16 +0200 Subject: [PATCH 2/2] jshint compliance --- www/common/common-hash.js | 6 +++--- www/common/diffMarked.js | 4 ++-- www/common/pinpad.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/common/common-hash.js b/www/common/common-hash.js index 9e72bcdeb..5de76ab99 100644 --- a/www/common/common-hash.js +++ b/www/common/common-hash.js @@ -103,10 +103,10 @@ Version 1 if (!href) { return ret; } if (href.slice(-1) !== '/') { href += '/'; } - + var idx; if (!/^https*:\/\//.test(href)) { - var idx = href.indexOf('/#'); + idx = href.indexOf('/#'); ret.type = href.slice(1, idx); ret.hash = href.slice(idx + 2); ret.hashData = parseTypeHash(ret.type, ret.hash); @@ -118,7 +118,7 @@ Version 1 ret.type = type; return ''; }); - var idx = href.indexOf('/#'); + idx = href.indexOf('/#'); ret.hash = href.slice(idx + 2); ret.hashData = parseTypeHash(ret.type, ret.hash); return ret; diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js index b3cc5fe1e..2de647e86 100644 --- a/www/common/diffMarked.js +++ b/www/common/diffMarked.js @@ -3,7 +3,7 @@ define([ '/bower_components/marked/marked.min.js', '/bower_components/diff-dom/diffDOM.js' ],function ($, Marked) { - var DiffMd = {} + var DiffMd = {}; var DiffDOM = window.diffDOM; var renderer = DiffMd.renderer = new Marked.Renderer(); @@ -90,7 +90,7 @@ define([ return patch; }; - var apply = DiffMd.apply = function (newHtml, $content) { + DiffMd.apply = function (newHtml, $content) { var id = $content.attr('id'); if (!id) { throw new Error("The element must have a valid id"); } var $div = $('
', {id: id}).append(newHtml); diff --git a/www/common/pinpad.js b/www/common/pinpad.js index c0b057cf8..b14a5bac0 100644 --- a/www/common/pinpad.js +++ b/www/common/pinpad.js @@ -172,7 +172,7 @@ define([ }; exp.uploadCancel = function (cb) { - rpc.send('UPLOAD_CANCEL', void 0, function (e, res) { + rpc.send('UPLOAD_CANCEL', void 0, function (e) { if (e) { return void cb(e); } cb(); });