Dependency management:

move (most) third-party dependencies from www/common/ => www/lib/

* unify less.js files by standardizing on our slightly modified version
* update textFit.js to the latest version
* describe exact versions of files where known, otherwise link to their project sites

.jshintignore

@@ -1,11 +1,5 @@
 node_modules/
 www/bower_components/
-www/common/less.min.js
-www/common/pdfjs/
-www/common/tippy/
-www/common/textFit.min.js
-www/common/highlight/
-www/common/jquery-ui/
 www/common/onlyoffice/sdkjs
 www/common/onlyoffice/web-apps
 www/common/onlyoffice/x2t
@@ -14,7 +8,6 @@ www/common/onlyoffice/v2*
 www/common/onlyoffice/v4
 
 server.js
-www/common/old-media-tag.js
 www/scratch
 www/accounts
 www/lib

bower.json

@@ -36,7 +36,6 @@
     "alertifyjs": "1.0.11",
     "scrypt-async": "1.2.0",
     "require-css": "0.1.10",
-    "less": "3.7.1",
     "bootstrap": "^v4.0.0",
     "diff-dom": "2.1.1",
     "nthen": "0.1.7",

customize.dist/pages/index.js

@@ -5,7 +5,7 @@ define([
     '/common/common-feedback.js',
     '/common/common-interface.js',
     '/common/common-hash.js',
-    '/common/textFit.min.js',
+    '/lib/textFit.min.js',
     '/customize/messages.js',
     '/customize/application_config.js',
     '/common/outer/local-store.js',
@@ -67,6 +67,7 @@ define([
 
         icons.forEach(function (a) {
             setTimeout(function () {
+                // ensure that text in our app icons doesn't overflow
                 TextFit($(a).find('.pad-button-text')[0], {minFontSize: 13, maxFontSize: 18});
             });
         });

www/common/LessLoader.js

@@ -110,7 +110,7 @@ define([
         if (lessEngine) {
             cb(lessEngine);
         } else {
-            require(['/common/less.min.js'], function (Less) {
+            require(['/lib/less.min.js'], function (Less) {
                 if (lessEngine) { return void cb(lessEngine); }
                 lessEngine = Less;
                 Less.functions.functionRegistry.add('LessLoader_currentFile', function () {

www/common/common-interface.js

@@ -15,15 +15,15 @@ define([
     '/common/common-notifier.js',
     '/customize/application_config.js',
     '/bower_components/alertifyjs/dist/js/alertify.js',
-    '/common/tippy/tippy.min.js',
+    '/lib/tippy/tippy.min.js',
     '/common/hyperscript.js',
     '/customize/loading.js',
     '/common/test.js',
 
-    '/common/jquery-ui/jquery-ui.min.js',
+    '/lib/jquery-ui/jquery-ui.min.js', // autocomplete widget
     '/bower_components/bootstrap-tokenfield/dist/bootstrap-tokenfield.js',
-    'css!/common/tippy/tippy.css',
-    'css!/common/jquery-ui/jquery-ui.min.css'
+    'css!/lib/tippy/tippy.css',
+    'css!/lib/jquery-ui/jquery-ui.min.css'
 ], function ($, Messages, Util, Hash, Notifier, AppConfig,
             Alertify, Tippy, h, Loading, Test) {
     var UI = {};

www/common/common-thumbnail.js

@@ -145,7 +145,7 @@ define([
         video.src = url;
     };
     Thumb.fromPdfBlob = function (blob, cb) {
-        require.config({paths: {'pdfjs-dist': '/common/pdfjs'}});
+        require.config({paths: {'pdfjs-dist': '/lib/pdfjs'}});
         require(['pdfjs-dist/build/pdf'], function (PDFJS) {
             var url = URL.createObjectURL(blob);
             var makeThumb = function (page) {

www/common/diffMarked.js

@@ -8,13 +8,13 @@ define([
     '/common/inner/common-mediatag.js',
     '/common/media-tag.js',
     '/customize/messages.js',
-    '/common/less.min.js',
+    '/lib/less.min.js',
     '/customize/pages.js',
 
-    '/common/highlight/highlight.pack.js',
+    '/lib/highlight/highlight.pack.js',
     '/lib/diff-dom/diffDOM.js',
     '/bower_components/tweetnacl/nacl-fast.min.js',
-    'css!/common/highlight/styles/'+ (window.CryptPad_theme === 'dark' ? 'dark.css' : 'github.css')
+    'css!/lib/highlight/styles/'+ (window.CryptPad_theme === 'dark' ? 'dark.css' : 'github.css')
 ],function ($, ApiConfig, Marked, Hash, Util, h, MT, MediaTag, Messages, Less, Pages) {
     var DiffMd = {};
 
@@ -424,7 +424,7 @@ define([
     // Only allow iframe, video and audio with local source
     var checkSrc = function (root) {
         if (restrictedTags.indexOf(root.nodeName.toUpperCase()) === -1) { return true; }
-        return root.getAttribute && /^(blob\:|\/common\/pdfjs)/.test(root.getAttribute('src'));
+        return root.getAttribute && /^(blob\:|\/lib\/pdfjs)/.test(root.getAttribute('src'));
     };
 
     var removeForbiddenTags = function (root) {

www/common/inner/common-mediatag.js

@@ -20,7 +20,7 @@ define([
     // This file is loaded by sframe-common so the following config is used in all the inner apps
     if (MediaTag) {
         MediaTag.setDefaultConfig('pdf', {
-            viewer: '/common/pdfjs/web/viewer.html'
+            viewer: '/lib/pdfjs/web/viewer.html'
         });
         MediaTag.setDefaultConfig('download', {
             text: Messages.mediatag_saveButton,

www/common/requireconfig.js

@@ -13,8 +13,6 @@ define([
             "mermaid": "/code/mermaid.min",
             // json.sortify same
             "json.sortify": "/bower_components/json.sortify/dist/JSON.sortify",
-            //"pdfjs-dist/build/pdf": "/bower_components/pdfjs-dist/build/pdf",
-            //"pdfjs-dist/build/pdf.worker": "/bower_components/pdfjs-dist/build/pdf.worker"
             cm: '/bower_components/codemirror',
             'tui-code-snippet': '/lib/calendar/tui-code-snippet.min',
             'tui-date-picker': '/lib/calendar/date-picker',

www/common/textFit.min.js

@@ -1 +0,0 @@
-(function(root,factory){"use strict";if(typeof define==="function"&&define.amd){define([],factory)}else if(typeof exports==="object"){module.exports=factory()}else{root.textFit=factory()}})(typeof global==="object"?global:this,function(){"use strict";var defaultSettings={alignVert:false,alignHoriz:false,multiLine:false,detectMultiLine:true,minFontSize:6,maxFontSize:80,reProcess:true,widthOnly:false,alignVertWithFlexbox:false};return function textFit(els,options){if(!options)options={};var settings={};for(var key in defaultSettings){if(options.hasOwnProperty(key)){settings[key]=options[key]}else{settings[key]=defaultSettings[key]}}if(typeof els.toArray==="function"){els=els.toArray()}var elType=Object.prototype.toString.call(els);if(elType!=="[object Array]"&&elType!=="[object NodeList]"&&elType!=="[object HTMLCollection]"){els=[els]}for(var i=0;i<els.length;i++){processItem(els[i],settings)}};function processItem(el,settings){if(!isElement(el)||!settings.reProcess&&el.getAttribute("textFitted")){return false}if(!settings.reProcess){el.setAttribute("textFitted",1)}var innerSpan,originalHeight,originalHTML,originalWidth;var low,mid,high;originalHTML=el.innerHTML;originalWidth=innerWidth(el);originalHeight=innerHeight(el);if(!originalWidth||!settings.widthOnly&&!originalHeight){if(!settings.widthOnly)throw new Error("Set a static height and width on the target element "+el.outerHTML+" before using textFit!");else throw new Error("Set a static width on the target element "+el.outerHTML+" before using textFit!")}if(originalHTML.indexOf("textFitted")===-1){innerSpan=document.createElement("span");innerSpan.className="textFitted";innerSpan.style["display"]="inline-block";innerSpan.innerHTML=originalHTML;el.innerHTML="";el.appendChild(innerSpan)}else{innerSpan=el.querySelector("span.textFitted");if(hasClass(innerSpan,"textFitAlignVert")){innerSpan.className=innerSpan.className.replace("textFitAlignVert","");innerSpan.style["height"]="";el.className.replace("textFitAlignVertFlex","")}}if(settings.alignHoriz){el.style["text-align"]="center";innerSpan.style["text-align"]="center"}var multiLine=settings.multiLine;if(settings.detectMultiLine&&!multiLine&&innerSpan.scrollHeight>=parseInt(window.getComputedStyle(innerSpan)["font-size"],10)*2){multiLine=true}if(!multiLine){el.style["white-space"]="nowrap"}low=settings.minFontSize+1;high=settings.maxFontSize+1;while(low<=high){mid=parseInt((low+high)/2,10);innerSpan.style.fontSize=mid+"px";if(innerSpan.scrollWidth<=originalWidth&&(settings.widthOnly||innerSpan.scrollHeight<=originalHeight)){low=mid+1}else{high=mid-1}}innerSpan.style.fontSize=mid-1+"px";if(settings.alignVert){addStyleSheet();var height=innerSpan.scrollHeight;if(window.getComputedStyle(el)["position"]==="static"){el.style["position"]="relative"}if(!hasClass(innerSpan,"textFitAlignVert")){innerSpan.className=innerSpan.className+" textFitAlignVert"}innerSpan.style["height"]=height+"px";if(settings.alignVertWithFlexbox&&!hasClass(el,"textFitAlignVertFlex")){el.className=el.className+" textFitAlignVertFlex"}}}function innerHeight(el){var style=window.getComputedStyle(el,null);return el.clientHeight-parseInt(style.getPropertyValue("padding-top"),10)-parseInt(style.getPropertyValue("padding-bottom"),10)}function innerWidth(el){var style=window.getComputedStyle(el,null);return el.clientWidth-parseInt(style.getPropertyValue("padding-left"),10)-parseInt(style.getPropertyValue("padding-right"),10)}function isElement(o){return typeof HTMLElement==="object"?o instanceof HTMLElement:o&&typeof o==="object"&&o!==null&&o.nodeType===1&&typeof o.nodeName==="string"}function hasClass(element,cls){return(" "+element.className+" ").indexOf(" "+cls+" ")>-1}function addStyleSheet(){if(document.getElementById("textFitStyleSheet"))return;var style=[".textFitAlignVert{","position: absolute;","top: 0; right: 0; bottom: 0; left: 0;","margin: auto;","display: flex;","justify-content: center;","flex-direction: column;","}",".textFitAlignVertFlex{","display: flex;","}",".textFitAlignVertFlex .textFitAlignVert{","position: static;","}"].join("");var css=document.createElement("style");css.type="text/css";css.id="textFitStyleSheet";css.innerHTML=style;document.body.appendChild(css)}});

www/lib/changelog.md

@@ -1,4 +1,11 @@
 This file is intended to be used as a log of what third-party source we have vendored, where we got it, and what modifications we have made to it (if any).
 
 * [turndown v7.1.1](https://github.com/mixmark-io/turndown/releases/tag/v7.1.1) built from unmodified source as per its build scripts.
+* [less.min.js v3.11.1](https://github.com/less/less.js/releases/tag/v3.11.1) with a minor modification to produce slightly more compact CSS
+* [textFit.min.js v2.4.0 ](https://github.com/STRML/textFit/releases/tag/v2.4.0) to ensure that app names fit inside their icon containers on the home page
+* [highlightjs](https://github.com/highlightjs/highlight.js/) for syntax highlighting in our code editor
+* [our fork of tippy.js](https://github.com/xwiki-labs/tippyjs) for adding tooltips.
+* [jscolor v2.0.5](https://jscolor.com/) for providing a consistent color picker across all browsers
+* [jquery.ui 1.12.1](https://jqueryui.com/) for its 'autocomplete' extension which is used for our tag picker
+* [pdfjs](https://mozilla.github.io/pdf.js/) with some minor modifications to prevent CSP errors